]> git.lizzy.rs Git - rust.git/commitdiff
Better error if Cargo is not in Path
authorAleksey Kladov <aleksey.kladov@gmail.com>
Wed, 19 Aug 2020 14:34:11 +0000 (16:34 +0200)
committerAleksey Kladov <aleksey.kladov@gmail.com>
Wed, 19 Aug 2020 14:34:11 +0000 (16:34 +0200)
crates/project_model/src/lib.rs

index 1f5a94d7f98f5fc40542b0610a91ef1ae352110e..84d1303dbbea443ab0f04e88bc3e8e551e37e532 100644 (file)
@@ -151,11 +151,18 @@ pub fn load(
                 ProjectWorkspace::Json { project }
             }
             ProjectManifest::CargoToml(cargo_toml) => {
+                let cargo_version = utf8_stdout({
+                    let mut cmd = Command::new(toolchain::cargo());
+                    cmd.arg("--version");
+                    cmd
+                })?;
+
                 let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_config)
                     .with_context(|| {
                         format!(
-                            "Failed to read Cargo metadata from Cargo.toml file {}",
-                            cargo_toml.display()
+                            "Failed to read Cargo metadata from Cargo.toml file {}, {}",
+                            cargo_toml.display(),
+                            cargo_version
                         )
                     })?;
                 let sysroot = if with_sysroot {