Fix test compilation

[?]

FHRXP5Jnb2MWLDrPrnLnkN2ryWcGCo6CRr1dXR9FW2YA

Sep 13, 2021, 9:07 PM

OEKRRU6OMDAHD3UT2L56WTAVYMJUZM7JBTRJBJR6MAV7EXBPTHYQC

Dependencies

[2] SFJ3XRTF Proper escaping of UTF-8 filenames in the patch text format
[3] CCLLB7OI Upgrading to Sanakirja 0.15 + version bump
[4] ZRUPLBBT Colours in diff and change: separating concerns and dependencies
[5] RRCSHAYZ Formatting
[6] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
[7] SHSJ3Y53 Fixing more tests
[8] X7OHUPL5 Fixing a bug in unrecord, and fixing the tests
[9] Q3GU26WD merge with changes from sanakirja v1.1.2
[10] GHO6DWPI Refactoring iterators
[11] VO5OQW4W Removing anyhow in libpijul
[12] YN63NUZO Sanakirja 1.0
[13] I24UEJQL Various post-fire fixes
[14] TIPZ7UXN Started fixing the tests for parallel record/output
[15] FXEDPLRI Resurrecting tests, and type cleanup (no need for Arc<RwLock<…>> anymore)
[16] BZSC7VMY address clippy lints
[17] NO2QPRFL Adding rollback test
[18] I52XSRUH Massive cleanup, and simplification

Change contents

replacement in libpijul/src/tests/unrecord.rs at line 2

[3.248822]→[3.248822:248860](∅→∅)

use crate::working_copy::WorkingCopy;

[3.248822]

[3.3478]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
replacement in libpijul/src/tests/text.rs at line 24

[3.765]→[3.765:833](∅→∅),[3.833]→[3.833:887](∅→∅),[3.887]→[3.887:954](∅→∅)

change
.write(
&store,
Some(h),
|l, _p| format!("{}:{}", l.path, l.line),
true,
&mut v,
)
.unwrap();

[3.765]

[3.954]

change.write(&store, Some(h), true, &mut v).unwrap();
replacement in libpijul/src/tests/text.rs at line 71

[3.2374]→[3.2374:2444](∅→∅),[3.2444]→[3.2444:2498](∅→∅),[3.2498]→[3.2498:2565](∅→∅)

change1
.write(
&store,
Some(h1),
|l, _p| format!("{}:{}", l.path, l.line),
true,
&mut v,
)
.unwrap();

[3.2374]

[3.2565]

change1.write(&store, Some(h1), true, &mut v).unwrap();
replacement in libpijul/src/tests/rollback.rs at line 2

[3.29]→[3.29:67](∅→∅)

use crate::working_copy::WorkingCopy;

[3.29]

[3.12700]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
edit in libpijul/src/tests/performance.rs at line 2

[3.278216]

[3.278216]

use crate::pristine::GraphIter;
replacement in libpijul/src/tests/performance.rs at line 47

[3.279819]→[3.16374:16412](∅→∅)

let channel = channel.read();

[3.279819]

[3.6005]

let graph = &channel.read().graph;
replacement in libpijul/src/tests/performance.rs at line 49

[3.6028]→[3.16413:16569](∅→∅)

let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {

[3.6028]

[3.6164]

let mut cursor = txn.read().graph_cursor(graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(graph, &mut cursor) {
replacement in libpijul/src/tests/performance.rs at line 139

[3.282400]→[3.17742:17780](∅→∅)

let channel = channel.read();

[3.282400]

[3.6615]

let graph = &channel.read().graph;
replacement in libpijul/src/tests/performance.rs at line 141

[3.6638]→[3.17781:17937](∅→∅)

let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {

[3.6638]

[3.6774]

let mut cursor = txn.read().graph_cursor(graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(graph, &mut cursor) {
replacement in libpijul/src/tests/performance.rs at line 152

[3.282696]→[3.17938:17977](∅→∅)

let channel = channel2.read();

[3.282696]

[3.6804]

let graph = &channel2.read().graph;
replacement in libpijul/src/tests/performance.rs at line 154

[3.6827]→[3.17978:18134](∅→∅)

let mut it = txn.read().iter_graph(&channel.graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(&channel.graph, &mut it) {

[3.6827]

[3.6963]

let mut cursor = txn.read().graph_cursor(graph, None).unwrap();
while let Some(Ok(_)) = txn.read().next_graph(graph, &mut cursor) {
replacement in libpijul/src/tests/partial.rs at line 2

[3.285295]→[3.285295:285333](∅→∅)

use crate::working_copy::WorkingCopy;

[3.285294]

[3.18135]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
replacement in libpijul/src/tests/mod.rs at line 27

[3.20043]→[3.22129:22181](∅→∅),[3.22129]→[3.22129:22181](∅→∅)

P: ChangeStore + Clone + Send + Sync + 'static,

[3.20043]

[3.22181]

P: ChangeStore + Clone + Send + 'static,
replacement in libpijul/src/tests/mod.rs at line 75

[3.290833]→[3.290833:290904](∅→∅),[3.290904]→[3.290904:290962](∅→∅),[3.290962]→[3.290962:291038](∅→∅)

.write(
store,
Some(hash),
|l, _p| format!("{}:{}", l.path, l.line),
true,
&mut std::io::stderr(),
)

[3.290833]

[3.291038]

.write(store, Some(hash), true, &mut std::io::stderr())
replacement in libpijul/src/tests/mod.rs at line 98

[3.20433]→[3.1025:1077](∅→∅),[3.1025]→[3.1025:1077](∅→∅)

P: ChangeStore + Clone + Send + Sync + 'static,

[3.20433]

[3.574]

P: ChangeStore + Clone + Send + 'static,
replacement in libpijul/src/tests/missing_context.rs at line 2

[3.291660]→[3.291660:291698](∅→∅)

use crate::working_copy::WorkingCopy;

[3.291659]

[3.20861]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
edit in libpijul/src/tests/filesystem.rs at line 3

[3.25057]

[3.300445]

const MAX_FILES: usize = 10;
replacement in libpijul/src/tests/filesystem.rs at line 14

[3.300691]→[3.300691:300767](∅→∅)

let changes = changestore::filesystem::FileSystem::from_root(f.path());

[3.300691]

[3.300767]

let changes = changestore::filesystem::FileSystem::from_root(f.path(), MAX_FILES);
replacement in libpijul/src/tests/filesystem.rs at line 50

[3.301885]→[3.301885:301961](∅→∅)

let changes = changestore::filesystem::FileSystem::from_root(f.path());

[3.301885]

[3.301961]

let changes = changestore::filesystem::FileSystem::from_root(f.path(), MAX_FILES);
replacement in libpijul/src/tests/filesystem.rs at line 89

[3.303227]→[3.303227:303303](∅→∅)

let changes = changestore::filesystem::FileSystem::from_root(f.path());

[3.303227]

[3.303303]

let changes = changestore::filesystem::FileSystem::from_root(f.path(), MAX_FILES);
replacement in libpijul/src/tests/filesystem.rs at line 120

[3.304377]→[3.304377:304453](∅→∅)

let changes = changestore::filesystem::FileSystem::from_root(f.path());

[3.304377]

[3.304453]

let changes = changestore::filesystem::FileSystem::from_root(f.path(), MAX_FILES);
replacement in libpijul/src/tests/file_conflicts.rs at line 2

[3.305522]→[3.305522:305560](∅→∅)

use crate::working_copy::WorkingCopy;

[3.305521]

[3.27700]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
replacement in libpijul/src/tests/file_conflicts.rs at line 769

[3.330575]→[3.38181:38248](∅→∅)

txn_alice.write().add_file("a/b/d/file", 0).unwrap_or(());

[3.330575]

[3.330631]

let _ = txn_alice.write().add_file("a/b/d/file", 0);
edit in libpijul/src/tests/conflict.rs at line 1

[3.357372]

[3.357428]

use crate::working_copy::WorkingCopyRead;
replacement in libpijul/src/tests/clone.rs at line 2

[3.441463]→[3.441463:441501](∅→∅)

use crate::working_copy::WorkingCopy;

[3.441463]

[3.81243]

use crate::working_copy::{WorkingCopy, WorkingCopyRead};
replacement in libpijul/src/tests/change.rs at line 156

[3.452484]→[3.452484:452548](∅→∅),[3.452548]→[3.452548:452602](∅→∅),[3.452602]→[3.452602:452669](∅→∅)

change0
.write(
c,
Some(h),
|l, _p| format!("{}:{}", l.path, l.line),
true,
&mut v,
)
.unwrap();

[3.452484]

[3.452669]

change0.write(c, Some(h), true, &mut v).unwrap();
edit in libpijul/src/tests/add_file.rs at line 1

[3.454125]

[3.454126]

use crate::working_copy::WorkingCopyRead;
edit in libpijul/src/change/text_changes.rs at line 358

[3.48808]→[2.1183:1184](∅→∅)