@@ -183,11 +183,13 @@ impl StepDescription {
183
183
}
184
184
185
185
fn run ( v : & [ StepDescription ] , builder : & Builder < ' _ > , paths : & [ PathBuf ] ) {
186
- let should_runs =
187
- v. iter ( ) . map ( |desc| ( desc. should_run ) ( ShouldRun :: new ( builder) ) ) . collect :: < Vec < _ > > ( ) ;
186
+ let should_runs = v
187
+ . iter ( )
188
+ . map ( |desc| ( desc, ( desc. should_run ) ( ShouldRun :: new ( builder) ) ) )
189
+ . collect :: < Vec < _ > > ( ) ;
188
190
189
191
// sanity checks on rules
190
- for ( desc, should_run) in v . iter ( ) . zip ( & should_runs ) {
192
+ for ( desc, should_run) in should_runs . iter ( ) {
191
193
assert ! (
192
194
!should_run. paths. is_empty( ) ,
193
195
"{:?} should have at least one pathset" ,
@@ -196,7 +198,7 @@ impl StepDescription {
196
198
}
197
199
198
200
if paths. is_empty ( ) || builder. config . include_default_paths {
199
- for ( desc, should_run) in v . iter ( ) . zip ( & should_runs ) {
201
+ for ( desc, should_run) in should_runs . iter ( ) {
200
202
if desc. default && should_run. is_really_default ( ) {
201
203
for pathset in & should_run. paths {
202
204
desc. maybe_run ( builder, pathset) ;
@@ -213,7 +215,7 @@ impl StepDescription {
213
215
} ;
214
216
215
217
let mut attempted_run = false ;
216
- for ( desc, should_run) in v . iter ( ) . zip ( & should_runs ) {
218
+ for ( desc, should_run) in should_runs . iter ( ) {
217
219
if let Some ( suite) = should_run. is_suite_path ( path) {
218
220
attempted_run = true ;
219
221
desc. maybe_run ( builder, suite) ;
0 commit comments