Skip to content

Commit c0c3cc4

Browse files
kennytmkennytm
authored
Rollup merge of rust-lang#45987 - gaurikholkar:let-expr, r=michaelwoerister
update let-expressions hash test to use `except` A part of rust-lang#44924, this PR updated let-expressions test using `except`. cc @michaelwoerister r? @nikomatsakis
2 parents f28df20 + ef275d1 commit c0c3cc4

File tree

1 file changed

+36
-210
lines changed

1 file changed

+36
-210
lines changed

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

+36-210
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,9 @@ pub fn change_name() {
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")]
39-
#[rustc_metadata_clean(cfg="cfail2")]
40-
#[rustc_metadata_clean(cfg="cfail3")]
41-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
42-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
43-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
44-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
45-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
46-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
47-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
48-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
49-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
50-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
51-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
52-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
53-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
54-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
35+
#[rustc_clean(cfg="cfail2",
36+
except="HirBody,MirValidated,MirOptimized")]
37+
#[rustc_clean(cfg="cfail3")]
5538
pub fn change_name() {
5639
let _y = 2u64;
5740
}
@@ -65,26 +48,11 @@ pub fn add_type() {
6548
}
6649

6750
#[cfg(not(cfail1))]
68-
#[rustc_clean(label="Hir", cfg="cfail2")]
69-
#[rustc_clean(label="Hir", cfg="cfail3")]
70-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
71-
#[rustc_clean(label="HirBody", cfg="cfail3")]
51+
#[rustc_clean(cfg="cfail2",
52+
except="HirBody,TypeckTables")]
53+
#[rustc_clean(cfg="cfail3")]
7254
#[rustc_metadata_clean(cfg="cfail2")]
7355
#[rustc_metadata_clean(cfg="cfail3")]
74-
#[rustc_clean(label="MirValidated", cfg="cfail2")]
75-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
76-
#[rustc_clean(label="MirOptimized", cfg="cfail2")]
77-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
78-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
79-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
80-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
81-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
82-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
83-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
84-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
85-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
86-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
87-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
8856
pub fn add_type() {
8957
let _x: u32 = 2u32;
9058
}
@@ -98,26 +66,11 @@ pub fn change_type() {
9866
}
9967

10068
#[cfg(not(cfail1))]
101-
#[rustc_clean(label="Hir", cfg="cfail2")]
102-
#[rustc_clean(label="Hir", cfg="cfail3")]
103-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
104-
#[rustc_clean(label="HirBody", cfg="cfail3")]
69+
#[rustc_clean(cfg="cfail2",
70+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
71+
#[rustc_clean(cfg="cfail3")]
10572
#[rustc_metadata_clean(cfg="cfail2")]
10673
#[rustc_metadata_clean(cfg="cfail3")]
107-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
108-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
109-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
110-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
111-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
112-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
113-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
114-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
115-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
116-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
117-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
118-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
119-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
120-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
12174
pub fn change_type() {
12275
let _x: u8 = 2;
12376
}
@@ -131,26 +84,11 @@ pub fn change_mutability_of_reference_type() {
13184
}
13285

13386
#[cfg(not(cfail1))]
134-
#[rustc_clean(label="Hir", cfg="cfail2")]
135-
#[rustc_clean(label="Hir", cfg="cfail3")]
136-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
137-
#[rustc_clean(label="HirBody", cfg="cfail3")]
87+
#[rustc_clean(cfg="cfail2",
88+
except="HirBody,TypeckTables,MirValidated")]
89+
#[rustc_clean(cfg="cfail3")]
13890
#[rustc_metadata_clean(cfg="cfail2")]
13991
#[rustc_metadata_clean(cfg="cfail3")]
140-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
141-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
142-
#[rustc_clean(label="MirOptimized", cfg="cfail2")]
143-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
144-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
145-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
146-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
147-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
148-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
149-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
150-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
151-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
152-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
153-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
15492
pub fn change_mutability_of_reference_type() {
15593
let _x: &mut u64;
15694
}
@@ -164,26 +102,11 @@ pub fn change_mutability_of_slot() {
164102
}
165103

166104
#[cfg(not(cfail1))]
167-
#[rustc_clean(label="Hir", cfg="cfail2")]
168-
#[rustc_clean(label="Hir", cfg="cfail3")]
169-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
170-
#[rustc_clean(label="HirBody", cfg="cfail3")]
105+
#[rustc_clean(cfg="cfail2",
106+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
107+
#[rustc_clean(cfg="cfail3")]
171108
#[rustc_metadata_clean(cfg="cfail2")]
172109
#[rustc_metadata_clean(cfg="cfail3")]
173-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
174-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
175-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
176-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
177-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
178-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
179-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
180-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
181-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
182-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
183-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
184-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
185-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
186-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
187110
pub fn change_mutability_of_slot() {
188111
let _x: u64 = 0;
189112
}
@@ -197,26 +120,11 @@ pub fn change_simple_binding_to_pattern() {
197120
}
198121

199122
#[cfg(not(cfail1))]
200-
#[rustc_clean(label="Hir", cfg="cfail2")]
201-
#[rustc_clean(label="Hir", cfg="cfail3")]
202-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
203-
#[rustc_clean(label="HirBody", cfg="cfail3")]
123+
#[rustc_clean(cfg="cfail2",
124+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
125+
#[rustc_clean(cfg="cfail3")]
204126
#[rustc_metadata_clean(cfg="cfail2")]
205127
#[rustc_metadata_clean(cfg="cfail3")]
206-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
207-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
208-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
209-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
210-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
211-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
212-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
213-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
214-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
215-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
216-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
217-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
218-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
219-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
220128
pub fn change_simple_binding_to_pattern() {
221129
let (_a, _b) = (0u8, 'x');
222130
}
@@ -230,26 +138,11 @@ pub fn change_name_in_pattern() {
230138
}
231139

232140
#[cfg(not(cfail1))]
233-
#[rustc_clean(label="Hir", cfg="cfail2")]
234-
#[rustc_clean(label="Hir", cfg="cfail3")]
235-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
236-
#[rustc_clean(label="HirBody", cfg="cfail3")]
141+
#[rustc_clean(cfg="cfail2",
142+
except="HirBody,MirValidated,MirOptimized")]
143+
#[rustc_clean(cfg="cfail3")]
237144
#[rustc_metadata_clean(cfg="cfail2")]
238145
#[rustc_metadata_clean(cfg="cfail3")]
239-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
240-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
241-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
242-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
243-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
244-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
245-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
246-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
247-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
248-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
249-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
250-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
251-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
252-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
253146
pub fn change_name_in_pattern() {
254147
let (_a, _c) = (1u8, 'y');
255148
}
@@ -263,26 +156,11 @@ pub fn add_ref_in_pattern() {
263156
}
264157

265158
#[cfg(not(cfail1))]
266-
#[rustc_clean(label="Hir", cfg="cfail2")]
267-
#[rustc_clean(label="Hir", cfg="cfail3")]
268-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
269-
#[rustc_clean(label="HirBody", cfg="cfail3")]
159+
#[rustc_clean(cfg="cfail2",
160+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
161+
#[rustc_clean(cfg="cfail3")]
270162
#[rustc_metadata_clean(cfg="cfail2")]
271163
#[rustc_metadata_clean(cfg="cfail3")]
272-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
273-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
274-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
275-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
276-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
277-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
278-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
279-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
280-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
281-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
282-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
283-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
284-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
285-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
286164
pub fn add_ref_in_pattern() {
287165
let (ref _a, _b) = (1u8, 'y');
288166
}
@@ -296,18 +174,11 @@ pub fn add_amp_in_pattern() {
296174
}
297175

298176
#[cfg(not(cfail1))]
299-
#[rustc_clean(label="Hir", cfg="cfail2")]
300-
#[rustc_clean(label="Hir", cfg="cfail3")]
301-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
302-
#[rustc_clean(label="HirBody", cfg="cfail3")]
177+
#[rustc_clean(cfg="cfail2",
178+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
179+
#[rustc_clean(cfg="cfail3")]
303180
#[rustc_metadata_clean(cfg="cfail2")]
304181
#[rustc_metadata_clean(cfg="cfail3")]
305-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
306-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
307-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
308-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
309-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
310-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
311182
pub fn add_amp_in_pattern() {
312183
let (&_a, _b) = (&1u8, 'y');
313184
}
@@ -321,26 +192,11 @@ pub fn change_mutability_of_binding_in_pattern() {
321192
}
322193

323194
#[cfg(not(cfail1))]
324-
#[rustc_clean(label="Hir", cfg="cfail2")]
325-
#[rustc_clean(label="Hir", cfg="cfail3")]
326-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
327-
#[rustc_clean(label="HirBody", cfg="cfail3")]
195+
#[rustc_clean(cfg="cfail2",
196+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
197+
#[rustc_clean(cfg="cfail3")]
328198
#[rustc_metadata_clean(cfg="cfail2")]
329199
#[rustc_metadata_clean(cfg="cfail3")]
330-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
331-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
332-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
333-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
334-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
335-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
336-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
337-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
338-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
339-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
340-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
341-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
342-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
343-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
344200
pub fn change_mutability_of_binding_in_pattern() {
345201
let (mut _a, _b) = (99u8, 'q');
346202
}
@@ -354,26 +210,11 @@ pub fn add_initializer() {
354210
}
355211

356212
#[cfg(not(cfail1))]
357-
#[rustc_clean(label="Hir", cfg="cfail2")]
358-
#[rustc_clean(label="Hir", cfg="cfail3")]
359-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
360-
#[rustc_clean(label="HirBody", cfg="cfail3")]
213+
#[rustc_clean(cfg="cfail2",
214+
except="HirBody,TypeckTables,MirValidated,MirOptimized")]
215+
#[rustc_clean(cfg="cfail3")]
361216
#[rustc_metadata_clean(cfg="cfail2")]
362217
#[rustc_metadata_clean(cfg="cfail3")]
363-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
364-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
365-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
366-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
367-
#[rustc_dirty(label="TypeckTables", cfg="cfail2")]
368-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
369-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
370-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
371-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
372-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
373-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
374-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
375-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
376-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
377218
pub fn add_initializer() {
378219
let _x: i16 = 3i16;
379220
}
@@ -387,26 +228,11 @@ pub fn change_initializer() {
387228
}
388229

389230
#[cfg(not(cfail1))]
390-
#[rustc_clean(label="Hir", cfg="cfail2")]
391-
#[rustc_clean(label="Hir", cfg="cfail3")]
392-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
393-
#[rustc_clean(label="HirBody", cfg="cfail3")]
231+
#[rustc_clean(cfg="cfail2",
232+
except="HirBody,MirValidated,MirOptimized")]
233+
#[rustc_clean(cfg="cfail3")]
394234
#[rustc_metadata_clean(cfg="cfail2")]
395235
#[rustc_metadata_clean(cfg="cfail3")]
396-
#[rustc_dirty(label="MirValidated", cfg="cfail2")]
397-
#[rustc_clean(label="MirValidated", cfg="cfail3")]
398-
#[rustc_dirty(label="MirOptimized", cfg="cfail2")]
399-
#[rustc_clean(label="MirOptimized", cfg="cfail3")]
400-
#[rustc_clean(label="TypeckTables", cfg="cfail2")]
401-
#[rustc_clean(label="TypeckTables", cfg="cfail3")]
402-
#[rustc_clean(label="TypeOfItem", cfg="cfail2")]
403-
#[rustc_clean(label="TypeOfItem", cfg="cfail3")]
404-
#[rustc_clean(label="GenericsOfItem", cfg="cfail2")]
405-
#[rustc_clean(label="GenericsOfItem", cfg="cfail3")]
406-
#[rustc_clean(label="FnSignature", cfg="cfail2")]
407-
#[rustc_clean(label="FnSignature", cfg="cfail3")]
408-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail2")]
409-
#[rustc_clean(label="PredicatesOfItem", cfg="cfail3")]
410236
pub fn change_initializer() {
411237
let _x = 5u16;
412238
}

0 commit comments

Comments
 (0)