Skip to content
/ rust Public
forked from rust-lang/rust

Commit 13985f6

Browse files
authored
Rollup merge of rust-lang#150569 - miri-check, r=workingjubilee
Ensure that static initializers are acyclic for NVPTX With this, we should no longer need to turn off the default features, so we can undo rust-lang#149550. @bjorn3 you seem to have a test setup to check if this works properly in terms of skipping all the work that should not be required -- could you test if this PR works as intended? FWIW we could now remove `default_features` from `run_tool_check_step`. Not sure if that's worth it.
2 parents 0d715bc + 38ab519 commit 13985f6

File tree

1 file changed

+1
-2
lines changed
  • src/bootstrap/src/core/build_steps

1 file changed

+1
-2
lines changed

src/bootstrap/src/core/build_steps/check.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,7 @@ tool_check_step!(Clippy { path: "src/tools/clippy", mode: Mode::ToolRustcPrivate
793793
tool_check_step!(Miri {
794794
path: "src/tools/miri",
795795
mode: Mode::ToolRustcPrivate,
796-
enable_features: ["stack-cache"],
797-
default_features: false,
796+
enable_features: ["check_only"],
798797
});
799798
tool_check_step!(CargoMiri { path: "src/tools/miri/cargo-miri", mode: Mode::ToolRustcPrivate });
800799
tool_check_step!(Rustfmt { path: "src/tools/rustfmt", mode: Mode::ToolRustcPrivate });

0 commit comments

Comments
 (0)