Re-adding anyhow in the tests of libpijul
[?]
Dec 8, 2020, 1:29 PM
3M7WBE24JTPTHWQOU5PO2ZJYKPKEH2F6R4M6RWIRFG334PQEA55QCDependencies
- [2]
3YDPHBANaddress non-controversial clippy lints - [3]
BZSC7VMYaddress clippy lints - [4]
SXEYMYF7Fixing the bad changes in history (unfortunately, by rebooting). - [5]
JACZWIJ6Version bump - [6]
I52XSRUHMassive cleanup, and simplification - [7]
SAGSYAPXVarious version bumps - [8]
WZVCLZKYaddress clippy lints - [9]
WIORLB47Version bump - [*]
OUWD436AVersion bump
Change contents
- replacement in libpijul/src/tests/unrecord.rs at line 22
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 69
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 196
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 204
repo2.write_file("file", |w| {repo2.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 210
repo2.write_file("file", |w| {repo2.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 263
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 275
repo2.write_file("file", |w| {repo2.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 429
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 438
Err(e) => {let e = e.downcast();if let Ok(Error::ChangeIsDependedUpon { .. }) = e {} else {unreachable!()}}Err(crate::unrecord::UnrecordError::ChangeIsDependedUpon { .. }) => {} - replacement in libpijul/src/tests/unrecord.rs at line 445
Err(e) => {let e = e.downcast();if let Ok(Error::ChangeNotOnChannel { .. }) = e {} else {unreachable!()}}Err(crate::unrecord::UnrecordError::ChangeNotInChannel { .. }) => {} - replacement in libpijul/src/tests/unrecord.rs at line 562
repo.write_file("file", |w| Ok(w.write_all(b"a\nx\nb\n")?))?;repo.write_file::<_, std::io::Error, _>("file", |w| Ok(w.write_all(b"a\nx\nb\n")?))?; - replacement in libpijul/src/tests/unrecord.rs at line 564
repo.write_file("file", |w| Ok(w.write_all(b"a\ny\nb\n")?))?;repo.write_file::<_, std::io::Error, _>("file", |w| Ok(w.write_all(b"a\ny\nb\n")?))?; - replacement in libpijul/src/tests/unrecord.rs at line 587
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 670
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 757
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 767
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 823
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/unrecord.rs at line 833
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/performance.rs at line 25
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/performance.rs at line 39
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/performance.rs at line 86
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/performance.rs at line 101
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/performance.rs at line 115
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/partial.rs at line 68
repo.write_file("a/b/c/d", |w| {repo.write_file::<_, std::io::Error, _>("a/b/c/d", |w| { - replacement in libpijul/src/tests/partial.rs at line 72
repo.write_file("e/f/g/h", |w| {repo.write_file::<_, std::io::Error, _>("e/f/g/h", |w| { - replacement in libpijul/src/tests/mod.rs at line 27
) -> Result<Hash, anyhow::Error> {) -> Result<Hash, anyhow::Error>whereR::Error: Send + Sync + 'static,{ - replacement in libpijul/src/tests/mod.rs at line 78
) -> Result<Hash, anyhow::Error> {) -> Result<Hash, anyhow::Error>whereR::Error: Send + Sync + 'static,{ - replacement in libpijul/src/tests/missing_context.rs at line 58
.write_file("file", |w| {.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/missing_context.rs at line 66
.write_file("file", |w| {.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/missing_context.rs at line 76
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/missing_context.rs at line 134
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - edit in libpijul/src/tests/missing_context.rs at line 157
crate::unrecord::unrecord(&mut txn_bob, &mut channel_bob, &changes, &alice_h)?;debug_to_file(&txn_bob, &channel_bob, "debug_bob2_unrec")?;apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?;debug_to_file(&txn_bob, &channel_bob, "debug_bob2_unrec_app")?;let mut buf = Vec::new(); - edit in libpijul/src/tests/missing_context.rs at line 175
crate::unrecord::unrecord(&mut txn_bob, &mut channel_bob, &changes, &alice_h)?;debug_to_file(&txn_alice, &channel_alice, "debug_bob2_unrec")?;apply::apply_change(&changes, &mut txn_bob, &mut channel_bob, alice_h)?; - edit in libpijul/src/tests/missing_context.rs at line 176
let mut buf = Vec::new(); - replacement in libpijul/src/tests/missing_context.rs at line 193
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/missing_context.rs at line 252
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/missing_context.rs at line 261
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/filesystem.rs at line 13
repo.write_file("dir/file", |f| Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?))?;repo.write_file::<_, std::io::Error, _>("dir/file", |f| {Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?)})?; - replacement in libpijul/src/tests/filesystem.rs at line 49
repo.write_file("dir/file", |f| Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?))?;repo.write_file::<_, std::io::Error, _>("dir/file", |f| {Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?)})?; - replacement in libpijul/src/tests/filesystem.rs at line 118
repo.write_file("dir/file", |f| Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?))?;repo.write_file::<_, std::io::Error, _>("dir/file", |f| {Ok(f.write_all(&b"a\nb\nc\nd\ne\nf\n"[..])?)})?; - replacement in libpijul/src/tests/file_conflicts.rs at line 518
repo_bob.write_file("a/b/c/file", |w| {repo_bob.write_file::<_, std::io::Error, _>("a/b/c/file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 644
repo_bob.write_file("a/b/c/file2", |w| {repo_bob.write_file::<_, std::io::Error, _>("a/b/c/file2", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 772
repo_bob.write_file("a/b/d/file", |w| {repo_bob.write_file::<_, std::io::Error, _>("a/b/d/file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 919
repo_bob.write_file("a/b/c/file", |w| {repo_bob.write_file::<_, std::io::Error, _>("a/b/c/file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 927
repo_charlie.write_file("a/b/c/file", |w| {repo_charlie.write_file::<_, std::io::Error, _>("a/b/c/file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 965
repo_alice.write_file("a/b/c/file", |w| {repo_alice.write_file::<_, std::io::Error, _>("a/b/c/file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 1430
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/file_conflicts.rs at line 1445
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 43
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 53
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 103
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 218
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 228
repo_charlie.write_file("file", |w| {repo_charlie.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 242
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 290
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 347
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 428
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 438
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 462
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 547
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 557
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 579
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 676
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 686
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 708
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 800
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 814
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 840
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 940
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 950
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 994
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1076
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1086
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1137
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1214
let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();let conflict: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect(); - replacement in libpijul/src/tests/conflict.rs at line 1262
let conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();let conflict: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect(); - replacement in libpijul/src/tests/conflict.rs at line 1279
Resolve: FnOnce(&[u8], &mut dyn std::io::Write) -> Result<(), anyhow::Error>,Resolve: FnOnce(&[u8], &mut dyn std::io::Write) -> Result<(), std::io::Error>, - replacement in libpijul/src/tests/conflict.rs at line 1320
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1330
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1354
repo_alice.write_file("file", |mut w| {repo_alice.write_file::<_, std::io::Error, _>("file", |mut w| { - replacement in libpijul/src/tests/conflict.rs at line 1441
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1452
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1475
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1498
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1570
.write_file("file", |w| {.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1601
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1634
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1710
.write_file("file", |w| {.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1740
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1768
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1858
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1866
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1874
repo_charlie.write_file("file", |w| {repo_charlie.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 1903
repo_alice.write_file("file", |w| Ok(w.write_all(alice_bob)?))?;repo_alice.write_file::<_, std::io::Error, _>("file", |w| Ok(w.write_all(alice_bob)?))?; - replacement in libpijul/src/tests/conflict.rs at line 1991
repo_charlie.write_file("file", |w| {repo_charlie.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2010
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2020
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2044
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2072
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2105
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2194
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2199
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2204
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2212
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2217
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2222
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2248
repo_alice.write_file("file", |w| {repo_alice.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2278
repo_bob.write_file("file", |w| {repo_bob.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/conflict.rs at line 2308
repo_charlie.write_file("file", |w| {repo_charlie.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/clone.rs at line 25
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/clone.rs at line 97
repo.write_file("a/b/c/d", |w| {repo.write_file::<_, std::io::Error, _>("a/b/c/d", |w| { - replacement in libpijul/src/tests/clone.rs at line 101
repo.write_file("e/f/g/h", |w| {repo.write_file::<_, std::io::Error, _>("e/f/g/h", |w| { - replacement in libpijul/src/tests/change.rs at line 18
Err(e) => {let e = e.downcast();if let Ok(Error::ChangeHashMismatch { .. }) = e {} else {unreachable!()}}Err(ChangeError::ChangeHashMismatch { .. }) => {} - replacement in libpijul/src/tests/change.rs at line 90
) -> Result<(Hash, Change), anyhow::Error> {) -> Result<(Hash, Change), anyhow::Error>whereR::Error: Send + Sync + 'static,{ - replacement in libpijul/src/tests/change.rs at line 143
repo.write_file("file", |w| {repo.write_file::<_, std::io::Error, _>("file", |w| { - replacement in libpijul/src/tests/add_file.rs at line 206
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/add_file.rs at line 235
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/add_file.rs at line 240
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/src/tests/add_file.rs at line 247
repo.write_file("dir/file", |w| {repo.write_file::<_, std::io::Error, _>("dir/file", |w| { - replacement in libpijul/Cargo.toml at line 122
env_logger = "0.8"[3.1023723]env_logger = "0.8"anyhow = "1.0" - edit in Cargo.lock at line 968[11.746][11.757]
"anyhow",