Skip to content

Commit d5a501d

Browse files
flodieboldflodiebold
committed
Fix remaining SVH tests
1 parent d0ae2c8 commit d5a501d

File tree

4 files changed

+101
-37
lines changed

4 files changed

+101
-37
lines changed

‎src/test/incremental/hashes/for_loops.rs

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ fn change_loop_body() {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_dirty(label="Hir", cfg="cfail2")]
39+
#[rustc_clean(label="Hir", cfg="cfail2")]
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
@@ -63,7 +63,7 @@ fn change_iteration_variable_name() {
6363
}
6464

6565
#[cfg(not(cfail1))]
66-
#[rustc_dirty(label="Hir", cfg="cfail2")]
66+
#[rustc_clean(label="Hir", cfg="cfail2")]
6767
#[rustc_clean(label="Hir", cfg="cfail3")]
6868
#[rustc_dirty(label="HirBody", cfg="cfail2")]
6969
#[rustc_clean(label="HirBody", cfg="cfail3")]
@@ -90,7 +90,7 @@ fn change_iteration_variable_pattern() {
9090
}
9191

9292
#[cfg(not(cfail1))]
93-
#[rustc_dirty(label="Hir", cfg="cfail2")]
93+
#[rustc_clean(label="Hir", cfg="cfail2")]
9494
#[rustc_clean(label="Hir", cfg="cfail3")]
9595
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9696
#[rustc_clean(label="HirBody", cfg="cfail3")]
@@ -117,7 +117,7 @@ fn change_iterable() {
117117
}
118118

119119
#[cfg(not(cfail1))]
120-
#[rustc_dirty(label="Hir", cfg="cfail2")]
120+
#[rustc_clean(label="Hir", cfg="cfail2")]
121121
#[rustc_clean(label="Hir", cfg="cfail3")]
122122
#[rustc_dirty(label="HirBody", cfg="cfail2")]
123123
#[rustc_clean(label="HirBody", cfg="cfail3")]
@@ -143,7 +143,7 @@ fn add_break() {
143143
}
144144

145145
#[cfg(not(cfail1))]
146-
#[rustc_dirty(label="Hir", cfg="cfail2")]
146+
#[rustc_clean(label="Hir", cfg="cfail2")]
147147
#[rustc_clean(label="Hir", cfg="cfail3")]
148148
#[rustc_dirty(label="HirBody", cfg="cfail2")]
149149
#[rustc_clean(label="HirBody", cfg="cfail3")]
@@ -170,8 +170,10 @@ fn add_loop_label() {
170170
}
171171

172172
#[cfg(not(cfail1))]
173-
#[rustc_dirty(label="Hir", cfg="cfail2")]
173+
#[rustc_clean(label="Hir", cfg="cfail2")]
174174
#[rustc_clean(label="Hir", cfg="cfail3")]
175+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
176+
#[rustc_clean(label="HirBody", cfg="cfail3")]
175177
#[rustc_metadata_dirty(cfg="cfail2")]
176178
#[rustc_metadata_clean(cfg="cfail3")]
177179
fn add_loop_label() {
@@ -195,8 +197,10 @@ fn add_loop_label_to_break() {
195197
}
196198

197199
#[cfg(not(cfail1))]
198-
#[rustc_dirty(label="Hir", cfg="cfail2")]
200+
#[rustc_clean(label="Hir", cfg="cfail2")]
199201
#[rustc_clean(label="Hir", cfg="cfail3")]
202+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
203+
#[rustc_clean(label="HirBody", cfg="cfail3")]
200204
#[rustc_metadata_dirty(cfg="cfail2")]
201205
#[rustc_metadata_clean(cfg="cfail3")]
202206
fn add_loop_label_to_break() {
@@ -222,8 +226,10 @@ fn change_break_label() {
222226
}
223227

224228
#[cfg(not(cfail1))]
225-
#[rustc_dirty(label="Hir", cfg="cfail2")]
229+
#[rustc_clean(label="Hir", cfg="cfail2")]
226230
#[rustc_clean(label="Hir", cfg="cfail3")]
231+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
232+
#[rustc_clean(label="HirBody", cfg="cfail3")]
227233
#[rustc_metadata_dirty(cfg="cfail2")]
228234
#[rustc_metadata_clean(cfg="cfail3")]
229235
fn change_break_label() {
@@ -249,8 +255,10 @@ fn add_loop_label_to_continue() {
249255
}
250256

251257
#[cfg(not(cfail1))]
252-
#[rustc_dirty(label="Hir", cfg="cfail2")]
258+
#[rustc_clean(label="Hir", cfg="cfail2")]
253259
#[rustc_clean(label="Hir", cfg="cfail3")]
260+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
261+
#[rustc_clean(label="HirBody", cfg="cfail3")]
254262
#[rustc_metadata_dirty(cfg="cfail2")]
255263
#[rustc_metadata_clean(cfg="cfail3")]
256264
fn add_loop_label_to_continue() {
@@ -276,8 +284,10 @@ fn change_continue_label() {
276284
}
277285

278286
#[cfg(not(cfail1))]
279-
#[rustc_dirty(label="Hir", cfg="cfail2")]
287+
#[rustc_clean(label="Hir", cfg="cfail2")]
280288
#[rustc_clean(label="Hir", cfg="cfail3")]
289+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
290+
#[rustc_clean(label="HirBody", cfg="cfail3")]
281291
#[rustc_metadata_dirty(cfg="cfail2")]
282292
#[rustc_metadata_clean(cfg="cfail3")]
283293
fn change_continue_label() {
@@ -303,8 +313,10 @@ fn change_continue_to_break() {
303313
}
304314

305315
#[cfg(not(cfail1))]
306-
#[rustc_dirty(label="Hir", cfg="cfail2")]
316+
#[rustc_clean(label="Hir", cfg="cfail2")]
307317
#[rustc_clean(label="Hir", cfg="cfail3")]
318+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
319+
#[rustc_clean(label="HirBody", cfg="cfail3")]
308320
#[rustc_metadata_dirty(cfg="cfail2")]
309321
#[rustc_metadata_clean(cfg="cfail3")]
310322
fn change_continue_to_break() {

‎src/test/incremental/hashes/loop_expressions.rs

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ fn change_loop_body() {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_dirty(label="Hir", cfg="cfail2")]
39+
#[rustc_clean(label="Hir", cfg="cfail2")]
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
41+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
42+
#[rustc_clean(label="HirBody", cfg="cfail3")]
4143
#[rustc_metadata_dirty(cfg="cfail2")]
4244
#[rustc_metadata_clean(cfg="cfail3")]
4345
fn change_loop_body() {
@@ -60,8 +62,10 @@ fn add_break() {
6062
}
6163

6264
#[cfg(not(cfail1))]
63-
#[rustc_dirty(label="Hir", cfg="cfail2")]
65+
#[rustc_clean(label="Hir", cfg="cfail2")]
6466
#[rustc_clean(label="Hir", cfg="cfail3")]
67+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
68+
#[rustc_clean(label="HirBody", cfg="cfail3")]
6569
#[rustc_metadata_dirty(cfg="cfail2")]
6670
#[rustc_metadata_clean(cfg="cfail3")]
6771
fn add_break() {
@@ -85,8 +89,10 @@ fn add_loop_label() {
8589
}
8690

8791
#[cfg(not(cfail1))]
88-
#[rustc_dirty(label="Hir", cfg="cfail2")]
92+
#[rustc_clean(label="Hir", cfg="cfail2")]
8993
#[rustc_clean(label="Hir", cfg="cfail3")]
94+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
95+
#[rustc_clean(label="HirBody", cfg="cfail3")]
9096
#[rustc_metadata_dirty(cfg="cfail2")]
9197
#[rustc_metadata_clean(cfg="cfail3")]
9298
fn add_loop_label() {
@@ -110,8 +116,10 @@ fn add_loop_label_to_break() {
110116
}
111117

112118
#[cfg(not(cfail1))]
113-
#[rustc_dirty(label="Hir", cfg="cfail2")]
119+
#[rustc_clean(label="Hir", cfg="cfail2")]
114120
#[rustc_clean(label="Hir", cfg="cfail3")]
121+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
122+
#[rustc_clean(label="HirBody", cfg="cfail3")]
115123
#[rustc_metadata_dirty(cfg="cfail2")]
116124
#[rustc_metadata_clean(cfg="cfail3")]
117125
fn add_loop_label_to_break() {
@@ -137,8 +145,10 @@ fn change_break_label() {
137145
}
138146

139147
#[cfg(not(cfail1))]
140-
#[rustc_dirty(label="Hir", cfg="cfail2")]
148+
#[rustc_clean(label="Hir", cfg="cfail2")]
141149
#[rustc_clean(label="Hir", cfg="cfail3")]
150+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
151+
#[rustc_clean(label="HirBody", cfg="cfail3")]
142152
#[rustc_metadata_dirty(cfg="cfail2")]
143153
#[rustc_metadata_clean(cfg="cfail3")]
144154
fn change_break_label() {
@@ -164,8 +174,10 @@ fn add_loop_label_to_continue() {
164174
}
165175

166176
#[cfg(not(cfail1))]
167-
#[rustc_dirty(label="Hir", cfg="cfail2")]
177+
#[rustc_clean(label="Hir", cfg="cfail2")]
168178
#[rustc_clean(label="Hir", cfg="cfail3")]
179+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
180+
#[rustc_clean(label="HirBody", cfg="cfail3")]
169181
#[rustc_metadata_dirty(cfg="cfail2")]
170182
#[rustc_metadata_clean(cfg="cfail3")]
171183
fn add_loop_label_to_continue() {
@@ -191,8 +203,10 @@ fn change_continue_label() {
191203
}
192204

193205
#[cfg(not(cfail1))]
194-
#[rustc_dirty(label="Hir", cfg="cfail2")]
206+
#[rustc_clean(label="Hir", cfg="cfail2")]
195207
#[rustc_clean(label="Hir", cfg="cfail3")]
208+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
209+
#[rustc_clean(label="HirBody", cfg="cfail3")]
196210
#[rustc_metadata_dirty(cfg="cfail2")]
197211
#[rustc_metadata_clean(cfg="cfail3")]
198212
fn change_continue_label() {
@@ -218,8 +232,10 @@ fn change_continue_to_break() {
218232
}
219233

220234
#[cfg(not(cfail1))]
221-
#[rustc_dirty(label="Hir", cfg="cfail2")]
235+
#[rustc_clean(label="Hir", cfg="cfail2")]
222236
#[rustc_clean(label="Hir", cfg="cfail3")]
237+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
238+
#[rustc_clean(label="HirBody", cfg="cfail3")]
223239
#[rustc_metadata_dirty(cfg="cfail2")]
224240
#[rustc_metadata_clean(cfg="cfail3")]
225241
fn change_continue_to_break() {

‎src/test/incremental/hashes/while_let_loops.rs

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ fn change_loop_body() {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_dirty(label="Hir", cfg="cfail2")]
39+
#[rustc_clean(label="Hir", cfg="cfail2")]
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
41+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
42+
#[rustc_clean(label="HirBody", cfg="cfail3")]
4143
#[rustc_metadata_dirty(cfg="cfail2")]
4244
#[rustc_metadata_clean(cfg="cfail3")]
4345
fn change_loop_body() {
@@ -61,8 +63,10 @@ fn change_loop_condition() {
6163
}
6264

6365
#[cfg(not(cfail1))]
64-
#[rustc_dirty(label="Hir", cfg="cfail2")]
66+
#[rustc_clean(label="Hir", cfg="cfail2")]
6567
#[rustc_clean(label="Hir", cfg="cfail3")]
68+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
69+
#[rustc_clean(label="HirBody", cfg="cfail3")]
6670
#[rustc_metadata_dirty(cfg="cfail2")]
6771
#[rustc_metadata_clean(cfg="cfail3")]
6872
fn change_loop_condition() {
@@ -85,8 +89,10 @@ fn add_break() {
8589
}
8690

8791
#[cfg(not(cfail1))]
88-
#[rustc_dirty(label="Hir", cfg="cfail2")]
92+
#[rustc_clean(label="Hir", cfg="cfail2")]
8993
#[rustc_clean(label="Hir", cfg="cfail3")]
94+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
95+
#[rustc_clean(label="HirBody", cfg="cfail3")]
9096
#[rustc_metadata_dirty(cfg="cfail2")]
9197
#[rustc_metadata_clean(cfg="cfail3")]
9298
fn add_break() {
@@ -110,8 +116,10 @@ fn add_loop_label() {
110116
}
111117

112118
#[cfg(not(cfail1))]
113-
#[rustc_dirty(label="Hir", cfg="cfail2")]
119+
#[rustc_clean(label="Hir", cfg="cfail2")]
114120
#[rustc_clean(label="Hir", cfg="cfail3")]
121+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
122+
#[rustc_clean(label="HirBody", cfg="cfail3")]
115123
#[rustc_metadata_dirty(cfg="cfail2")]
116124
#[rustc_metadata_clean(cfg="cfail3")]
117125
fn add_loop_label() {
@@ -135,8 +143,10 @@ fn add_loop_label_to_break() {
135143
}
136144

137145
#[cfg(not(cfail1))]
138-
#[rustc_dirty(label="Hir", cfg="cfail2")]
146+
#[rustc_clean(label="Hir", cfg="cfail2")]
139147
#[rustc_clean(label="Hir", cfg="cfail3")]
148+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
149+
#[rustc_clean(label="HirBody", cfg="cfail3")]
140150
#[rustc_metadata_dirty(cfg="cfail2")]
141151
#[rustc_metadata_clean(cfg="cfail3")]
142152
fn add_loop_label_to_break() {
@@ -162,8 +172,10 @@ fn change_break_label() {
162172
}
163173

164174
#[cfg(not(cfail1))]
165-
#[rustc_dirty(label="Hir", cfg="cfail2")]
175+
#[rustc_clean(label="Hir", cfg="cfail2")]
166176
#[rustc_clean(label="Hir", cfg="cfail3")]
177+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
178+
#[rustc_clean(label="HirBody", cfg="cfail3")]
167179
#[rustc_metadata_dirty(cfg="cfail2")]
168180
#[rustc_metadata_clean(cfg="cfail3")]
169181
fn change_break_label() {
@@ -189,8 +201,10 @@ fn add_loop_label_to_continue() {
189201
}
190202

191203
#[cfg(not(cfail1))]
192-
#[rustc_dirty(label="Hir", cfg="cfail2")]
204+
#[rustc_clean(label="Hir", cfg="cfail2")]
193205
#[rustc_clean(label="Hir", cfg="cfail3")]
206+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
207+
#[rustc_clean(label="HirBody", cfg="cfail3")]
194208
#[rustc_metadata_dirty(cfg="cfail2")]
195209
#[rustc_metadata_clean(cfg="cfail3")]
196210
fn add_loop_label_to_continue() {
@@ -216,8 +230,10 @@ fn change_continue_label() {
216230
}
217231

218232
#[cfg(not(cfail1))]
219-
#[rustc_dirty(label="Hir", cfg="cfail2")]
233+
#[rustc_clean(label="Hir", cfg="cfail2")]
220234
#[rustc_clean(label="Hir", cfg="cfail3")]
235+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
236+
#[rustc_clean(label="HirBody", cfg="cfail3")]
221237
#[rustc_metadata_dirty(cfg="cfail2")]
222238
#[rustc_metadata_clean(cfg="cfail3")]
223239
fn change_continue_label() {
@@ -243,8 +259,10 @@ fn change_continue_to_break() {
243259
}
244260

245261
#[cfg(not(cfail1))]
246-
#[rustc_dirty(label="Hir", cfg="cfail2")]
262+
#[rustc_clean(label="Hir", cfg="cfail2")]
247263
#[rustc_clean(label="Hir", cfg="cfail3")]
264+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
265+
#[rustc_clean(label="HirBody", cfg="cfail3")]
248266
#[rustc_metadata_dirty(cfg="cfail2")]
249267
#[rustc_metadata_clean(cfg="cfail3")]
250268
fn change_continue_to_break() {

0 commit comments

Comments
 (0)