Merge pull request #12 from jonas-schievink/fix-cargo-config-search

Fix search for Cargo configuration
japaric · Sep 22, 2021 · 5889a7e · 5889a7e
2 parents 334832d + 17924e0
commit 5889a7e
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -78,8 +78,18 @@ impl Project {
         // parse .cargo/config
         let mut target = None;
         let mut target_dir = env::var_os("CARGO_TARGET_DIR").map(PathBuf::from);
-        if let Some(path) = search(root, &cargo_config).map(|path| path.join(cargo_config)).or_else(|| {
-            search(root, &cargo_config_toml).map(|path| path.join(cargo_config_toml))
+        if let Some(path) = path.ancestors().find_map(|dir| {
+            let path = dir.join(&cargo_config);
+            if path.exists() {
+                return Some(path);
+            }
+
+            let path = dir.join(&cargo_config_toml);
+            if path.exists() {
+                return Some(path);
+            }
+
+            None
         }) {
             let config: Config = parse(&path)?;