Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6411

Browse source 
6411: remove FIXME after rust 1.47 comes out r=lnicola a=qy3u

Remove 'FIXME' after rust 1.47 comes out.  And for compatibility with versions before 1.47, did't remove 'src'.

Co-authored-by: yuqing <yuqing@ipfsforce.com>
This commit is contained in:
bors[bot] 2020-10-30 07:10:31 +00:00 committed by GitHub
commit e7c8c600b7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,9 +60,7 @@ impl Sysroot {
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: first path when 1.47 comes out let root = [format!("{}/src/lib.rs", name), format!("lib{}/lib.rs", name)]
// https://github.com/rust-lang/rust/pull/73265
let root = [format!("lib{}/lib.rs", name), format!("{}/src/lib.rs", name)]
.iter() .iter()
.map(|it| sysroot_src_dir.join(it)) .map(|it| sysroot_src_dir.join(it))
.find(|it| it.exists()); .find(|it| it.exists());
@ -149,9 +147,6 @@ try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> { fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
// Try the new path first since the old one still exists. // Try the new path first since the old one still exists.
//
// FIXME: remove `src` when 1.47 comes out
// https://github.com/rust-lang/rust/pull/73265
let rust_src = sysroot_path.join("lib/rustlib/src/rust"); let rust_src = sysroot_path.join("lib/rustlib/src/rust");
log::debug!("Checking sysroot (looking for `library` and `src` dirs): {}", rust_src.display()); log::debug!("Checking sysroot (looking for `library` and `src` dirs): {}", rust_src.display());
["library", "src"].iter().map(|it| rust_src.join(it)).find(|it| it.exists()) ["library", "src"].iter().map(|it| rust_src.join(it)).find(|it| it.exists())