Skip to content

Commit c95ef0d

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #45941 - gaurikholkar:master, r=nikomatsakis
update match-expressions.rs with DepNode labels As a part of #44924, I have updated the match-expressions.rs. The PR has tests verified for the following dependency nodes for let-expressions - MirValidated - MirOptimized - TypeCheckTables - TypeOfItem - GenericsOfItem - PredicatesOfItem - FnSignature cc @michaelwoerister r? @nikomatsakis
2 parents 013cd5a + 39f468e commit c95ef0d

File tree

1 file changed

+47
-60
lines changed

1 file changed

+47
-60
lines changed

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

Lines changed: 47 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ pub fn add_arm(x: u32) -> u32 {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_clean(label="Hir", cfg="cfail2")]
40-
#[rustc_clean(label="Hir", cfg="cfail3")]
41-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
42-
#[rustc_clean(label="HirBody", cfg="cfail3")]
39+
#[rustc_clean(cfg="cfail2",
40+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
41+
#[rustc_clean(cfg="cfail3")]
4342
#[rustc_metadata_clean(cfg="cfail2")]
4443
#[rustc_metadata_clean(cfg="cfail3")]
4544
pub fn add_arm(x: u32) -> u32 {
@@ -64,10 +63,9 @@ pub fn change_order_of_arms(x: u32) -> u32 {
6463
}
6564

6665
#[cfg(not(cfail1))]
67-
#[rustc_clean(label="Hir", cfg="cfail2")]
68-
#[rustc_clean(label="Hir", cfg="cfail3")]
69-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
70-
#[rustc_clean(label="HirBody", cfg="cfail3")]
66+
#[rustc_clean(cfg="cfail2",
67+
except="HirBody,MirValidated,MirOptimized")]
68+
#[rustc_clean(cfg="cfail3")]
7169
#[rustc_metadata_clean(cfg="cfail2")]
7270
#[rustc_metadata_clean(cfg="cfail3")]
7371
pub fn change_order_of_arms(x: u32) -> u32 {
@@ -91,10 +89,9 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 {
9189
}
9290

9391
#[cfg(not(cfail1))]
94-
#[rustc_clean(label="Hir", cfg="cfail2")]
95-
#[rustc_clean(label="Hir", cfg="cfail3")]
96-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
97-
#[rustc_clean(label="HirBody", cfg="cfail3")]
92+
#[rustc_clean(cfg="cfail2",
93+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
94+
#[rustc_clean(cfg="cfail3")]
9895
#[rustc_metadata_clean(cfg="cfail2")]
9996
#[rustc_metadata_clean(cfg="cfail3")]
10097
pub fn add_guard_clause(x: u32, y: bool) -> u32 {
@@ -118,10 +115,9 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 {
118115
}
119116

120117
#[cfg(not(cfail1))]
121-
#[rustc_clean(label="Hir", cfg="cfail2")]
122-
#[rustc_clean(label="Hir", cfg="cfail3")]
123-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
124-
#[rustc_clean(label="HirBody", cfg="cfail3")]
118+
#[rustc_clean(cfg="cfail2",
119+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
120+
#[rustc_clean(cfg="cfail3")]
125121
#[rustc_metadata_clean(cfg="cfail2")]
126122
#[rustc_metadata_clean(cfg="cfail3")]
127123
pub fn change_guard_clause(x: u32, y: bool) -> u32 {
@@ -145,10 +141,9 @@ pub fn add_at_binding(x: u32) -> u32 {
145141
}
146142

147143
#[cfg(not(cfail1))]
148-
#[rustc_clean(label="Hir", cfg="cfail2")]
149-
#[rustc_clean(label="Hir", cfg="cfail3")]
150-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
151-
#[rustc_clean(label="HirBody", cfg="cfail3")]
144+
#[rustc_clean(cfg="cfail2",
145+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
146+
#[rustc_clean(cfg="cfail3")]
152147
#[rustc_metadata_clean(cfg="cfail2")]
153148
#[rustc_metadata_clean(cfg="cfail3")]
154149
pub fn add_at_binding(x: u32) -> u32 {
@@ -172,10 +167,9 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
172167
}
173168

174169
#[cfg(not(cfail1))]
175-
#[rustc_clean(label="Hir", cfg="cfail2")]
176-
#[rustc_clean(label="Hir", cfg="cfail3")]
177-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
178-
#[rustc_clean(label="HirBody", cfg="cfail3")]
170+
#[rustc_clean(cfg="cfail2",
171+
except="HirBody,MirValidated,MirOptimized")]
172+
#[rustc_clean(cfg="cfail3")]
179173
#[rustc_metadata_clean(cfg="cfail2")]
180174
#[rustc_metadata_clean(cfg="cfail3")]
181175
pub fn change_name_of_at_binding(x: u32) -> u32 {
@@ -193,21 +187,20 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
193187
pub fn change_simple_name_to_pattern(x: u32) -> u32 {
194188
match (x, x & 1) {
195189
(0, 0) => 0,
196-
a => 1
190+
a => 1,
197191
}
198192
}
199193

200194
#[cfg(not(cfail1))]
201-
#[rustc_clean(label="Hir", cfg="cfail2")]
202-
#[rustc_clean(label="Hir", cfg="cfail3")]
203-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
204-
#[rustc_clean(label="HirBody", cfg="cfail3")]
195+
#[rustc_clean(cfg="cfail2",
196+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
197+
#[rustc_clean(cfg="cfail3")]
205198
#[rustc_metadata_clean(cfg="cfail2")]
206199
#[rustc_metadata_clean(cfg="cfail3")]
207200
pub fn change_simple_name_to_pattern(x: u32) -> u32 {
208201
match (x, x & 1) {
209202
(0, 0) => 0,
210-
(x, y) => 1
203+
(x, y) => 1,
211204
}
212205
}
213206

@@ -224,10 +217,9 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
224217
}
225218

226219
#[cfg(not(cfail1))]
227-
#[rustc_clean(label="Hir", cfg="cfail2")]
228-
#[rustc_clean(label="Hir", cfg="cfail3")]
229-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
230-
#[rustc_clean(label="HirBody", cfg="cfail3")]
220+
#[rustc_clean(cfg="cfail2",
221+
except="HirBody,MirValidated,MirOptimized")]
222+
#[rustc_clean(cfg="cfail3")]
231223
#[rustc_metadata_clean(cfg="cfail2")]
232224
#[rustc_metadata_clean(cfg="cfail3")]
233225
pub fn change_name_in_pattern(x: u32) -> u32 {
@@ -245,21 +237,20 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
245237
pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
246238
match (x, x & 1) {
247239
(a, 0) => 0,
248-
_ => 1
240+
_ => 1,
249241
}
250242
}
251243

252244
#[cfg(not(cfail1))]
253-
#[rustc_clean(label="Hir", cfg="cfail2")]
254-
#[rustc_clean(label="Hir", cfg="cfail3")]
255-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
256-
#[rustc_clean(label="HirBody", cfg="cfail3")]
245+
#[rustc_clean(cfg="cfail2",
246+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
247+
#[rustc_clean(cfg="cfail3")]
257248
#[rustc_metadata_clean(cfg="cfail2")]
258249
#[rustc_metadata_clean(cfg="cfail3")]
259250
pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
260251
match (x, x & 1) {
261252
(mut a, 0) => 0,
262-
_ => 1
253+
_ => 1,
263254
}
264255
}
265256

@@ -270,21 +261,20 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
270261
pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
271262
match (x, x & 1) {
272263
(a, 0) => 0,
273-
_ => 1
264+
_ => 1,
274265
}
275266
}
276267

277268
#[cfg(not(cfail1))]
278-
#[rustc_clean(label="Hir", cfg="cfail2")]
279-
#[rustc_clean(label="Hir", cfg="cfail3")]
280-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
281-
#[rustc_clean(label="HirBody", cfg="cfail3")]
269+
#[rustc_clean(cfg="cfail2",
270+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
271+
#[rustc_clean(cfg="cfail3")]
282272
#[rustc_metadata_clean(cfg="cfail2")]
283273
#[rustc_metadata_clean(cfg="cfail3")]
284274
pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
285275
match (x, x & 1) {
286276
(ref a, 0) => 0,
287-
_ => 1,
277+
_ => 1,
288278
}
289279
}
290280

@@ -295,21 +285,20 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
295285
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
296286
match (&x, x & 1) {
297287
(a, 0) => 0,
298-
_ => 1
288+
_ => 1,
299289
}
300290
}
301291

302292
#[cfg(not(cfail1))]
303-
#[rustc_clean(label="Hir", cfg="cfail2")]
304-
#[rustc_clean(label="Hir", cfg="cfail3")]
305-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
306-
#[rustc_clean(label="HirBody", cfg="cfail3")]
293+
#[rustc_clean(cfg="cfail2",
294+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
295+
#[rustc_clean(cfg="cfail3")]
307296
#[rustc_metadata_clean(cfg="cfail2")]
308297
#[rustc_metadata_clean(cfg="cfail3")]
309298
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
310299
match (&x, x & 1) {
311300
(&a, 0) => 0,
312-
_ => 1,
301+
_ => 1,
313302
}
314303
}
315304

@@ -326,10 +315,9 @@ pub fn change_rhs_of_arm(x: u32) -> u32 {
326315
}
327316

328317
#[cfg(not(cfail1))]
329-
#[rustc_clean(label="Hir", cfg="cfail2")]
330-
#[rustc_clean(label="Hir", cfg="cfail3")]
331-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
332-
#[rustc_clean(label="HirBody", cfg="cfail3")]
318+
#[rustc_clean(cfg="cfail2",
319+
except="HirBody,MirValidated,MirOptimized")]
320+
#[rustc_clean(cfg="cfail3")]
333321
#[rustc_metadata_clean(cfg="cfail2")]
334322
#[rustc_metadata_clean(cfg="cfail3")]
335323
pub fn change_rhs_of_arm(x: u32) -> u32 {
@@ -353,10 +341,9 @@ pub fn add_alternative_to_arm(x: u32) -> u32 {
353341
}
354342

355343
#[cfg(not(cfail1))]
356-
#[rustc_clean(label="Hir", cfg="cfail2")]
357-
#[rustc_clean(label="Hir", cfg="cfail3")]
358-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
359-
#[rustc_clean(label="HirBody", cfg="cfail3")]
344+
#[rustc_clean(cfg="cfail2",
345+
except="HirBody,MirValidated,MirOptimized,TypeckTables")]
346+
#[rustc_clean(cfg="cfail3")]
360347
#[rustc_metadata_clean(cfg="cfail2")]
361348
#[rustc_metadata_clean(cfg="cfail3")]
362349
pub fn add_alternative_to_arm(x: u32) -> u32 {

0 commit comments

Comments
 (0)