Skip to content

Commit f655b86

Browse files
authored
Merge pull request #252 from peret/fix-multiple-names-test
Fix multiple names test
2 parents 8e29f89 + 947bde5 commit f655b86

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

tests/_utils.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@ impl Default for SampleWorkspace {
7474
fn default() -> Self {
7575
let temp = Temp::new_dir().expect("create working directory for sample workspace");
7676

77-
MergeableFileSystemTree::<&str, &str>::from(dir! {
77+
MergeableFileSystemTree::<&str, String>::from(dir! {
7878
"flat" => dir! {
7979
"0" => file!("")
80-
"1" => file!("a")
81-
"2" => file!("ab")
82-
"3" => file!("abc")
80+
"1" => file!("a".repeat(1000))
81+
"2" => file!("a".repeat(2000))
82+
"3" => file!("a".repeat(3000))
8383
}
8484
"nested" => dir! {
8585
"0" => dir! {
86-
"1" => file!("abcdef")
86+
"1" => file!("a".repeat(5000))
8787
}
8888
}
8989
"empty-dir" => dir! {}

tests/usual_cli.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@ fn multiple_names() {
617617
reporter: ErrorOnlyReporter::new(ErrorReport::SILENT),
618618
};
619619
let mut data_tree: DataTree<OsStringDisplay, _> = builder.into();
620-
data_tree.par_sort_by(|left, right| left.data().cmp(&right.data()).reverse());
621620
*data_tree.name_mut() = OsStringDisplay::os_string_from(name);
622621
data_tree
623622
})
@@ -627,7 +626,8 @@ fn multiple_names() {
627626
0.into(),
628627
children.collect(),
629628
)
630-
});
629+
})
630+
.into_par_sorted(|left, right| left.data().cmp(&right.data()).reverse());
631631
data_tree.par_cull_insignificant_data(0.01);
632632
let visualizer = Visualizer::<OsStringDisplay, _> {
633633
data_tree: &data_tree,

0 commit comments

Comments
 (0)