Skip to content

Check for missing rustfmt in the stdarch intrinsic test step sooner #161641

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
rust-bors merged 1 commit into from
Aug 25, 2026
+8 −8
Merged

Check for missing rustfmt in the stdarch intrinsic test step sooner #161641

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
16 changes: 8 additions & 8 deletions src/bootstrap/src/core/build_steps/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,14 @@ impl CommandLineStep for IntrinsicTest {
builder.info(&format!("Skipping intrinsic-test, as it is not available for {host}"));
return;
}
// intrinsic-test shells out to `cargo` and `rustfmt` make bootstrap's
// managed binaries findable by prepending their dirs to PATH.
let Some(rustfmt_path) = builder.ensure(InternalRustfmt) else {
eprintln!(
"WARNING: intrinsic-test skipped because rustfmt is required but not available on this channel"
);
return;
};

let (input_file, skip_file, cflags, sde_runner) = if host.contains("x86_64-unknown-linux") {
let Some(sde) = &builder.config.sde else {
Expand Down Expand Up @@ -1172,14 +1180,6 @@ impl CommandLineStep for IntrinsicTest {
cmd.arg("--cc-arg-style").arg("gcc");
cmd.env("CC", builder.cc(host));
cmd.env("CFLAGS", cflags);
// intrinsic-test shells out to `cargo` and `rustfmt` make bootstrap's
// managed binaries findable by prepending their dirs to PATH.
let Some(rustfmt_path) = builder.ensure(InternalRustfmt) else {
eprintln!(
"WARNING: intrinsic-test skipped because rustfmt is required but not available on this channel"
);
return;
};

let mut path_dirs: Vec<PathBuf> = Vec::new();
if let Some(cargo_dir) = builder.initial_cargo.parent() {
Expand Down
Loading