Fixing compilation errors in

pmeunier

Feb 23, 2023, 1:55 PM

CX2FTBQUYK4BPKDW3LNX4VS7O2EALLEY4VI7PSOZRAEJ5J4B664QC

Dependencies

• [2] BC3QS46O Fix test compilation
• [3] ZDK3GNDB Tag transactions (including a massive refactoring of errors)
• [4] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
• [5] MCAUAMZZ fix libpijul tests, and an unnecessary clone
• [6] I52XSRUH Massive cleanup, and simplification
• [7] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
• [8] TIPZ7UXN Started fixing the tests for parallel record/output
• [9] 55SCQOOH Fixing the tests
• [10] 6YMDOZIB Refactoring apply
• [11] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [12] YN63NUZO Sanakirja 1.0

Change contents

• replacement in libpijul/src/tests/unrecord.rs at line 275
  [2.49]→[3.258398:258473](∅→∅),[3.258398]→[3.258398:258473](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "file"),
  [2.49]

  [3.258473]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "file"),
• replacement in libpijul/src/tests/unrecord.rs at line 340
  [3.260745]→[3.260745:260815](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b"),
  [3.260745]

  [3.260815]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b"),
• replacement in libpijul/src/tests/unrecord.rs at line 344
  [3.260886]→[3.260886:260958](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c"),
  [3.260886]

  [3.260958]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c"),
• edit in libpijul/src/tests/file_conflicts.rs at line 939
  [3.40693]

  [3.40693]
  + changes: Vec::new(),

  + inode: [Position::ROOT],
• edit in libpijul/src/tests/file_conflicts.rs at line 944
  [3.40774]

  [3.40774]
  + changes: Vec::new(),

  + inode: [Position::ROOT],
• edit in libpijul/src/tests/file_conflicts.rs at line 949
  [3.40860]

  [3.40860]
  + changes: Vec::new(),

  + inode: [Position::ROOT],
• edit in libpijul/src/tests/file_conflicts.rs at line 955
  [3.40963]

  [3.40963]
  + changes: Vec::new(),

  + inode_vertex: [Position::ROOT],

  + id: 0,
• replacement in libpijul/src/tests/file_conflicts.rs at line 1111
  [2.554]→[3.341439:341517](∅→∅),[3.341439]→[3.341439:341517](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c/alice"),
  [2.554]

  [3.341517]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1196
  [2.600]→[3.6103:6181](∅→∅),[3.6103]→[3.6103:6181](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "a/b/c/alice"),
  [2.600]

  [3.344572]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a/b/c/alice"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1216
  [2.646]→[3.345044:345145](∅→∅),[3.345044]→[3.345044:345145](∅→∅)
  − Conflict::ZombieFile { ref path } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),
  [2.646]

  [3.345145]
  + Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1236
  [2.692]→[3.345602:345703](∅→∅),[3.345602]→[3.345602:345703](∅→∅)
  − Conflict::ZombieFile { ref path } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),
  [2.692]

  [3.345703]
  + Conflict::ZombieFile { ref path, .. } => assert!(path == "a/b/c/file" || path == "a/b/c/alice"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1308
  [2.738]→[3.348030:348107](∅→∅),[3.348030]→[3.348030:348107](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "alice/file"),
  [2.738]

  [3.348107]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1352
  [2.784]→[3.349305:349382](∅→∅),[3.349305]→[3.349305:349382](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "alice/file"),
  [2.784]

  [3.349382]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "alice/file"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1542
  [2.830]→[3.355630:355700](∅→∅),[3.355630]→[3.355630:355700](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "dir"),
  [2.830]

  [3.355700]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
• replacement in libpijul/src/tests/file_conflicts.rs at line 1580
  [2.876]→[3.356699:356769](∅→∅),[3.356699]→[3.356699:356769](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "dir"),
  [2.876]

  [3.356769]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "dir"),
• replacement in libpijul/src/tests/add_file.rs at line 570
  [2.1094]→[3.472621:472693](∅→∅),[3.472621]→[3.472621:472693](∅→∅)
  − Conflict::ZombieFile { ref path } => assert_eq!(path, "a"),
  [2.1094]

  [3.472693]
  + Conflict::ZombieFile { ref path, .. } => assert_eq!(path, "a"),