@@ -153,11 +153,6 @@ macro_rules! install {
153153 config. extended && config. tools. as_ref( )
154154 . map_or( true , |t| t. contains( $path) )
155155 }
156-
157- #[ allow( dead_code) ]
158- fn should_install( builder: & Builder <' _>) -> bool {
159- builder. config. tools. as_ref( ) . map_or( false , |t| t. contains( $path) )
160- }
161156 }
162157
163158 impl Step for $name {
@@ -204,8 +199,7 @@ install!((self, builder, _config),
204199 install_cargo( builder, self . compiler. stage, self . target) ;
205200 } ;
206201 Rls , "rls" , Self :: should_build( _config) , only_hosts: true , {
207- if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) ||
208- Self :: should_install( builder) {
202+ if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) {
209203 install_rls( builder, self . compiler. stage, self . target) ;
210204 } else {
211205 builder. info(
@@ -215,17 +209,10 @@ install!((self, builder, _config),
215209 } ;
216210 Clippy , "clippy" , Self :: should_build( _config) , only_hosts: true , {
217211 builder. ensure( dist:: Clippy { compiler: self . compiler, target: self . target } ) ;
218- if Self :: should_install( builder) {
219- install_clippy( builder, self . compiler. stage, self . target) ;
220- } else {
221- builder. info(
222- & format!( "skipping Install clippy stage{} ({})" , self . compiler. stage, self . target) ,
223- ) ;
224- }
212+ install_clippy( builder, self . compiler. stage, self . target) ;
225213 } ;
226214 Miri , "miri" , Self :: should_build( _config) , only_hosts: true , {
227- if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) ||
228- Self :: should_install( builder) {
215+ if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) {
229216 install_miri( builder, self . compiler. stage, self . target) ;
230217 } else {
231218 builder. info(
@@ -237,7 +224,7 @@ install!((self, builder, _config),
237224 if builder. ensure( dist:: Rustfmt {
238225 compiler: self . compiler,
239226 target: self . target
240- } ) . is_some( ) || Self :: should_install ( builder ) {
227+ } ) . is_some( ) {
241228 install_rustfmt( builder, self . compiler. stage, self . target) ;
242229 } else {
243230 builder. info(
0 commit comments