language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-08-28 22:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Report better errors in project.json/sysroot

Browse source
This commit is contained in:
Jonas Schievink 2020-09-11 14:48:56 +02:00
parent 4f1167d8dd
commit 681ac6294a
4 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,11 +51,11 @@ impl Sysroot {
pub fn discover(cargo_toml: &AbsPath) -> Result<Sysroot> {
let current_dir = cargo_toml.parent().unwrap();
let sysroot_src_dir = discover_sysroot_src_dir(current_dir)?;
let res = Sysroot::load(&sysroot_src_dir);
let res = Sysroot::load(&sysroot_src_dir)?;
Ok(res)
}
pub fn load(sysroot_src_dir: &AbsPath) -> Sysroot {
pub fn load(sysroot_src_dir: &AbsPath) -> Result<Sysroot> {
let mut sysroot = Sysroot { crates: Arena::default() };
for name in SYSROOT_CRATES.trim().lines() {
@ -89,7 +89,14 @@ impl Sysroot {
}
}
sysroot
if sysroot.by_name("core").is_none() {
anyhow::bail!(
"could not find libcore in sysroot path `{}`",
sysroot_src_dir.as_ref().display()
);
}
Ok(sysroot)
}
fn by_name(&self, name: &str) -> Option<SysrootCrate> {