aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_project_model/src/sysroot.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_project_model/src/sysroot.rs')
-rw-r--r--crates/ra_project_model/src/sysroot.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_project_model/src/sysroot.rs b/crates/ra_project_model/src/sysroot.rs
index 8b87aa7bd..d6eb824a3 100644
--- a/crates/ra_project_model/src/sysroot.rs
+++ b/crates/ra_project_model/src/sysroot.rs
@@ -38,18 +38,18 @@ impl Sysroot {
38 .args(&["--print", "sysroot"]) 38 .args(&["--print", "sysroot"])
39 .output()?; 39 .output()?;
40 if !rustc_output.status.success() { 40 if !rustc_output.status.success() {
41 failure::bail!("failed to locate sysroot") 41 Err("failed to locate sysroot")?
42 } 42 }
43 let stdout = String::from_utf8(rustc_output.stdout)?; 43 let stdout = String::from_utf8(rustc_output.stdout)?;
44 let sysroot_path = Path::new(stdout.trim()); 44 let sysroot_path = Path::new(stdout.trim());
45 let src = sysroot_path.join("lib/rustlib/src/rust/src"); 45 let src = sysroot_path.join("lib/rustlib/src/rust/src");
46 if !src.exists() { 46 if !src.exists() {
47 failure::bail!( 47 Err(format!(
48 "can't load standard library from sysroot\n\ 48 "can't load standard library from sysroot\n\
49 {:?}\n\ 49 {:?}\n\
50 try running `rustup component add rust-src`", 50 try running `rustup component add rust-src`",
51 src, 51 src,
52 ); 52 ))?;
53 } 53 }
54 54
55 let mut sysroot = Sysroot { crates: Arena::default() }; 55 let mut sysroot = Sysroot { crates: Arena::default() };