Skip to content

remove FIXME after rust 1.47 comes out #6411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 30, 2020
Merged

remove FIXME after rust 1.47 comes out #6411

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions crates/project_model/src/sysroot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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> {
// 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())
Expand Down