Use walkdir's built-in sorting option.

ehuss · ehuss · commit 56c8d90d13d6 · 2023-11-11T10:56:59.000-08:00
diff --git a/crates/cargo-test-support/src/paths.rs b/crates/cargo-test-support/src/paths.rs
@@ -160,12 +160,11 @@ impl CargoPathExt for Path {
     }
 
     fn ls_r(&self) -> Vec<PathBuf> {
-        let mut file_list: Vec<_> = walkdir::WalkDir::new(self)
+        walkdir::WalkDir::new(self)
+            .sort_by_file_name()
             .into_iter()
             .filter_map(|e| e.map(|e| e.path().to_owned()).ok())
-            .collect();
-        file_list.sort();
-        file_list
+            .collect()
     }
 
     fn move_in_time<F>(&self, travel_amount: F)

Original file line number	Diff line number	Diff line change
`@@ -160,12 +160,11 @@ impl CargoPathExt for Path {`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`fn ls_r(&self) -> Vec<PathBuf> {`
`163`		`- let mut file_list: Vec<_> = walkdir::WalkDir::new(self)`
	`163`	`+ walkdir::WalkDir::new(self)`
	`164`	`+ .sort_by_file_name()`
`164`	`165`	`.into_iter()`
`165`	`166`	`.filter_map(\|e\| e.map(\|e\| e.path().to_owned()).ok())`
`166`		`- .collect();`
`167`		`- file_list.sort();`
`168`		`- file_list`
	`167`	`+ .collect()`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`fn move_in_time<F>(&self, travel_amount: F)`