From 9e306909dbb594ba013142f3600908889bd98976 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Mon, 21 Jun 2021 15:26:26 +0200 Subject: [PATCH] Update sysroot crates --- crates/project_model/src/sysroot.rs | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs index a22f79c15d8..006263da8ff 100644 --- a/crates/project_model/src/sysroot.rs +++ b/crates/project_model/src/sysroot.rs @@ -68,8 +68,9 @@ pub fn discover_rustc(cargo_toml: &AbsPath) -> Option { pub fn load(sysroot_src_dir: &AbsPath) -> Result { let mut sysroot = Sysroot { crates: Arena::default() }; - for name in SYSROOT_CRATES.trim().lines() { - let root = [format!("{}/src/lib.rs", name), format!("lib{}/lib.rs", name)] + for path in SYSROOT_CRATES.trim().lines() { + let name = path.split('/').last().unwrap(); + let root = [format!("{}/src/lib.rs", path), format!("lib{}/lib.rs", path)] .iter() .map(|it| sysroot_src_dir.join(it)) .find(|it| it.exists()); @@ -191,9 +192,8 @@ pub fn root_dir(&self) -> &AbsPath { panic_unwind proc_macro profiler_builtins -rtstartup std -stdarch +stdarch/crates/std_detect term test unwind"; @@ -204,9 +204,8 @@ pub fn root_dir(&self) -> &AbsPath { panic_abort panic_unwind profiler_builtins -rtstartup proc_macro -stdarch +std_detect term test unwind"; -- 2.44.0