Skip to content

Commit d0b11b9

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #45950 - fitzgen:update-unary-and-binary-exprs-test-to-use-incr-except, r=michaelwoerister
incr: Make `unary_and_binary_exprs.rs` use `except`-style incremental checking Part of #44924 r? @michaelwoerister
2 parents c95ef0d + c9c7d9f commit d0b11b9

File tree

1 file changed

+56
-112
lines changed

1 file changed

+56
-112
lines changed

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

Lines changed: 56 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,8 @@ pub fn const_negation() -> i32 {
3232
}
3333

3434
#[cfg(not(cfail1))]
35-
#[rustc_clean(label="Hir", cfg="cfail2")]
36-
#[rustc_clean(label="Hir", cfg="cfail3")]
37-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
38-
#[rustc_clean(label="HirBody", cfg="cfail3")]
35+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
36+
#[rustc_clean(cfg="cfail3")]
3937
#[rustc_metadata_clean(cfg="cfail2")]
4038
#[rustc_metadata_clean(cfg="cfail3")]
4139
pub fn const_negation() -> i32 {
@@ -51,10 +49,8 @@ pub fn const_bitwise_not() -> i32 {
5149
}
5250

5351
#[cfg(not(cfail1))]
54-
#[rustc_clean(label="Hir", cfg="cfail2")]
55-
#[rustc_clean(label="Hir", cfg="cfail3")]
56-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
57-
#[rustc_clean(label="HirBody", cfg="cfail3")]
52+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
53+
#[rustc_clean(cfg="cfail3")]
5854
#[rustc_metadata_clean(cfg="cfail2")]
5955
#[rustc_metadata_clean(cfg="cfail3")]
6056
pub fn const_bitwise_not() -> i32 {
@@ -70,10 +66,8 @@ pub fn var_negation(x: i32, y: i32) -> i32 {
7066
}
7167

7268
#[cfg(not(cfail1))]
73-
#[rustc_clean(label="Hir", cfg="cfail2")]
74-
#[rustc_clean(label="Hir", cfg="cfail3")]
75-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
76-
#[rustc_clean(label="HirBody", cfg="cfail3")]
69+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
70+
#[rustc_clean(cfg="cfail3")]
7771
#[rustc_metadata_clean(cfg="cfail2")]
7872
#[rustc_metadata_clean(cfg="cfail3")]
7973
pub fn var_negation(x: i32, y: i32) -> i32 {
@@ -89,10 +83,8 @@ pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
8983
}
9084

9185
#[cfg(not(cfail1))]
92-
#[rustc_clean(label="Hir", cfg="cfail2")]
93-
#[rustc_clean(label="Hir", cfg="cfail3")]
94-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
95-
#[rustc_clean(label="HirBody", cfg="cfail3")]
86+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
87+
#[rustc_clean(cfg="cfail3")]
9688
#[rustc_metadata_clean(cfg="cfail2")]
9789
#[rustc_metadata_clean(cfg="cfail3")]
9890
pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
@@ -108,10 +100,8 @@ pub fn var_deref(x: &i32, y: &i32) -> i32 {
108100
}
109101

110102
#[cfg(not(cfail1))]
111-
#[rustc_clean(label="Hir", cfg="cfail2")]
112-
#[rustc_clean(label="Hir", cfg="cfail3")]
113-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
114-
#[rustc_clean(label="HirBody", cfg="cfail3")]
103+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated,TypeckTables", cfg="cfail2")]
104+
#[rustc_clean(cfg="cfail3")]
115105
#[rustc_metadata_clean(cfg="cfail2")]
116106
#[rustc_metadata_clean(cfg="cfail3")]
117107
pub fn var_deref(x: &i32, y: &i32) -> i32 {
@@ -127,10 +117,8 @@ pub fn first_const_add() -> i32 {
127117
}
128118

129119
#[cfg(not(cfail1))]
130-
#[rustc_clean(label="Hir", cfg="cfail2")]
131-
#[rustc_clean(label="Hir", cfg="cfail3")]
132-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
133-
#[rustc_clean(label="HirBody", cfg="cfail3")]
120+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
121+
#[rustc_clean(cfg="cfail3")]
134122
#[rustc_metadata_clean(cfg="cfail2")]
135123
#[rustc_metadata_clean(cfg="cfail3")]
136124
pub fn first_const_add() -> i32 {
@@ -146,10 +134,8 @@ pub fn second_const_add() -> i32 {
146134
}
147135

148136
#[cfg(not(cfail1))]
149-
#[rustc_clean(label="Hir", cfg="cfail2")]
150-
#[rustc_clean(label="Hir", cfg="cfail3")]
151-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
152-
#[rustc_clean(label="HirBody", cfg="cfail3")]
137+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
138+
#[rustc_clean(cfg="cfail3")]
153139
#[rustc_metadata_clean(cfg="cfail2")]
154140
#[rustc_metadata_clean(cfg="cfail3")]
155141
pub fn second_const_add() -> i32 {
@@ -165,10 +151,8 @@ pub fn first_var_add(a: i32, b: i32) -> i32 {
165151
}
166152

167153
#[cfg(not(cfail1))]
168-
#[rustc_clean(label="Hir", cfg="cfail2")]
169-
#[rustc_clean(label="Hir", cfg="cfail3")]
170-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
171-
#[rustc_clean(label="HirBody", cfg="cfail3")]
154+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
155+
#[rustc_clean(cfg="cfail3")]
172156
#[rustc_metadata_clean(cfg="cfail2")]
173157
#[rustc_metadata_clean(cfg="cfail3")]
174158
pub fn first_var_add(a: i32, b: i32) -> i32 {
@@ -184,10 +168,8 @@ pub fn second_var_add(a: i32, b: i32) -> i32 {
184168
}
185169

186170
#[cfg(not(cfail1))]
187-
#[rustc_clean(label="Hir", cfg="cfail2")]
188-
#[rustc_clean(label="Hir", cfg="cfail3")]
189-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
190-
#[rustc_clean(label="HirBody", cfg="cfail3")]
171+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
172+
#[rustc_clean(cfg="cfail3")]
191173
#[rustc_metadata_clean(cfg="cfail2")]
192174
#[rustc_metadata_clean(cfg="cfail3")]
193175
pub fn second_var_add(a: i32, b: i32) -> i32 {
@@ -203,10 +185,8 @@ pub fn plus_to_minus(a: i32) -> i32 {
203185
}
204186

205187
#[cfg(not(cfail1))]
206-
#[rustc_clean(label="Hir", cfg="cfail2")]
207-
#[rustc_clean(label="Hir", cfg="cfail3")]
208-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
209-
#[rustc_clean(label="HirBody", cfg="cfail3")]
188+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
189+
#[rustc_clean(cfg="cfail3")]
210190
#[rustc_metadata_clean(cfg="cfail2")]
211191
#[rustc_metadata_clean(cfg="cfail3")]
212192
pub fn plus_to_minus(a: i32) -> i32 {
@@ -222,10 +202,8 @@ pub fn plus_to_mult(a: i32) -> i32 {
222202
}
223203

224204
#[cfg(not(cfail1))]
225-
#[rustc_clean(label="Hir", cfg="cfail2")]
226-
#[rustc_clean(label="Hir", cfg="cfail3")]
227-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
228-
#[rustc_clean(label="HirBody", cfg="cfail3")]
205+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
206+
#[rustc_clean(cfg="cfail3")]
229207
#[rustc_metadata_clean(cfg="cfail2")]
230208
#[rustc_metadata_clean(cfg="cfail3")]
231209
pub fn plus_to_mult(a: i32) -> i32 {
@@ -241,10 +219,8 @@ pub fn plus_to_div(a: i32) -> i32 {
241219
}
242220

243221
#[cfg(not(cfail1))]
244-
#[rustc_clean(label="Hir", cfg="cfail2")]
245-
#[rustc_clean(label="Hir", cfg="cfail3")]
246-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
247-
#[rustc_clean(label="HirBody", cfg="cfail3")]
222+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
223+
#[rustc_clean(cfg="cfail3")]
248224
#[rustc_metadata_clean(cfg="cfail2")]
249225
#[rustc_metadata_clean(cfg="cfail3")]
250226
pub fn plus_to_div(a: i32) -> i32 {
@@ -260,10 +236,8 @@ pub fn plus_to_mod(a: i32) -> i32 {
260236
}
261237

262238
#[cfg(not(cfail1))]
263-
#[rustc_clean(label="Hir", cfg="cfail2")]
264-
#[rustc_clean(label="Hir", cfg="cfail3")]
265-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
266-
#[rustc_clean(label="HirBody", cfg="cfail3")]
239+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
240+
#[rustc_clean(cfg="cfail3")]
267241
#[rustc_metadata_clean(cfg="cfail2")]
268242
#[rustc_metadata_clean(cfg="cfail3")]
269243
pub fn plus_to_mod(a: i32) -> i32 {
@@ -279,10 +253,8 @@ pub fn and_to_or(a: bool, b: bool) -> bool {
279253
}
280254

281255
#[cfg(not(cfail1))]
282-
#[rustc_clean(label="Hir", cfg="cfail2")]
283-
#[rustc_clean(label="Hir", cfg="cfail3")]
284-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
285-
#[rustc_clean(label="HirBody", cfg="cfail3")]
256+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
257+
#[rustc_clean(cfg="cfail3")]
286258
#[rustc_metadata_clean(cfg="cfail2")]
287259
#[rustc_metadata_clean(cfg="cfail3")]
288260
pub fn and_to_or(a: bool, b: bool) -> bool {
@@ -298,10 +270,8 @@ pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
298270
}
299271

300272
#[cfg(not(cfail1))]
301-
#[rustc_clean(label="Hir", cfg="cfail2")]
302-
#[rustc_clean(label="Hir", cfg="cfail3")]
303-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
304-
#[rustc_clean(label="HirBody", cfg="cfail3")]
273+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
274+
#[rustc_clean(cfg="cfail3")]
305275
#[rustc_metadata_clean(cfg="cfail2")]
306276
#[rustc_metadata_clean(cfg="cfail3")]
307277
pub fn bitwise_and_to_bitwise_or(a: i32) -> i32 {
@@ -317,10 +287,8 @@ pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
317287
}
318288

319289
#[cfg(not(cfail1))]
320-
#[rustc_clean(label="Hir", cfg="cfail2")]
321-
#[rustc_clean(label="Hir", cfg="cfail3")]
322-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
323-
#[rustc_clean(label="HirBody", cfg="cfail3")]
290+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
291+
#[rustc_clean(cfg="cfail3")]
324292
#[rustc_metadata_clean(cfg="cfail2")]
325293
#[rustc_metadata_clean(cfg="cfail3")]
326294
pub fn bitwise_and_to_bitwise_xor(a: i32) -> i32 {
@@ -336,10 +304,8 @@ pub fn bitwise_and_to_lshift(a: i32) -> i32 {
336304
}
337305

338306
#[cfg(not(cfail1))]
339-
#[rustc_clean(label="Hir", cfg="cfail2")]
340-
#[rustc_clean(label="Hir", cfg="cfail3")]
341-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
342-
#[rustc_clean(label="HirBody", cfg="cfail3")]
307+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
308+
#[rustc_clean(cfg="cfail3")]
343309
#[rustc_metadata_clean(cfg="cfail2")]
344310
#[rustc_metadata_clean(cfg="cfail3")]
345311
pub fn bitwise_and_to_lshift(a: i32) -> i32 {
@@ -355,10 +321,8 @@ pub fn bitwise_and_to_rshift(a: i32) -> i32 {
355321
}
356322

357323
#[cfg(not(cfail1))]
358-
#[rustc_clean(label="Hir", cfg="cfail2")]
359-
#[rustc_clean(label="Hir", cfg="cfail3")]
360-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
361-
#[rustc_clean(label="HirBody", cfg="cfail3")]
324+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
325+
#[rustc_clean(cfg="cfail3")]
362326
#[rustc_metadata_clean(cfg="cfail2")]
363327
#[rustc_metadata_clean(cfg="cfail3")]
364328
pub fn bitwise_and_to_rshift(a: i32) -> i32 {
@@ -374,10 +338,8 @@ pub fn eq_to_uneq(a: i32) -> bool {
374338
}
375339

376340
#[cfg(not(cfail1))]
377-
#[rustc_clean(label="Hir", cfg="cfail2")]
378-
#[rustc_clean(label="Hir", cfg="cfail3")]
379-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
380-
#[rustc_clean(label="HirBody", cfg="cfail3")]
341+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
342+
#[rustc_clean(cfg="cfail3")]
381343
#[rustc_metadata_clean(cfg="cfail2")]
382344
#[rustc_metadata_clean(cfg="cfail3")]
383345
pub fn eq_to_uneq(a: i32) -> bool {
@@ -393,10 +355,8 @@ pub fn eq_to_lt(a: i32) -> bool {
393355
}
394356

395357
#[cfg(not(cfail1))]
396-
#[rustc_clean(label="Hir", cfg="cfail2")]
397-
#[rustc_clean(label="Hir", cfg="cfail3")]
398-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
399-
#[rustc_clean(label="HirBody", cfg="cfail3")]
358+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
359+
#[rustc_clean(cfg="cfail3")]
400360
#[rustc_metadata_clean(cfg="cfail2")]
401361
#[rustc_metadata_clean(cfg="cfail3")]
402362
pub fn eq_to_lt(a: i32) -> bool {
@@ -412,10 +372,8 @@ pub fn eq_to_gt(a: i32) -> bool {
412372
}
413373

414374
#[cfg(not(cfail1))]
415-
#[rustc_clean(label="Hir", cfg="cfail2")]
416-
#[rustc_clean(label="Hir", cfg="cfail3")]
417-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
418-
#[rustc_clean(label="HirBody", cfg="cfail3")]
375+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
376+
#[rustc_clean(cfg="cfail3")]
419377
#[rustc_metadata_clean(cfg="cfail2")]
420378
#[rustc_metadata_clean(cfg="cfail3")]
421379
pub fn eq_to_gt(a: i32) -> bool {
@@ -431,10 +389,8 @@ pub fn eq_to_le(a: i32) -> bool {
431389
}
432390

433391
#[cfg(not(cfail1))]
434-
#[rustc_clean(label="Hir", cfg="cfail2")]
435-
#[rustc_clean(label="Hir", cfg="cfail3")]
436-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
437-
#[rustc_clean(label="HirBody", cfg="cfail3")]
392+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
393+
#[rustc_clean(cfg="cfail3")]
438394
#[rustc_metadata_clean(cfg="cfail2")]
439395
#[rustc_metadata_clean(cfg="cfail3")]
440396
pub fn eq_to_le(a: i32) -> bool {
@@ -450,10 +406,8 @@ pub fn eq_to_ge(a: i32) -> bool {
450406
}
451407

452408
#[cfg(not(cfail1))]
453-
#[rustc_clean(label="Hir", cfg="cfail2")]
454-
#[rustc_clean(label="Hir", cfg="cfail3")]
455-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
456-
#[rustc_clean(label="HirBody", cfg="cfail3")]
409+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
410+
#[rustc_clean(cfg="cfail3")]
457411
#[rustc_metadata_clean(cfg="cfail2")]
458412
#[rustc_metadata_clean(cfg="cfail3")]
459413
pub fn eq_to_ge(a: i32) -> bool {
@@ -471,10 +425,8 @@ pub fn type_cast(a: u8) -> u64 {
471425
}
472426

473427
#[cfg(not(cfail1))]
474-
#[rustc_clean(label="Hir", cfg="cfail2")]
475-
#[rustc_clean(label="Hir", cfg="cfail3")]
476-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
477-
#[rustc_clean(label="HirBody", cfg="cfail3")]
428+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated,TypeckTables", cfg="cfail2")]
429+
#[rustc_clean(cfg="cfail3")]
478430
#[rustc_metadata_clean(cfg="cfail2")]
479431
#[rustc_metadata_clean(cfg="cfail3")]
480432
pub fn type_cast(a: u8) -> u64 {
@@ -492,10 +444,8 @@ pub fn value_cast(a: u32) -> i32 {
492444
}
493445

494446
#[cfg(not(cfail1))]
495-
#[rustc_clean(label="Hir", cfg="cfail2")]
496-
#[rustc_clean(label="Hir", cfg="cfail3")]
497-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
498-
#[rustc_clean(label="HirBody", cfg="cfail3")]
447+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
448+
#[rustc_clean(cfg="cfail3")]
499449
#[rustc_metadata_clean(cfg="cfail2")]
500450
#[rustc_metadata_clean(cfg="cfail3")]
501451
pub fn value_cast(a: u32) -> i32 {
@@ -514,10 +464,8 @@ pub fn lvalue() -> i32 {
514464
}
515465

516466
#[cfg(not(cfail1))]
517-
#[rustc_clean(label="Hir", cfg="cfail2")]
518-
#[rustc_clean(label="Hir", cfg="cfail3")]
519-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
520-
#[rustc_clean(label="HirBody", cfg="cfail3")]
467+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
468+
#[rustc_clean(cfg="cfail3")]
521469
#[rustc_metadata_clean(cfg="cfail2")]
522470
#[rustc_metadata_clean(cfg="cfail3")]
523471
pub fn lvalue() -> i32 {
@@ -538,10 +486,8 @@ pub fn rvalue() -> i32 {
538486
}
539487

540488
#[cfg(not(cfail1))]
541-
#[rustc_clean(label="Hir", cfg="cfail2")]
542-
#[rustc_clean(label="Hir", cfg="cfail3")]
543-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
544-
#[rustc_clean(label="HirBody", cfg="cfail3")]
489+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
490+
#[rustc_clean(cfg="cfail3")]
545491
#[rustc_metadata_clean(cfg="cfail2")]
546492
#[rustc_metadata_clean(cfg="cfail3")]
547493
pub fn rvalue() -> i32 {
@@ -559,10 +505,8 @@ pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {
559505
}
560506

561507
#[cfg(not(cfail1))]
562-
#[rustc_clean(label="Hir", cfg="cfail2")]
563-
#[rustc_clean(label="Hir", cfg="cfail3")]
564-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
565-
#[rustc_clean(label="HirBody", cfg="cfail3")]
508+
#[rustc_clean(except="HirBody,MirOptimized,MirValidated", cfg="cfail2")]
509+
#[rustc_clean(cfg="cfail3")]
566510
#[rustc_metadata_clean(cfg="cfail2")]
567511
#[rustc_metadata_clean(cfg="cfail3")]
568512
pub fn index_to_slice(s: &[u8], i: usize, j: usize) -> u8 {

0 commit comments

Comments
 (0)