libpijul/change/text_changes: fix TODO, get rid of tmp vector in get_change_contents()

laumann

Jul 26, 2023, 8:07 AM

V6MKACSL7KMUXVKL4LJYVQSJCQSVPRW2JMJYTUNBXW2UUDXRIHPAC

Dependencies

• [2] YHG37GA4 Removing one buffer copy in VertexBuffer
• [3] XSEODPNE Fixing conflicts
• [4] CIEUBH46 Fixing an index-out-of-bounds error when serialising bad changes
• [5] VO5OQW4W Removing anyhow in libpijul
• [6] UM5DLRPB store new non-UTF-8 files raw and decode to deplay the contents
• [7] XR7MNOMU file encoding in updates
• [8] 5FI6SBEZ Re-implement change printing and parsing

Change contents

• edit in libpijul/src/change/text_changes.rs at line 1127
  [3.85775]→[3.35332:35383](∅→∅)
  − // TODO: get rid of `tmp` and/or `buf`
• replacement in libpijul/src/change/text_changes.rs at line 1128
  [3.85813]→[3.35384:35422](∅→∅)
  − let mut tmp = Vec::new();
  [3.85813]

  [3.85813]
  + let mut z = 0;
• replacement in libpijul/src/change/text_changes.rs at line 1134
  [3.85978]→[2.1737:1791](∅→∅)
  − tmp.resize(e.to.end - e.to.start, 0);
  [3.85978]

  [3.86007]
  + let sz = e.to.end - e.to.start;

  + buf.resize(z + sz, 0);
• replacement in libpijul/src/change/text_changes.rs at line 1137
  [3.86031]→[3.35453:35507](∅→∅)
  − .get_contents_ext(e.to, &mut tmp)
  [3.86031]

  [3.86085]
  + .get_contents_ext(e.to, &mut buf[z..])
• replacement in libpijul/src/change/text_changes.rs at line 1139
  [3.86133]→[3.35508:35553](∅→∅)
  − buf.extend_from_slice(&tmp);
  [3.86133]

  [3.86184]
  + z += sz;