Formatting

pmeunier

Jul 3, 2021, 10:36 AM

S7MAMMFWLEBKCZZ2ZUU743Z2X7XRB2IBB7LPXZVYN37RNPGN4ATAC

Dependencies

• [2] 4DNDMC7I Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)
• [3] IACED7RW text_encoding module
• [4] SGXOEWHU Adding a patched chardetng (temporarily)
• [5] TGA6QXGI Initial support for binary diffs (conflicts are not yet supported in the output)

Change contents

• edit in libpijul/src/text_encoding.rs at line 1
  [3.19]→[3.20:34](∅→∅),[3.34]→[2.0:22](∅→∅)
  − use std::fmt;

  − use std::borrow::Cow;
• edit in libpijul/src/text_encoding.rs at line 2
  [3.85]

  [3.85]
  + use std::borrow::Cow;

  + use std::fmt;
• replacement in libpijul/src/diff/bin.rs at line 69
  [2.1046]→[2.1046:1080](∅→∅)
  − break
  [2.1046]

  [3.4496]
  + break;
• replacement in libpijul/src/diff/bin.rs at line 95
  [3.5184]→[2.1081:1156](∅→∅)
  − Chunk::Old { start, end, ptr, .. } => lines.push(super::Line {
  [3.5184]

  [3.5254]
  + Chunk::Old {

  + start, end, ptr, ..

  + } => lines.push(super::Line {
• edit in chardetng/src/lib.rs at line 2950
  [3.128274]→[2.1467:1468](∅→∅)
  −
• replacement in chardetng/src/lib.rs at line 2961
  [3.128794]→[2.1469:1544](∅→∅)
  − if self.non_ascii_seen == 0

  − && self.esc_seen

  − {
  [3.128794]

  [3.128849]
  + if self.non_ascii_seen == 0 && self.esc_seen {
• replacement in chardetng/src/lib.rs at line 2963
  [3.128923]→[2.1545:1588](∅→∅)
  − return (ISO_2022_JP, true)
  [3.128923]

  [3.128967]
  + return (ISO_2022_JP, true);
• replacement in chardetng/src/lib.rs at line 3388
  [2.1689]→[2.1689:1750](∅→∅)
  − check_bytes(&[68,111,110,180,116,32], WINDOWS_1252);
  [2.1689]

  [3.143335]
  + check_bytes(&[68, 111, 110, 180, 116, 32], WINDOWS_1252);