@@ -160,11 +160,6 @@ macro_rules! install {
160160 config. extended && config. tools. as_ref( )
161161 . map_or( true , |t| t. contains( $path) )
162162 }
163-
164- #[ allow( dead_code) ]
165- fn should_install( builder: & Builder <' _>) -> bool {
166- builder. config. tools. as_ref( ) . map_or( false , |t| t. contains( $path) )
167- }
168163 }
169164
170165 impl Step for $name {
@@ -211,8 +206,7 @@ install!((self, builder, _config),
211206 install_cargo( builder, self . compiler. stage, self . target) ;
212207 } ;
213208 Rls , "rls" , Self :: should_build( _config) , only_hosts: true , {
214- if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) ||
215- Self :: should_install( builder) {
209+ if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) {
216210 install_rls( builder, self . compiler. stage, self . target) ;
217211 } else {
218212 builder. info(
@@ -222,27 +216,14 @@ install!((self, builder, _config),
222216 } ;
223217 RustAnalyzer , "rust-analyzer" , Self :: should_build( _config) , only_hosts: true , {
224218 builder. ensure( dist:: RustAnalyzer { compiler: self . compiler, target: self . target } ) ;
225- if Self :: should_install( builder) {
226- install_rust_analyzer( builder, self . compiler. stage, self . target) ;
227- } else {
228- builder. info(
229- & format!( "skipping Install rust-analyzer stage{} ({})" , self . compiler. stage, self . target) ,
230- ) ;
231- }
219+ install_rust_analyzer( builder, self . compiler. stage, self . target) ;
232220 } ;
233221 Clippy , "clippy" , Self :: should_build( _config) , only_hosts: true , {
234222 builder. ensure( dist:: Clippy { compiler: self . compiler, target: self . target } ) ;
235- if Self :: should_install( builder) {
236- install_clippy( builder, self . compiler. stage, self . target) ;
237- } else {
238- builder. info(
239- & format!( "skipping Install clippy stage{} ({})" , self . compiler. stage, self . target) ,
240- ) ;
241- }
223+ install_clippy( builder, self . compiler. stage, self . target) ;
242224 } ;
243225 Miri , "miri" , Self :: should_build( _config) , only_hosts: true , {
244- if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) ||
245- Self :: should_install( builder) {
226+ if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) {
246227 install_miri( builder, self . compiler. stage, self . target) ;
247228 } else {
248229 builder. info(
@@ -254,7 +235,7 @@ install!((self, builder, _config),
254235 if builder. ensure( dist:: Rustfmt {
255236 compiler: self . compiler,
256237 target: self . target
257- } ) . is_some( ) || Self :: should_install ( builder ) {
238+ } ) . is_some( ) {
258239 install_rustfmt( builder, self . compiler. stage, self . target) ;
259240 } else {
260241 builder. info(
0 commit comments