fix(source): Make duplicate selection predictable

epage · epage · commit 800a482e3779 · 2024-07-11T20:29:39.000-05:00
diff --git a/src/cargo/sources/path.rs b/src/cargo/sources/path.rs
@@ -882,6 +882,8 @@ fn walk(path: &Path, callback: &mut dyn FnMut(&Path) -> CargoResult<bool>) -> Ca
             return Err(e.context(cx));
         }
     };
+    let mut dirs = dirs.collect::<Vec<_>>();
+    dirs.sort_unstable_by_key(|d| d.as_ref().ok().map(|d| d.file_name()));
     for dir in dirs {
         let dir = dir?;
         if dir.file_type()?.is_dir() {

Original file line number	Diff line number	Diff line change
`@@ -882,6 +882,8 @@ fn walk(path: &Path, callback: &mut dyn FnMut(&Path) -> CargoResult<bool>) -> Ca`
`882`	`882`	`return Err(e.context(cx));`
`883`	`883`	`}`
`884`	`884`	`};`
	`885`	`+ let mut dirs = dirs.collect::<Vec<_>>();`
	`886`	`+ dirs.sort_unstable_by_key(\|d\| d.as_ref().ok().map(\|d\| d.file_name()));`
`885`	`887`	`for dir in dirs {`
`886`	`888`	`let dir = dir?;`
`887`	`889`	`if dir.file_type()?.is_dir() {`