Skip to content

Commit f7adde9

Browse files
cjgillotcjgillot
committed
Bless incremental tests.
1 parent 531ead7 commit f7adde9

File tree

5 files changed

+212
-194
lines changed

5 files changed

+212
-194
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ extern "C" {
2727
}
2828

2929
#[cfg(not(any(cfail1,cfail4)))]
30-
#[rustc_clean(cfg = "cfail2", except = "hir_owner")]
30+
#[rustc_clean(cfg = "cfail2", except = "hir_owner,hir_owner_nodes")]
3131
#[rustc_clean(cfg = "cfail3")]
32-
#[rustc_clean(cfg = "cfail5", except = "hir_owner")]
32+
#[rustc_clean(cfg = "cfail5", except = "hir_owner,hir_owner_nodes")]
3333
#[rustc_clean(cfg = "cfail6")]
3434
extern "C" {
3535
pub fn change_function_name2(c: i64) -> i32;
@@ -132,9 +132,9 @@ extern "C" {
132132
}
133133

134134
#[cfg(not(any(cfail1,cfail4)))]
135-
#[rustc_clean(cfg = "cfail2", except = "hir_owner")]
135+
#[rustc_clean(cfg = "cfail2", except = "hir_owner,hir_owner_nodes")]
136136
#[rustc_clean(cfg = "cfail3")]
137-
#[rustc_clean(cfg = "cfail5", except = "hir_owner")]
137+
#[rustc_clean(cfg = "cfail5", except = "hir_owner,hir_owner_nodes")]
138138
#[rustc_clean(cfg = "cfail6")]
139139
extern "rust-call" {
140140
pub fn change_calling_convention(c: i32);
@@ -162,9 +162,9 @@ extern "C" {
162162
}
163163

164164
#[cfg(not(any(cfail1,cfail4)))]
165-
#[rustc_clean(cfg = "cfail2", except = "hir_owner")]
165+
#[rustc_clean(cfg = "cfail2", except = "hir_owner,hir_owner_nodes")]
166166
#[rustc_clean(cfg = "cfail3")]
167-
#[rustc_clean(cfg = "cfail5", except = "hir_owner")]
167+
#[rustc_clean(cfg = "cfail5", except = "hir_owner,hir_owner_nodes")]
168168
#[rustc_clean(cfg = "cfail6")]
169169
extern "C" {
170170
pub fn add_function1(c: i32);

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

+42-42
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ impl Foo {
2929
}
3030

3131
#[cfg(not(any(cfail1,cfail4)))]
32-
#[rustc_clean(cfg="cfail2", except="hir_owner,associated_item_def_ids")]
32+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,associated_item_def_ids")]
3333
#[rustc_clean(cfg="cfail3")]
34-
#[rustc_clean(cfg="cfail5", except="hir_owner,associated_item_def_ids")]
34+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,associated_item_def_ids")]
3535
#[rustc_clean(cfg="cfail6")]
3636
impl Foo {
3737
#[rustc_clean(cfg="cfail3")]
@@ -54,9 +54,9 @@ impl Foo {
5454
}
5555

5656
#[cfg(not(any(cfail1,cfail4)))]
57-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
57+
#[rustc_clean(cfg="cfail2")]
5858
#[rustc_clean(cfg="cfail3")]
59-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
59+
#[rustc_clean(cfg="cfail5")]
6060
#[rustc_clean(cfg="cfail6")]
6161
impl Foo {
6262
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,promoted_mir,typeck")]
@@ -91,9 +91,9 @@ impl Foo {
9191
}
9292

9393
#[cfg(not(any(cfail1,cfail4)))]
94-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
94+
#[rustc_clean(cfg="cfail2")]
9595
#[rustc_clean(cfg="cfail3")]
96-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
96+
#[rustc_clean(cfg="cfail5")]
9797
#[rustc_clean(cfg="cfail6")]
9898
impl Foo {
9999
#[rustc_clean(
@@ -153,9 +153,9 @@ impl Foo {
153153
}
154154

155155
#[cfg(not(any(cfail1,cfail4)))]
156-
#[rustc_clean(cfg="cfail2", except="hir_owner")]
156+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
157157
#[rustc_clean(cfg="cfail3")]
158-
#[rustc_clean(cfg="cfail5", except="hir_owner")]
158+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")]
159159
#[rustc_clean(cfg="cfail6")]
160160
impl Foo {
161161
#[rustc_clean(
@@ -182,9 +182,9 @@ impl Foo {
182182
}
183183

184184
#[cfg(not(any(cfail1,cfail4)))]
185-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
185+
#[rustc_clean(cfg="cfail2")]
186186
#[rustc_clean(cfg="cfail3")]
187-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
187+
#[rustc_clean(cfg="cfail5")]
188188
#[rustc_clean(cfg="cfail6")]
189189
impl Foo {
190190
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,typeck,optimized_mir")]
@@ -203,9 +203,9 @@ impl Foo {
203203
}
204204

205205
#[cfg(not(any(cfail1,cfail4)))]
206-
#[rustc_clean(cfg="cfail2", except="hir_owner,associated_item_def_ids")]
206+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,associated_item_def_ids")]
207207
#[rustc_clean(cfg="cfail3")]
208-
#[rustc_clean(cfg="cfail5", except="hir_owner,associated_item_def_ids")]
208+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,associated_item_def_ids")]
209209
#[rustc_clean(cfg="cfail6")]
210210
impl Foo {
211211
#[rustc_clean(cfg="cfail2")]
@@ -232,9 +232,9 @@ impl Foo {
232232
}
233233

234234
#[cfg(not(any(cfail1,cfail4)))]
235-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
235+
#[rustc_clean(cfg="cfail2")]
236236
#[rustc_clean(cfg="cfail3")]
237-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
237+
#[rustc_clean(cfg="cfail5")]
238238
#[rustc_clean(cfg="cfail6")]
239239
impl Foo {
240240
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,typeck,optimized_mir")]
@@ -257,9 +257,9 @@ impl Foo {
257257
}
258258

259259
#[cfg(not(any(cfail1,cfail4)))]
260-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
260+
#[rustc_clean(cfg="cfail2")]
261261
#[rustc_clean(cfg="cfail3")]
262-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
262+
#[rustc_clean(cfg="cfail5")]
263263
#[rustc_clean(cfg="cfail6")]
264264
impl Foo {
265265
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
@@ -282,9 +282,9 @@ impl Foo {
282282
}
283283

284284
#[cfg(not(any(cfail1,cfail4)))]
285-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
285+
#[rustc_clean(cfg="cfail2")]
286286
#[rustc_clean(cfg="cfail3")]
287-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
287+
#[rustc_clean(cfg="cfail5")]
288288
#[rustc_clean(cfg="cfail6")]
289289
impl Foo {
290290
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,optimized_mir,typeck")]
@@ -308,9 +308,9 @@ impl Foo {
308308
}
309309

310310
#[cfg(not(any(cfail1,cfail4)))]
311-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
311+
#[rustc_clean(cfg="cfail2")]
312312
#[rustc_clean(cfg="cfail3")]
313-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
313+
#[rustc_clean(cfg="cfail5")]
314314
#[rustc_clean(cfg="cfail6")]
315315
impl Foo {
316316
#[rustc_clean(cfg="cfail2")]
@@ -334,9 +334,9 @@ impl Foo {
334334
}
335335

336336
#[cfg(not(any(cfail1,cfail4)))]
337-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
337+
#[rustc_clean(cfg="cfail2")]
338338
#[rustc_clean(cfg="cfail3")]
339-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
339+
#[rustc_clean(cfg="cfail5")]
340340
#[rustc_clean(cfg="cfail6")]
341341
impl Foo {
342342
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
@@ -359,9 +359,9 @@ impl Foo {
359359
}
360360

361361
#[cfg(not(any(cfail1,cfail4)))]
362-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
362+
#[rustc_clean(cfg="cfail2")]
363363
#[rustc_clean(cfg="cfail3")]
364-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
364+
#[rustc_clean(cfg="cfail5")]
365365
#[rustc_clean(cfg="cfail6")]
366366
impl Foo {
367367
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,typeck,optimized_mir")]
@@ -384,9 +384,9 @@ impl Foo {
384384
}
385385

386386
#[cfg(not(any(cfail1,cfail4)))]
387-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
387+
#[rustc_clean(cfg="cfail2")]
388388
#[rustc_clean(cfg="cfail3")]
389-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
389+
#[rustc_clean(cfg="cfail5")]
390390
#[rustc_clean(cfg="cfail6")]
391391
impl Foo {
392392
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,typeck")]
@@ -409,9 +409,9 @@ impl Foo {
409409
}
410410

411411
#[cfg(not(any(cfail1,cfail4)))]
412-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
412+
#[rustc_clean(cfg="cfail2")]
413413
#[rustc_clean(cfg="cfail3")]
414-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
414+
#[rustc_clean(cfg="cfail5")]
415415
#[rustc_clean(cfg="cfail6")]
416416
impl Foo {
417417
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,fn_sig,typeck")]
@@ -443,9 +443,9 @@ impl Foo {
443443
}
444444

445445
#[cfg(not(any(cfail1,cfail4)))]
446-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
446+
#[rustc_clean(cfg="cfail2")]
447447
#[rustc_clean(cfg="cfail3")]
448-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
448+
#[rustc_clean(cfg="cfail5")]
449449
#[rustc_clean(cfg="cfail6")]
450450
impl Foo {
451451
// Warning: Note that `typeck` are coming up clean here.
@@ -492,9 +492,9 @@ impl Foo {
492492
}
493493

494494
#[cfg(not(any(cfail1,cfail4)))]
495-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
495+
#[rustc_clean(cfg="cfail2")]
496496
#[rustc_clean(cfg="cfail3")]
497-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
497+
#[rustc_clean(cfg="cfail5")]
498498
#[rustc_clean(cfg="cfail6")]
499499
impl Foo {
500500
// Warning: Note that `typeck` are coming up clean here.
@@ -538,9 +538,9 @@ impl Foo {
538538
}
539539

540540
#[cfg(not(any(cfail1,cfail4)))]
541-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
541+
#[rustc_clean(cfg="cfail2")]
542542
#[rustc_clean(cfg="cfail3")]
543-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
543+
#[rustc_clean(cfg="cfail5")]
544544
#[rustc_clean(cfg="cfail6")]
545545
impl Foo {
546546
#[rustc_clean(
@@ -584,9 +584,9 @@ impl Foo {
584584
}
585585

586586
#[cfg(not(any(cfail1,cfail4)))]
587-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
587+
#[rustc_clean(cfg="cfail2")]
588588
#[rustc_clean(cfg="cfail3")]
589-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
589+
#[rustc_clean(cfg="cfail5")]
590590
#[rustc_clean(cfg="cfail6")]
591591
impl Foo {
592592
// Warning: Note that `typeck` are coming up clean here.
@@ -633,9 +633,9 @@ impl Foo {
633633
}
634634

635635
#[cfg(not(any(cfail1,cfail4)))]
636-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
636+
#[rustc_clean(cfg="cfail2")]
637637
#[rustc_clean(cfg="cfail3")]
638-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
638+
#[rustc_clean(cfg="cfail5")]
639639
#[rustc_clean(cfg="cfail6")]
640640
impl Foo {
641641
// Warning: Note that `typeck` are coming up clean here.
@@ -668,9 +668,9 @@ impl Foo {
668668
}
669669

670670
#[cfg(not(any(cfail1,cfail4)))]
671-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
671+
#[rustc_clean(cfg="cfail2")]
672672
#[rustc_clean(cfg="cfail3")]
673-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
673+
#[rustc_clean(cfg="cfail5")]
674674
#[rustc_clean(cfg="cfail6")]
675675
impl Foo {
676676
#[rustc_clean(cfg="cfail2")]
@@ -719,9 +719,9 @@ impl Bar<u32> {
719719
}
720720

721721
#[cfg(not(any(cfail1,cfail4)))]
722-
#[rustc_clean(cfg="cfail2", except="hir_owner")]
722+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
723723
#[rustc_clean(cfg="cfail3")]
724-
#[rustc_clean(cfg="cfail5", except="hir_owner")]
724+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes")]
725725
#[rustc_clean(cfg="cfail6")]
726726
impl Bar<u64> {
727727
#[rustc_clean(cfg="cfail2", except="fn_sig,optimized_mir,typeck")]

0 commit comments

Comments
 (0)