update feedback from review

Co-Authored-By: jyn <[email protected]>

Author: yoshuawuyts

src/bootstrap/test.rs

@@ -706,7 +706,6 @@ impl Step for Miri {
 
 #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct CompiletestTest {
-    stage: u32,
     host: TargetSelection,
 }
 
@@ -718,14 +717,13 @@ impl Step for CompiletestTest {
     }
 
     fn make_run(run: RunConfig<'_>) {
-        run.builder.ensure(CompiletestTest { stage: run.builder.top_stage, host: run.target });
+        run.builder.ensure(CompiletestTest { host: run.target });
     }
 
     /// Runs `cargo test` for compiletest.
     fn run(self, builder: &Builder<'_>) {
         let host = self.host;
-        let stage = self.stage;
-        let compiler = builder.compiler(stage, host);
+        let compiler = builder.compiler(builder.top_stage, host);
 
         // We need `ToolStd` for the locally-built sysroot because
         // compiletest uses unstable features of the `test` crate.
@@ -741,7 +739,7 @@ impl Step for CompiletestTest {
             &[],
         );
         cargo.allow_features("test");
-        cargo.env("RUSTC_STAGE", stage.to_string());
+        cargo.env("RUSTC_STAGE", builder.top_stage.to_string());
         run_cargo_test(cargo, &[], &[], "compiletest", compiler, host, builder);
     }
 }

src/tools/compiletest/src/header/tests.rs

@@ -456,6 +456,7 @@ fn wasm_special() {
     // The MinGW tests run a beta compiler on stage 0 which means we're having a target mismatch
     // for a brief period. When a new beta release is cut, the `if` part of this conditional should be
     // removed, and the `else` part should be re-inlined in the original `ignores` list.
+    // cfg(bootstrap)
     if env!("RUSTC_STAGE") == "0" {
         ignores.append(&mut vec![
             ("wasm32-wasi", "emscripten", false),