Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-16 13:05:18 +03:00
Code Issues Packages Projects Releases 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
parent 1b7e350e80 6c4bb30e95
commit e7c8c600b7
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/project_model/src/sysroot.rs
+1 -6
View File
@@ -60,9 +60,7 @@ pub fn load(sysroot_src_dir: &AbsPath) -> Result<Sysroot> {
let mut sysroot = Sysroot { crates: Arena::default() };
for name in SYSROOT_CRATES.trim().lines() {
// FIXME: first path when 1.47 comes out
// https://github.com/rust-lang/rust/pull/73265
let root = [format!("lib{}/lib.rs", name), format!("{}/src/lib.rs", name)]
let root = [format!("{}/src/lib.rs", name), format!("lib{}/lib.rs", name)]
.iter()
.map(|it| sysroot_src_dir.join(it))
.find(|it| it.exists());
@@ -149,9 +147,6 @@ fn discover_sysroot_src_dir(current_dir: &AbsPath) -> Result<AbsPathBuf> {
fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
// 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");
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())