support .cargo/config.toml

closes japaric#9 ref https://github.com/probe-rs/cargo-embed/issues/29
benmkw · Aug 22, 2020 · 7619f29 · 7619f29
1 parent 6f7e79e
commit 7619f29
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -72,12 +72,14 @@ impl Project {
         // parse Cargo.toml
         let toml = root.join("Cargo.toml");
         let cargo_config = Path::new(".cargo").join("config");
+        let cargo_config_toml = Path::new(".cargo").join("config.toml");
         let manifest = parse::<Manifest>(&toml)?;
 
-        // parse .cargo/config
+        // parse .cargo/config or .cargo/config.toml
         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) {
+        if let Some(path) = search(root, &cargo_config).or_else(|| search(root, &cargo_config_toml))
+        {
             let config: Config = parse(&path.join(&cargo_config))?;
 
             if let Some(build) = config.build {