about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurențiu Nicola <lnicola@dend.ro>2021-10-04 18:36:56 +0300
committerLaurențiu Nicola <lnicola@dend.ro>2021-10-04 18:36:56 +0300
commita683c08729db290bb1825a724d8e93062bc3cd0e (patch)
tree47fdf9349228443938c541e55fabc0370b00686e
parent9724ca7af1e5533ab1bdbefcd17061dc141ecf26 (diff)
downloadrust-a683c08729db290bb1825a724d8e93062bc3cd0e.tar.gz
rust-a683c08729db290bb1825a724d8e93062bc3cd0e.zip
Remove support for old-style sysroot
-rw-r--r--crates/project_model/src/sysroot.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs
index 153cbc1c84b..a7a7cb6da02 100644
--- a/crates/project_model/src/sysroot.rs
+++ b/crates/project_model/src/sysroot.rs
@@ -188,13 +188,13 @@ fn get_rustc_src(sysroot_path: &AbsPath) -> Option<ManifestPath> {
 }
 
 fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
-    // Try the new path first since the old one still exists.
-    let rust_src = sysroot_path.join("lib/rustlib/src/rust");
-    tracing::debug!(
-        "Checking sysroot (looking for `library` and `src` dirs): {}",
-        rust_src.display()
-    );
-    ["library", "src"].iter().map(|it| rust_src.join(it)).find(|it| fs::metadata(it).is_ok())
+    let rust_src = sysroot_path.join("lib/rustlib/src/rust/library");
+    tracing::debug!("Checking sysroot: {}", rust_src.display());
+    if fs::metadata(&rust_src).is_ok() {
+        Some(rust_src)
+    } else {
+        None
+    }
 }
 
 const SYSROOT_CRATES: &str = "