@@ -160,11 +160,6 @@ macro_rules! install {
160
160
config. extended && config. tools. as_ref( )
161
161
. map_or( true , |t| t. contains( $path) )
162
162
}
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
- }
168
163
}
169
164
170
165
impl Step for $name {
@@ -211,8 +206,7 @@ install!((self, builder, _config),
211
206
install_cargo( builder, self . compiler. stage, self . target) ;
212
207
} ;
213
208
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( ) {
216
210
install_rls( builder, self . compiler. stage, self . target) ;
217
211
} else {
218
212
builder. info(
@@ -222,27 +216,14 @@ install!((self, builder, _config),
222
216
} ;
223
217
RustAnalyzer , "rust-analyzer" , Self :: should_build( _config) , only_hosts: true , {
224
218
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) ;
232
220
} ;
233
221
Clippy , "clippy" , Self :: should_build( _config) , only_hosts: true , {
234
222
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) ;
242
224
} ;
243
225
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( ) {
246
227
install_miri( builder, self . compiler. stage, self . target) ;
247
228
} else {
248
229
builder. info(
@@ -254,7 +235,7 @@ install!((self, builder, _config),
254
235
if builder. ensure( dist:: Rustfmt {
255
236
compiler: self . compiler,
256
237
target: self . target
257
- } ) . is_some( ) || Self :: should_install ( builder ) {
238
+ } ) . is_some( ) {
258
239
install_rustfmt( builder, self . compiler. stage, self . target) ;
259
240
} else {
260
241
builder. info(
0 commit comments