@@ -159,11 +159,6 @@ macro_rules! install {
159
159
config. extended && config. tools. as_ref( )
160
160
. map_or( true , |t| t. contains( $path) )
161
161
}
162
-
163
- #[ allow( dead_code) ]
164
- fn should_install( builder: & Builder <' _>) -> bool {
165
- builder. config. tools. as_ref( ) . map_or( false , |t| t. contains( $path) )
166
- }
167
162
}
168
163
169
164
impl Step for $name {
@@ -210,8 +205,7 @@ install!((self, builder, _config),
210
205
install_cargo( builder, self . compiler. stage, self . target) ;
211
206
} ;
212
207
Rls , "rls" , Self :: should_build( _config) , only_hosts: true , {
213
- if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) ||
214
- Self :: should_install( builder) {
208
+ if builder. ensure( dist:: Rls { compiler: self . compiler, target: self . target } ) . is_some( ) {
215
209
install_rls( builder, self . compiler. stage, self . target) ;
216
210
} else {
217
211
builder. info(
@@ -221,27 +215,14 @@ install!((self, builder, _config),
221
215
} ;
222
216
RustAnalyzer , "rust-analyzer" , Self :: should_build( _config) , only_hosts: true , {
223
217
builder. ensure( dist:: RustAnalyzer { compiler: self . compiler, target: self . target } ) ;
224
- if Self :: should_install( builder) {
225
- install_rust_analyzer( builder, self . compiler. stage, self . target) ;
226
- } else {
227
- builder. info(
228
- & format!( "skipping Install rust-analyzer stage{} ({})" , self . compiler. stage, self . target) ,
229
- ) ;
230
- }
218
+ install_rust_analyzer( builder, self . compiler. stage, self . target) ;
231
219
} ;
232
220
Clippy , "clippy" , Self :: should_build( _config) , only_hosts: true , {
233
221
builder. ensure( dist:: Clippy { compiler: self . compiler, target: self . target } ) ;
234
- if Self :: should_install( builder) {
235
- install_clippy( builder, self . compiler. stage, self . target) ;
236
- } else {
237
- builder. info(
238
- & format!( "skipping Install clippy stage{} ({})" , self . compiler. stage, self . target) ,
239
- ) ;
240
- }
222
+ install_clippy( builder, self . compiler. stage, self . target) ;
241
223
} ;
242
224
Miri , "miri" , Self :: should_build( _config) , only_hosts: true , {
243
- if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) ||
244
- Self :: should_install( builder) {
225
+ if builder. ensure( dist:: Miri { compiler: self . compiler, target: self . target } ) . is_some( ) {
245
226
install_miri( builder, self . compiler. stage, self . target) ;
246
227
} else {
247
228
builder. info(
@@ -253,7 +234,7 @@ install!((self, builder, _config),
253
234
if builder. ensure( dist:: Rustfmt {
254
235
compiler: self . compiler,
255
236
target: self . target
256
- } ) . is_some( ) || Self :: should_install ( builder ) {
237
+ } ) . is_some( ) {
257
238
install_rustfmt( builder, self . compiler. stage, self . target) ;
258
239
} else {
259
240
builder. info(
0 commit comments