Skip to content

Commit bc0bc91

Browse files
committed
remove redundant FIXMEs
Signed-off-by: onur-ozkan <[email protected]>
1 parent 37984bb commit bc0bc91

File tree

3 files changed

+6
-17
lines changed

3 files changed

+6
-17
lines changed

Diff for: src/bootstrap/src/core/build_steps/tool.rs

+1-6
Original file line numberDiff line numberDiff line change
@@ -1091,18 +1091,13 @@ macro_rules! tool_extended {
10911091
}
10921092
}
10931093

1094-
// NOTE: tools need to be also added to `Builder::get_step_descriptions` in `builder.rs`
1095-
// to make `./x.py build <tool>` work.
10961094
tool_extended!((self, builder),
10971095
Cargofmt, "src/tools/rustfmt", "cargo-fmt", stable=true;
10981096
CargoClippy, "src/tools/clippy", "cargo-clippy", stable=true;
10991097
Clippy, "src/tools/clippy", "clippy-driver", stable=true, add_bins_to_sysroot = ["clippy-driver", "cargo-clippy"];
11001098
Miri, "src/tools/miri", "miri", stable=false, add_bins_to_sysroot = ["miri"];
11011099
CargoMiri, "src/tools/miri/cargo-miri", "cargo-miri", stable=true, add_bins_to_sysroot = ["cargo-miri"];
1102-
// FIXME: tool_std is not quite right, we shouldn't allow nightly features.
1103-
// But `builder.cargo` doesn't know how to handle ToolBootstrap in stages other than 0,
1104-
// and this is close enough for now.
1105-
Rls, "src/tools/rls", "rls", stable=true, tool_std=true;
1100+
Rls, "src/tools/rls", "rls", stable=true;
11061101
Rustfmt, "src/tools/rustfmt", "rustfmt", stable=true, add_bins_to_sysroot = ["rustfmt", "cargo-fmt"];
11071102
);
11081103

Diff for: src/bootstrap/src/core/builder.rs

+5-9
Original file line numberDiff line numberDiff line change
@@ -1449,15 +1449,11 @@ impl<'a> Builder<'a> {
14491449
assert_eq!(target, compiler.host);
14501450
}
14511451

1452-
if self.config.rust_optimize.is_release() {
1453-
// FIXME: cargo bench/install do not accept `--release`
1454-
// and miri doesn't want it
1455-
match cmd_kind {
1456-
Kind::Bench | Kind::Install | Kind::Miri | Kind::MiriSetup | Kind::MiriTest => {}
1457-
_ => {
1458-
cargo.arg("--release");
1459-
}
1460-
}
1452+
if self.config.rust_optimize.is_release() &&
1453+
// cargo bench/install do not accept `--release` and miri doesn't want it
1454+
!matches!(cmd_kind, Kind::Bench | Kind::Install | Kind::Miri | Kind::MiriSetup | Kind::MiriTest)
1455+
{
1456+
cargo.arg("--release");
14611457
}
14621458

14631459
// Remove make-related flags to ensure Cargo can correctly set things up

Diff for: src/bootstrap/src/core/download.rs

-2
Original file line numberDiff line numberDiff line change
@@ -616,8 +616,6 @@ impl Config {
616616
};
617617

618618
// For the beta compiler, put special effort into ensuring the checksums are valid.
619-
// FIXME: maybe we should do this for download-rustc as well? but it would be a pain to update
620-
// this on each and every nightly ...
621619
let checksum = if should_verify {
622620
let error = format!(
623621
"src/stage0 doesn't contain a checksum for {url}. \

0 commit comments

Comments
 (0)