@@ -706,7 +706,6 @@ impl Step for Miri {
706
706
707
707
#[ derive( Debug , Copy , Clone , PartialEq , Eq , Hash ) ]
708
708
pub struct CompiletestTest {
709
- stage : u32 ,
710
709
host : TargetSelection ,
711
710
}
712
711
@@ -718,14 +717,13 @@ impl Step for CompiletestTest {
718
717
}
719
718
720
719
fn make_run ( run : RunConfig < ' _ > ) {
721
- run. builder . ensure ( CompiletestTest { stage : run . builder . top_stage , host : run. target } ) ;
720
+ run. builder . ensure ( CompiletestTest { host : run. target } ) ;
722
721
}
723
722
724
723
/// Runs `cargo test` for compiletest.
725
724
fn run ( self , builder : & Builder < ' _ > ) {
726
725
let host = self . host ;
727
- let stage = self . stage ;
728
- let compiler = builder. compiler ( stage, host) ;
726
+ let compiler = builder. compiler ( builder. top_stage , host) ;
729
727
730
728
// We need `ToolStd` for the locally-built sysroot because
731
729
// compiletest uses unstable features of the `test` crate.
@@ -741,7 +739,7 @@ impl Step for CompiletestTest {
741
739
& [ ] ,
742
740
) ;
743
741
cargo. allow_features ( "test" ) ;
744
- cargo. env ( "RUSTC_STAGE" , stage . to_string ( ) ) ;
742
+ cargo. env ( "RUSTC_STAGE" , builder . top_stage . to_string ( ) ) ;
745
743
run_cargo_test ( cargo, & [ ] , & [ ] , "compiletest" , compiler, host, builder) ;
746
744
}
747
745
}
0 commit comments