nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #108463 - clubby789:update-check-output, r=albertlarsan68

Browse Source 
bootstrap: Update the output of the `check` descriptions

This should bring the output from `x check` in line with the changes in #108171
This commit is contained in:
Matthias Krüger 2023-02-27 06:11:52 +01:00 committed by GitHub
commit 2f6ba7b4da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/bootstrap/check.rs
View File

@ -105,10 +105,15 @@ impl Step for Std {
cargo.arg("--lib"); cargo.arg("--lib");
} }
builder.info(&format!( let msg = if compiler.host == target {
"Checking stage{} library artifacts ({} -> {})", format!("Checking stage{} library artifacts ({target})", builder.top_stage)
builder.top_stage, &compiler.host, target } else {
)); format!(
"Checking stage{} library artifacts ({} -> {})",
builder.top_stage, &compiler.host, target
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
cargo, cargo,
@ -162,10 +167,18 @@ impl Step for Std {
cargo.arg("-p").arg(krate.name); cargo.arg("-p").arg(krate.name);
} }
builder.info(&format!( let msg = if compiler.host == target {
"Checking stage{} library test/bench/example targets ({} -> {})", format!(
builder.top_stage, &compiler.host, target "Checking stage{} library test/bench/example targets ({target})",
)); builder.top_stage
)
} else {
format!(
"Checking stage{} library test/bench/example targets ({} -> {})",
builder.top_stage, &compiler.host, target
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
cargo, cargo,
@ -239,10 +252,15 @@ impl Step for Rustc {
cargo.arg("-p").arg(krate.name); cargo.arg("-p").arg(krate.name);
} }
builder.info(&format!( let msg = if compiler.host == target {
"Checking stage{} compiler artifacts ({} -> {})", format!("Checking stage{} compiler artifacts ({target})", builder.top_stage)
builder.top_stage, &compiler.host, target } else {
)); format!(
"Checking stage{} compiler artifacts ({} -> {})",
builder.top_stage, &compiler.host, target
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
cargo, cargo,
@ -299,10 +317,15 @@ impl Step for CodegenBackend {
.arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend))); .arg(builder.src.join(format!("compiler/rustc_codegen_{}/Cargo.toml", backend)));
rustc_cargo_env(builder, &mut cargo, target); rustc_cargo_env(builder, &mut cargo, target);
builder.info(&format!( let msg = if compiler.host == target {
"Checking stage{} {} artifacts ({} -> {})", format!("Checking stage{} {} artifacts ({target})", builder.top_stage, backend)
builder.top_stage, backend, &compiler.host.triple, target.triple } else {
)); format!(
"Checking stage{} {} library ({} -> {})",
builder.top_stage, backend, &compiler.host.triple, target.triple
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
@ -362,10 +385,15 @@ impl Step for RustAnalyzer {
cargo.arg("--benches"); cargo.arg("--benches");
} }
builder.info(&format!( let msg = if compiler.host == target {
"Checking stage{} {} artifacts ({} -> {})", format!("Checking stage{} {} artifacts ({target})", compiler.stage, "rust-analyzer")
compiler.stage, "rust-analyzer", &compiler.host.triple, target.triple } else {
)); format!(
"Checking stage{} {} artifacts ({} -> {})",
compiler.stage, "rust-analyzer", &compiler.host.triple, target.triple
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
cargo, cargo,
@ -432,14 +460,18 @@ macro_rules! tool_check_step {
// NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]` // NOTE: this doesn't enable lints for any other tools unless they explicitly add `#![warn(rustc::internal)]`
// See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776 // See https://github.com/rust-lang/rust/pull/80573#issuecomment-754010776
cargo.rustflag("-Zunstable-options"); cargo.rustflag("-Zunstable-options");
let msg = if compiler.host == target {
builder.info(&format!( format!("Checking stage{} {} artifacts ({target})", builder.top_stage, stringify!($name).to_lowercase())
"Checking stage{} {} artifacts ({} -> {})", } else {
builder.top_stage, format!(
stringify!($name).to_lowercase(), "Checking stage{} {} artifacts ({} -> {})",
&compiler.host.triple, builder.top_stage,
target.triple stringify!($name).to_lowercase(),
)); &compiler.host.triple,
target.triple
)
};
builder.info(&msg);
run_cargo( run_cargo(
builder, builder,
cargo, cargo,