@@ -141,10 +141,8 @@ impl Step for Std {
141141 cargo. arg ( "-p" ) . arg ( krate) ;
142142 }
143143
144- let _guard = builder. msg_clippy (
145- format_args ! ( "library artifacts{}" , crate_description( & self . crates) ) ,
146- target,
147- ) ;
144+ let _guard =
145+ builder. msg_clippy ( format_args ! ( "library{}" , crate_description( & self . crates) ) , target) ;
148146
149147 run_cargo (
150148 builder,
@@ -187,17 +185,8 @@ impl Step for Rustc {
187185 let compiler = builder. compiler ( builder. top_stage , builder. config . build ) ;
188186 let target = self . target ;
189187
190- if compiler. stage != 0 {
191- // If we're not in stage 0, then we won't have a std from the beta
192- // compiler around. That means we need to make sure there's one in
193- // the sysroot for the compiler to find. Otherwise, we're going to
194- // fail when building crates that need to generate code (e.g., build
195- // scripts and their dependencies).
196- builder. ensure ( compile:: Std :: new ( compiler, compiler. host ) ) ;
197- builder. ensure ( compile:: Std :: new ( compiler, target) ) ;
198- } else {
199- builder. ensure ( check:: Std :: new ( target) ) ;
200- }
188+ builder. ensure ( compile:: Std :: new ( compiler, compiler. host ) ) ;
189+ builder. ensure ( compile:: Std :: new ( compiler, target) ) ;
201190
202191 let mut cargo = builder:: Cargo :: new (
203192 builder,
@@ -217,10 +206,8 @@ impl Step for Rustc {
217206 cargo. arg ( "-p" ) . arg ( krate) ;
218207 }
219208
220- let _guard = builder. msg_clippy (
221- format_args ! ( "compiler artifacts{}" , crate_description( & self . crates) ) ,
222- target,
223- ) ;
209+ let _guard =
210+ builder. msg_clippy ( format_args ! ( "compiler{}" , crate_description( & self . crates) ) , target) ;
224211
225212 run_cargo (
226213 builder,
0 commit comments