Skip to content

Commit e7c8c60

Browse files
bors[bot]yuqing
andauthored
Merge #6411
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 <[email protected]>
2 parents 1b7e350 + 6c4bb30 commit e7c8c60

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

crates/project_model/src/sysroot.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,7 @@ impl Sysroot {
6060
let mut sysroot = Sysroot { crates: Arena::default() };
6161

6262
for name in SYSROOT_CRATES.trim().lines() {
63-
// FIXME: first path when 1.47 comes out
64-
// https://github.com/rust-lang/rust/pull/73265
65-
let root = [format!("lib{}/lib.rs", name), format!("{}/src/lib.rs", name)]
63+
let root = [format!("{}/src/lib.rs", name), format!("lib{}/lib.rs", name)]
6664
.iter()
6765
.map(|it| sysroot_src_dir.join(it))
6866
.find(|it| it.exists());
@@ -149,9 +147,6 @@ try running `rustup component add rust-src` or set `RUST_SRC_PATH`",
149147

150148
fn get_rust_src(sysroot_path: &AbsPath) -> Option<AbsPathBuf> {
151149
// Try the new path first since the old one still exists.
152-
//
153-
// FIXME: remove `src` when 1.47 comes out
154-
// https://github.com/rust-lang/rust/pull/73265
155150
let rust_src = sysroot_path.join("lib/rustlib/src/rust");
156151
log::debug!("Checking sysroot (looking for `library` and `src` dirs): {}", rust_src.display());
157152
["library", "src"].iter().map(|it| rust_src.join(it)).find(|it| it.exists())

0 commit comments

Comments
 (0)