Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5586

Browse source 
5586: Add workaround for changing sysroot paths r=jonas-schievink a=lnicola

Fixes #5577

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>
This commit is contained in:
bors[bot] 2020-07-30 12:26:04 +00:00 committed by GitHub
commit 5844dd0bb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
crates/ra_project_model/src/sysroot.rs
View file

@ -54,6 +54,8 @@ impl Sysroot {
let src = get_or_install_rust_src(cargo_toml)?; let src = get_or_install_rust_src(cargo_toml)?;
let mut sysroot = Sysroot { crates: Arena::default() }; let mut sysroot = Sysroot { crates: Arena::default() };
for name in SYSROOT_CRATES.trim().lines() { for name in SYSROOT_CRATES.trim().lines() {
// FIXME: remove this path when 1.47 comes out
// https://github.com/rust-lang/rust/pull/73265
let root = src.join(format!("lib{}", name)).join("lib.rs"); let root = src.join(format!("lib{}", name)).join("lib.rs");
if root.exists() { if root.exists() {
sysroot.crates.alloc(SysrootCrateData { sysroot.crates.alloc(SysrootCrateData {
@ -61,6 +63,15 @@ impl Sysroot {
root, root,
deps: Vec::new(), deps: Vec::new(),
}); });
} else {
let root = src.join(name).join("src/lib.rs");
if root.exists() {
sysroot.crates.alloc(SysrootCrateData {
name: name.into(),
root,
deps: Vec::new(),
});
}
} }
} }
if let Some(std) = sysroot.std() { if let Some(std) = sysroot.std() {
@ -94,23 +105,38 @@ fn get_or_install_rust_src(cargo_toml: &AbsPath) -> Result<AbsPathBuf> {
rustc.current_dir(current_dir).args(&["--print", "sysroot"]); rustc.current_dir(current_dir).args(&["--print", "sysroot"]);
let stdout = utf8_stdout(rustc)?; let stdout = utf8_stdout(rustc)?;
let sysroot_path = AbsPath::assert(Path::new(stdout.trim())); let sysroot_path = AbsPath::assert(Path::new(stdout.trim()));
let src_path = sysroot_path.join("lib/rustlib/src/rust/src"); let mut src = get_rust_src(sysroot_path);
if src.is_none() {
if !src_path.exists() {
let mut rustup = Command::new(ra_toolchain::rustup()); let mut rustup = Command::new(ra_toolchain::rustup());
rustup.current_dir(current_dir).args(&["component", "add", "rust-src"]); rustup.current_dir(current_dir).args(&["component", "add", "rust-src"]);
utf8_stdout(rustup)?; utf8_stdout(rustup)?;
src = get_rust_src(sysroot_path);
} }
if !src_path.exists() { match src {
bail!( Some(r) => Ok(r),
None => bail!(
"can't load standard library from sysroot\n\ "can't load standard library from sysroot\n\
{}\n\ {}\n\
(discovered via `rustc --print sysroot`)\n\ (discovered via `rustc --print sysroot`)\n\
try running `rustup component add rust-src` or set `RUST_SRC_PATH`", try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
src_path.display(), sysroot_path.display(),
) ),
}
}
fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
// try the new path first since the old one still exists
let mut src_path = sysroot_path.join("lib/rustlib/src/rust/library");
if !src_path.exists() {
// FIXME: remove this path when 1.47 comes out
// https://github.com/rust-lang/rust/pull/73265
src_path = sysroot_path.join("lib/rustlib/src/rust/src");
}
if src_path.exists() {
Some(src_path)
} else {
None
} }
Ok(src_path)
} }
impl SysrootCrateData { impl SysrootCrateData {