itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better error if Cargo is not in Path

Browse Source
This commit is contained in:
Aleksey Kladov 2020-08-19 16:34:11 +02:00
parent 70fd542822
commit 73f4fcbd0f
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/project_model/src/lib.rs
View File

@ -151,11 +151,18 @@ impl ProjectWorkspace {
ProjectWorkspace::Json { project } ProjectWorkspace::Json { project }
} }
ProjectManifest::CargoToml(cargo_toml) => { 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) let cargo = CargoWorkspace::from_cargo_metadata(&cargo_toml, cargo_config)
.with_context(|| { .with_context(|| {
format!( format!(
"Failed to read Cargo metadata from Cargo.toml file {}", "Failed to read Cargo metadata from Cargo.toml file {}, {}",
cargo_toml.display() cargo_toml.display(),
cargo_version
) )
})?; })?;
let sysroot = if with_sysroot { let sysroot = if with_sysroot {