about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJakub Beránek <berykubik@gmail.com>2025-08-12 15:01:33 +0200
committerJakub Beránek <berykubik@gmail.com>2025-08-12 15:05:05 +0200
commitf7defc0fe5ea6270de7be2159f91b4cc7afabf47 (patch)
tree92fcfcc7d04d840f1ecaf84af8aa99ee1030cf3f
parentdf2da84a619afcc8e0adfff142cb28af0ada6abe (diff)
downloadrust-f7defc0fe5ea6270de7be2159f91b4cc7afabf47.tar.gz
rust-f7defc0fe5ea6270de7be2159f91b4cc7afabf47.zip
Resolve review remarks
-rw-r--r--src/bootstrap/src/core/build_steps/compile.rs13
-rw-r--r--src/bootstrap/src/core/build_steps/test.rs1
2 files changed, 5 insertions, 9 deletions
diff --git a/src/bootstrap/src/core/build_steps/compile.rs b/src/bootstrap/src/core/build_steps/compile.rs
index c04f0803565..c8feba48d84 100644
--- a/src/bootstrap/src/core/build_steps/compile.rs
+++ b/src/bootstrap/src/core/build_steps/compile.rs
@@ -215,7 +215,7 @@ impl Step for Std {
             trace!(
                 ?compiler_to_use,
                 ?build_compiler,
-                "compiler != compiler_to_use, uplifting library"
+                "build_compiler != compiler_to_use, uplifting library"
             );
 
             builder.std(compiler_to_use, target);
@@ -1609,13 +1609,8 @@ impl Step for GccCodegenBackend {
         let gcc = builder.ensure(Gcc { target });
         add_cg_gcc_cargo_flags(&mut cargo, &gcc);
 
-        let _guard = builder.msg(
-            Kind::Build,
-            format_args!("codegen backend gcc"),
-            Mode::Codegen,
-            build_compiler,
-            target,
-        );
+        let _guard =
+            builder.msg(Kind::Build, "codegen backend gcc", Mode::Codegen, build_compiler, target);
         let files = run_cargo(builder, cargo, vec![], &stamp, vec![], false, false);
         write_codegen_backend_stamp(stamp, files, builder.config.dry_run())
     }
@@ -1695,7 +1690,7 @@ impl Step for CraneliftCodegenBackend {
 
         let _guard = builder.msg(
             Kind::Build,
-            format_args!("codegen backend cranelift"),
+            "codegen backend cranelift",
             Mode::Codegen,
             build_compiler,
             target,
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index fa72e93f503..f1be0af3183 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2232,6 +2232,7 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
         let _group = builder.msg(
             Kind::Test,
             format!("compiletest suite={suite} mode={mode}"),
+            // FIXME: compiletest sometimes behaves as ToolStd, we could expose that difference here
             Mode::ToolBootstrap,
             compiler,
             target,