Skip to content

Commit b10bbde

Browse files
flodieboldflodiebold
committed
Fix SVH tests some more
1 parent f0ce5bb commit b10bbde

File tree

9 files changed

+228
-166
lines changed

9 files changed

+228
-166
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn change_loop_body() {
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
43-
#[rustc_metadata_dirty(cfg="cfail2")]
43+
#[rustc_metadata_clean(cfg="cfail2")]
4444
#[rustc_metadata_clean(cfg="cfail3")]
4545
fn change_loop_body() {
4646
let mut _x = 0;
@@ -67,7 +67,7 @@ fn change_iteration_variable_name() {
6767
#[rustc_clean(label="Hir", cfg="cfail3")]
6868
#[rustc_dirty(label="HirBody", cfg="cfail2")]
6969
#[rustc_clean(label="HirBody", cfg="cfail3")]
70-
#[rustc_metadata_dirty(cfg="cfail2")]
70+
#[rustc_metadata_clean(cfg="cfail2")]
7171
#[rustc_metadata_clean(cfg="cfail3")]
7272
fn change_iteration_variable_name() {
7373
let mut _x = 0;
@@ -94,7 +94,7 @@ fn change_iteration_variable_pattern() {
9494
#[rustc_clean(label="Hir", cfg="cfail3")]
9595
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9696
#[rustc_clean(label="HirBody", cfg="cfail3")]
97-
#[rustc_metadata_dirty(cfg="cfail2")]
97+
#[rustc_metadata_clean(cfg="cfail2")]
9898
#[rustc_metadata_clean(cfg="cfail3")]
9999
fn change_iteration_variable_pattern() {
100100
let mut _x = 0;
@@ -121,7 +121,7 @@ fn change_iterable() {
121121
#[rustc_clean(label="Hir", cfg="cfail3")]
122122
#[rustc_dirty(label="HirBody", cfg="cfail2")]
123123
#[rustc_clean(label="HirBody", cfg="cfail3")]
124-
#[rustc_metadata_dirty(cfg="cfail2")]
124+
#[rustc_metadata_clean(cfg="cfail2")]
125125
#[rustc_metadata_clean(cfg="cfail3")]
126126
fn change_iterable() {
127127
let mut _x = 0;
@@ -147,7 +147,7 @@ fn add_break() {
147147
#[rustc_clean(label="Hir", cfg="cfail3")]
148148
#[rustc_dirty(label="HirBody", cfg="cfail2")]
149149
#[rustc_clean(label="HirBody", cfg="cfail3")]
150-
#[rustc_metadata_dirty(cfg="cfail2")]
150+
#[rustc_metadata_clean(cfg="cfail2")]
151151
#[rustc_metadata_clean(cfg="cfail3")]
152152
fn add_break() {
153153
let mut _x = 0;
@@ -174,7 +174,7 @@ fn add_loop_label() {
174174
#[rustc_clean(label="Hir", cfg="cfail3")]
175175
#[rustc_dirty(label="HirBody", cfg="cfail2")]
176176
#[rustc_clean(label="HirBody", cfg="cfail3")]
177-
#[rustc_metadata_dirty(cfg="cfail2")]
177+
#[rustc_metadata_clean(cfg="cfail2")]
178178
#[rustc_metadata_clean(cfg="cfail3")]
179179
fn add_loop_label() {
180180
let mut _x = 0;
@@ -201,7 +201,7 @@ fn add_loop_label_to_break() {
201201
#[rustc_clean(label="Hir", cfg="cfail3")]
202202
#[rustc_dirty(label="HirBody", cfg="cfail2")]
203203
#[rustc_clean(label="HirBody", cfg="cfail3")]
204-
#[rustc_metadata_dirty(cfg="cfail2")]
204+
#[rustc_metadata_clean(cfg="cfail2")]
205205
#[rustc_metadata_clean(cfg="cfail3")]
206206
fn add_loop_label_to_break() {
207207
let mut _x = 0;
@@ -230,7 +230,7 @@ fn change_break_label() {
230230
#[rustc_clean(label="Hir", cfg="cfail3")]
231231
#[rustc_dirty(label="HirBody", cfg="cfail2")]
232232
#[rustc_clean(label="HirBody", cfg="cfail3")]
233-
#[rustc_metadata_dirty(cfg="cfail2")]
233+
#[rustc_metadata_clean(cfg="cfail2")]
234234
#[rustc_metadata_clean(cfg="cfail3")]
235235
fn change_break_label() {
236236
let mut _x = 0;
@@ -259,7 +259,7 @@ fn add_loop_label_to_continue() {
259259
#[rustc_clean(label="Hir", cfg="cfail3")]
260260
#[rustc_dirty(label="HirBody", cfg="cfail2")]
261261
#[rustc_clean(label="HirBody", cfg="cfail3")]
262-
#[rustc_metadata_dirty(cfg="cfail2")]
262+
#[rustc_metadata_clean(cfg="cfail2")]
263263
#[rustc_metadata_clean(cfg="cfail3")]
264264
fn add_loop_label_to_continue() {
265265
let mut _x = 0;
@@ -288,7 +288,7 @@ fn change_continue_label() {
288288
#[rustc_clean(label="Hir", cfg="cfail3")]
289289
#[rustc_dirty(label="HirBody", cfg="cfail2")]
290290
#[rustc_clean(label="HirBody", cfg="cfail3")]
291-
#[rustc_metadata_dirty(cfg="cfail2")]
291+
#[rustc_metadata_clean(cfg="cfail2")]
292292
#[rustc_metadata_clean(cfg="cfail3")]
293293
fn change_continue_label() {
294294
let mut _x = 0;
@@ -317,7 +317,7 @@ fn change_continue_to_break() {
317317
#[rustc_clean(label="Hir", cfg="cfail3")]
318318
#[rustc_dirty(label="HirBody", cfg="cfail2")]
319319
#[rustc_clean(label="HirBody", cfg="cfail3")]
320-
#[rustc_metadata_dirty(cfg="cfail2")]
320+
#[rustc_metadata_clean(cfg="cfail2")]
321321
#[rustc_metadata_clean(cfg="cfail3")]
322322
fn change_continue_to_break() {
323323
let mut _x = 0;

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ fn change_loop_body() {
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
43-
#[rustc_metadata_dirty(cfg="cfail2")]
43+
#[rustc_metadata_clean(cfg="cfail2")]
4444
#[rustc_metadata_clean(cfg="cfail3")]
4545
fn change_loop_body() {
4646
let mut _x = 0;
@@ -66,7 +66,7 @@ fn add_break() {
6666
#[rustc_clean(label="Hir", cfg="cfail3")]
6767
#[rustc_dirty(label="HirBody", cfg="cfail2")]
6868
#[rustc_clean(label="HirBody", cfg="cfail3")]
69-
#[rustc_metadata_dirty(cfg="cfail2")]
69+
#[rustc_metadata_clean(cfg="cfail2")]
7070
#[rustc_metadata_clean(cfg="cfail3")]
7171
fn add_break() {
7272
let mut _x = 0;
@@ -93,7 +93,7 @@ fn add_loop_label() {
9393
#[rustc_clean(label="Hir", cfg="cfail3")]
9494
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9595
#[rustc_clean(label="HirBody", cfg="cfail3")]
96-
#[rustc_metadata_dirty(cfg="cfail2")]
96+
#[rustc_metadata_clean(cfg="cfail2")]
9797
#[rustc_metadata_clean(cfg="cfail3")]
9898
fn add_loop_label() {
9999
let mut _x = 0;
@@ -120,7 +120,7 @@ fn add_loop_label_to_break() {
120120
#[rustc_clean(label="Hir", cfg="cfail3")]
121121
#[rustc_dirty(label="HirBody", cfg="cfail2")]
122122
#[rustc_clean(label="HirBody", cfg="cfail3")]
123-
#[rustc_metadata_dirty(cfg="cfail2")]
123+
#[rustc_metadata_clean(cfg="cfail2")]
124124
#[rustc_metadata_clean(cfg="cfail3")]
125125
fn add_loop_label_to_break() {
126126
let mut _x = 0;
@@ -149,7 +149,7 @@ fn change_break_label() {
149149
#[rustc_clean(label="Hir", cfg="cfail3")]
150150
#[rustc_dirty(label="HirBody", cfg="cfail2")]
151151
#[rustc_clean(label="HirBody", cfg="cfail3")]
152-
#[rustc_metadata_dirty(cfg="cfail2")]
152+
#[rustc_metadata_clean(cfg="cfail2")]
153153
#[rustc_metadata_clean(cfg="cfail3")]
154154
fn change_break_label() {
155155
let mut _x = 0;
@@ -178,7 +178,7 @@ fn add_loop_label_to_continue() {
178178
#[rustc_clean(label="Hir", cfg="cfail3")]
179179
#[rustc_dirty(label="HirBody", cfg="cfail2")]
180180
#[rustc_clean(label="HirBody", cfg="cfail3")]
181-
#[rustc_metadata_dirty(cfg="cfail2")]
181+
#[rustc_metadata_clean(cfg="cfail2")]
182182
#[rustc_metadata_clean(cfg="cfail3")]
183183
fn add_loop_label_to_continue() {
184184
let mut _x = 0;
@@ -207,7 +207,7 @@ fn change_continue_label() {
207207
#[rustc_clean(label="Hir", cfg="cfail3")]
208208
#[rustc_dirty(label="HirBody", cfg="cfail2")]
209209
#[rustc_clean(label="HirBody", cfg="cfail3")]
210-
#[rustc_metadata_dirty(cfg="cfail2")]
210+
#[rustc_metadata_clean(cfg="cfail2")]
211211
#[rustc_metadata_clean(cfg="cfail3")]
212212
fn change_continue_label() {
213213
let mut _x = 0;
@@ -236,7 +236,7 @@ fn change_continue_to_break() {
236236
#[rustc_clean(label="Hir", cfg="cfail3")]
237237
#[rustc_dirty(label="HirBody", cfg="cfail2")]
238238
#[rustc_clean(label="HirBody", cfg="cfail3")]
239-
#[rustc_metadata_dirty(cfg="cfail2")]
239+
#[rustc_metadata_clean(cfg="cfail2")]
240240
#[rustc_metadata_clean(cfg="cfail3")]
241241
fn change_continue_to_break() {
242242
let mut _x = 0;

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn add_arm(x: u32) -> u32 {
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
43-
#[rustc_metadata_dirty(cfg="cfail2")]
43+
#[rustc_metadata_clean(cfg="cfail2")]
4444
#[rustc_metadata_clean(cfg="cfail3")]
4545
pub fn add_arm(x: u32) -> u32 {
4646
match x {
@@ -68,7 +68,7 @@ pub fn change_order_of_arms(x: u32) -> u32 {
6868
#[rustc_clean(label="Hir", cfg="cfail3")]
6969
#[rustc_dirty(label="HirBody", cfg="cfail2")]
7070
#[rustc_clean(label="HirBody", cfg="cfail3")]
71-
#[rustc_metadata_dirty(cfg="cfail2")]
71+
#[rustc_metadata_clean(cfg="cfail2")]
7272
#[rustc_metadata_clean(cfg="cfail3")]
7373
pub fn change_order_of_arms(x: u32) -> u32 {
7474
match x {
@@ -95,7 +95,7 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 {
9595
#[rustc_clean(label="Hir", cfg="cfail3")]
9696
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9797
#[rustc_clean(label="HirBody", cfg="cfail3")]
98-
#[rustc_metadata_dirty(cfg="cfail2")]
98+
#[rustc_metadata_clean(cfg="cfail2")]
9999
#[rustc_metadata_clean(cfg="cfail3")]
100100
pub fn add_guard_clause(x: u32, y: bool) -> u32 {
101101
match x {
@@ -122,7 +122,7 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 {
122122
#[rustc_clean(label="Hir", cfg="cfail3")]
123123
#[rustc_dirty(label="HirBody", cfg="cfail2")]
124124
#[rustc_clean(label="HirBody", cfg="cfail3")]
125-
#[rustc_metadata_dirty(cfg="cfail2")]
125+
#[rustc_metadata_clean(cfg="cfail2")]
126126
#[rustc_metadata_clean(cfg="cfail3")]
127127
pub fn change_guard_clause(x: u32, y: bool) -> u32 {
128128
match x {
@@ -149,7 +149,7 @@ pub fn add_at_binding(x: u32) -> u32 {
149149
#[rustc_clean(label="Hir", cfg="cfail3")]
150150
#[rustc_dirty(label="HirBody", cfg="cfail2")]
151151
#[rustc_clean(label="HirBody", cfg="cfail3")]
152-
#[rustc_metadata_dirty(cfg="cfail2")]
152+
#[rustc_metadata_clean(cfg="cfail2")]
153153
#[rustc_metadata_clean(cfg="cfail3")]
154154
pub fn add_at_binding(x: u32) -> u32 {
155155
match x {
@@ -176,7 +176,7 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
176176
#[rustc_clean(label="Hir", cfg="cfail3")]
177177
#[rustc_dirty(label="HirBody", cfg="cfail2")]
178178
#[rustc_clean(label="HirBody", cfg="cfail3")]
179-
#[rustc_metadata_dirty(cfg="cfail2")]
179+
#[rustc_metadata_clean(cfg="cfail2")]
180180
#[rustc_metadata_clean(cfg="cfail3")]
181181
pub fn change_name_of_at_binding(x: u32) -> u32 {
182182
match x {
@@ -202,7 +202,7 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 {
202202
#[rustc_clean(label="Hir", cfg="cfail3")]
203203
#[rustc_dirty(label="HirBody", cfg="cfail2")]
204204
#[rustc_clean(label="HirBody", cfg="cfail3")]
205-
#[rustc_metadata_dirty(cfg="cfail2")]
205+
#[rustc_metadata_clean(cfg="cfail2")]
206206
#[rustc_metadata_clean(cfg="cfail3")]
207207
pub fn change_simple_name_to_pattern(x: u32) -> u32 {
208208
match (x, x & 1) {
@@ -228,7 +228,7 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
228228
#[rustc_clean(label="Hir", cfg="cfail3")]
229229
#[rustc_dirty(label="HirBody", cfg="cfail2")]
230230
#[rustc_clean(label="HirBody", cfg="cfail3")]
231-
#[rustc_metadata_dirty(cfg="cfail2")]
231+
#[rustc_metadata_clean(cfg="cfail2")]
232232
#[rustc_metadata_clean(cfg="cfail3")]
233233
pub fn change_name_in_pattern(x: u32) -> u32 {
234234
match (x, x & 1) {
@@ -254,7 +254,7 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
254254
#[rustc_clean(label="Hir", cfg="cfail3")]
255255
#[rustc_dirty(label="HirBody", cfg="cfail2")]
256256
#[rustc_clean(label="HirBody", cfg="cfail3")]
257-
#[rustc_metadata_dirty(cfg="cfail2")]
257+
#[rustc_metadata_clean(cfg="cfail2")]
258258
#[rustc_metadata_clean(cfg="cfail3")]
259259
pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
260260
match (x, x & 1) {
@@ -279,7 +279,7 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
279279
#[rustc_clean(label="Hir", cfg="cfail3")]
280280
#[rustc_dirty(label="HirBody", cfg="cfail2")]
281281
#[rustc_clean(label="HirBody", cfg="cfail3")]
282-
#[rustc_metadata_dirty(cfg="cfail2")]
282+
#[rustc_metadata_clean(cfg="cfail2")]
283283
#[rustc_metadata_clean(cfg="cfail3")]
284284
pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
285285
match (x, x & 1) {
@@ -304,7 +304,7 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
304304
#[rustc_clean(label="Hir", cfg="cfail3")]
305305
#[rustc_dirty(label="HirBody", cfg="cfail2")]
306306
#[rustc_clean(label="HirBody", cfg="cfail3")]
307-
#[rustc_metadata_dirty(cfg="cfail2")]
307+
#[rustc_metadata_clean(cfg="cfail2")]
308308
#[rustc_metadata_clean(cfg="cfail3")]
309309
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
310310
match (&x, x & 1) {
@@ -330,7 +330,7 @@ pub fn change_rhs_of_arm(x: u32) -> u32 {
330330
#[rustc_clean(label="Hir", cfg="cfail3")]
331331
#[rustc_dirty(label="HirBody", cfg="cfail2")]
332332
#[rustc_clean(label="HirBody", cfg="cfail3")]
333-
#[rustc_metadata_dirty(cfg="cfail2")]
333+
#[rustc_metadata_clean(cfg="cfail2")]
334334
#[rustc_metadata_clean(cfg="cfail3")]
335335
pub fn change_rhs_of_arm(x: u32) -> u32 {
336336
match x {
@@ -357,7 +357,7 @@ pub fn add_alternative_to_arm(x: u32) -> u32 {
357357
#[rustc_clean(label="Hir", cfg="cfail3")]
358358
#[rustc_dirty(label="HirBody", cfg="cfail2")]
359359
#[rustc_clean(label="HirBody", cfg="cfail3")]
360-
#[rustc_metadata_dirty(cfg="cfail2")]
360+
#[rustc_metadata_clean(cfg="cfail2")]
361361
#[rustc_metadata_clean(cfg="cfail3")]
362362
pub fn add_alternative_to_arm(x: u32) -> u32 {
363363
match x {

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ pub fn indexing(slice: &[u8]) -> u8 {
3838
#[rustc_clean(label="Hir", cfg="cfail3")]
3939
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4040
#[rustc_clean(label="HirBody", cfg="cfail3")]
41-
#[rustc_metadata_dirty(cfg="cfail2")]
41+
#[rustc_metadata_clean(cfg="cfail2")]
4242
#[rustc_metadata_clean(cfg="cfail3")]
4343
pub fn indexing(slice: &[u8]) -> u8 {
4444
slice[100]
@@ -56,7 +56,7 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 {
5656
#[rustc_clean(label="Hir", cfg="cfail3")]
5757
#[rustc_dirty(label="HirBody", cfg="cfail2")]
5858
#[rustc_clean(label="HirBody", cfg="cfail3")]
59-
#[rustc_metadata_dirty(cfg="cfail2")]
59+
#[rustc_metadata_clean(cfg="cfail2")]
6060
#[rustc_metadata_clean(cfg="cfail3")]
6161
pub fn arithmetic_overflow_plus(val: i32) -> i32 {
6262
val + 1
@@ -74,7 +74,7 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 {
7474
#[rustc_clean(label="Hir", cfg="cfail3")]
7575
#[rustc_dirty(label="HirBody", cfg="cfail2")]
7676
#[rustc_clean(label="HirBody", cfg="cfail3")]
77-
#[rustc_metadata_dirty(cfg="cfail2")]
77+
#[rustc_metadata_clean(cfg="cfail2")]
7878
#[rustc_metadata_clean(cfg="cfail3")]
7979
pub fn arithmetic_overflow_minus(val: i32) -> i32 {
8080
val - 1
@@ -92,7 +92,7 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 {
9292
#[rustc_clean(label="Hir", cfg="cfail3")]
9393
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9494
#[rustc_clean(label="HirBody", cfg="cfail3")]
95-
#[rustc_metadata_dirty(cfg="cfail2")]
95+
#[rustc_metadata_clean(cfg="cfail2")]
9696
#[rustc_metadata_clean(cfg="cfail3")]
9797
pub fn arithmetic_overflow_mult(val: i32) -> i32 {
9898
val * 2
@@ -110,7 +110,7 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 {
110110
#[rustc_clean(label="Hir", cfg="cfail3")]
111111
#[rustc_dirty(label="HirBody", cfg="cfail2")]
112112
#[rustc_clean(label="HirBody", cfg="cfail3")]
113-
#[rustc_metadata_dirty(cfg="cfail2")]
113+
#[rustc_metadata_clean(cfg="cfail2")]
114114
#[rustc_metadata_clean(cfg="cfail3")]
115115
pub fn arithmetic_overflow_negation(val: i32) -> i32 {
116116
-val
@@ -128,7 +128,7 @@ pub fn division_by_zero(val: i32) -> i32 {
128128
#[rustc_clean(label="Hir", cfg="cfail3")]
129129
#[rustc_dirty(label="HirBody", cfg="cfail2")]
130130
#[rustc_clean(label="HirBody", cfg="cfail3")]
131-
#[rustc_metadata_dirty(cfg="cfail2")]
131+
#[rustc_metadata_clean(cfg="cfail2")]
132132
#[rustc_metadata_clean(cfg="cfail3")]
133133
pub fn division_by_zero(val: i32) -> i32 {
134134
2 / val
@@ -145,7 +145,7 @@ pub fn mod_by_zero(val: i32) -> i32 {
145145
#[rustc_clean(label="Hir", cfg="cfail3")]
146146
#[rustc_dirty(label="HirBody", cfg="cfail2")]
147147
#[rustc_clean(label="HirBody", cfg="cfail3")]
148-
#[rustc_metadata_dirty(cfg="cfail2")]
148+
#[rustc_metadata_clean(cfg="cfail2")]
149149
#[rustc_metadata_clean(cfg="cfail3")]
150150
pub fn mod_by_zero(val: i32) -> i32 {
151151
2 % val

0 commit comments

Comments
 (0)