about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-02-10 16:05:27 +0000
committerGitHub <noreply@github.com>2020-02-10 16:05:27 +0000
commit29f5e7eebf606c1929d5a77ad66624cd4f3fcf49 (patch)
tree1842c1b727febb929fe6b9fd19d67e15d7fbd59b
parent5b703bdc582be427ee62d250b3d3290165c36b8c (diff)
parent5a71eb87497d053204dedf3e1960f6a8298e87c5 (diff)
downloadrust-29f5e7eebf606c1929d5a77ad66624cd4f3fcf49.tar.gz
rust-29f5e7eebf606c1929d5a77ad66624cd4f3fcf49.zip
Merge #3084
3084: More specific error if `rustc --print sysroot` fails r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
-rw-r--r--crates/ra_project_model/src/sysroot.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 34d066b1e3b..a23265fc08e 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -99,7 +99,8 @@ fn try_find_src_path(cargo_toml: &Path) -> Result<PathBuf> {
     let rustc_output = Command::new("rustc")
         .current_dir(cargo_toml.parent().unwrap())
         .args(&["--print", "sysroot"])
-        .output()?;
+        .output()
+        .map_err(|e| format!("rustc --print sysroot failed: {}", e))?;
     if !rustc_output.status.success() {
         Err("failed to locate sysroot")?;
     }