squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Remove support for old-style sysroot

Browse source
This commit is contained in:
Laurențiu Nicola 2021-10-04 18:36:56 +03:00
parent 9724ca7af1
commit a683c08729
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
crates/project_model/src/sysroot.rs
View file

@ -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 = "