From 6c4bb30e95f72bc0f8ff263064153171d28ac67e Mon Sep 17 00:00:00 2001 From: yuqing Date: Fri, 30 Oct 2020 14:58:59 +0800 Subject: remove FIXME after rust 1.47 comes out --- crates/project_model/src/sysroot.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'crates/project_model') diff --git a/crates/project_model/src/sysroot.rs b/crates/project_model/src/sysroot.rs index b2ff98a15..f6e883ad1 100644 --- a/crates/project_model/src/sysroot.rs +++ b/crates/project_model/src/sysroot.rs @@ -60,9 +60,7 @@ impl 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 @@ try running `rustup component add rust-src` or set `RUST_SRC_PATH`", fn get_rust_src(sysroot_path: &AbsPath) -> Option { // 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()) -- cgit v1.2.3