Skip to content

Commit 6b5d2de

Browse files
cjgillotcjgillot
committed
Bless tests.
1 parent fb753cc commit 6b5d2de

File tree

8 files changed

+116
-116
lines changed

8 files changed

+116
-116
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ enum EnumAddMustUse {
335335
}
336336

337337
#[cfg(not(cfail1))]
338-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
338+
#[rustc_clean(cfg="cfail2")]
339339
#[rustc_clean(cfg="cfail3")]
340340
#[must_use]
341341
enum EnumAddMustUse {
@@ -353,7 +353,7 @@ enum EnumAddReprC {
353353
}
354354

355355
#[cfg(not(cfail1))]
356-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,type_of")]
356+
#[rustc_clean(cfg="cfail2", except="type_of")]
357357
#[rustc_clean(cfg="cfail3")]
358358
#[repr(C)]
359359
enum EnumAddReprC {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ extern "C" {
154154
}
155155

156156
#[cfg(not(cfail1))]
157-
#[rustc_dirty(cfg = "cfail2", except = "hir_owner_nodes")]
157+
#[rustc_dirty(cfg = "cfail2", except = "hir_owner,hir_owner_nodes")]
158158
#[rustc_clean(cfg = "cfail3")]
159159
#[link_args = "-foo -bar -baz"]
160160
extern "C" {
@@ -169,7 +169,7 @@ extern "C" {
169169
}
170170

171171
#[cfg(not(cfail1))]
172-
#[rustc_dirty(cfg = "cfail2", except = "hir_owner_nodes")]
172+
#[rustc_dirty(cfg = "cfail2", except = "hir_owner,hir_owner_nodes")]
173173
#[rustc_clean(cfg = "cfail3")]
174174
#[link(name = "bar")]
175175
extern "C" {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ pub fn second_lifetime_bound<'a, 'b, T: 'a + 'b>() {}
194194
pub fn inline() {}
195195

196196
#[cfg(not(cfail1))]
197-
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes")]
197+
#[rustc_clean(cfg = "cfail2")]
198198
#[rustc_clean(cfg = "cfail3")]
199199
#[inline]
200200
pub fn inline() {}
@@ -206,7 +206,7 @@ pub fn inline() {}
206206
pub fn inline_never() {}
207207

208208
#[cfg(not(cfail1))]
209-
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes")]
209+
#[rustc_clean(cfg = "cfail2")]
210210
#[rustc_clean(cfg = "cfail3")]
211211
#[inline(never)]
212212
pub fn inline_never() {}
@@ -217,7 +217,7 @@ pub fn inline_never() {}
217217
pub fn no_mangle() {}
218218

219219
#[cfg(not(cfail1))]
220-
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes")]
220+
#[rustc_clean(cfg = "cfail2")]
221221
#[rustc_clean(cfg = "cfail3")]
222222
#[no_mangle]
223223
pub fn no_mangle() {}
@@ -228,7 +228,7 @@ pub fn no_mangle() {}
228228
pub fn linkage() {}
229229

230230
#[cfg(not(cfail1))]
231-
#[rustc_clean(cfg = "cfail2", except = "hir_owner, hir_owner_nodes")]
231+
#[rustc_clean(cfg = "cfail2")]
232232
#[rustc_clean(cfg = "cfail3")]
233233
#[linkage = "weak_odr"]
234234
pub fn linkage() {}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ impl Foo {
214214
#[rustc_clean(cfg="cfail2")]
215215
#[rustc_clean(cfg="cfail3")]
216216
impl Foo {
217-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
217+
#[rustc_clean(cfg="cfail2")]
218218
#[rustc_clean(cfg="cfail3")]
219219
#[inline]
220220
pub fn make_method_inline(&self) -> u8 { 0 }
@@ -431,7 +431,7 @@ impl Foo {
431431
#[rustc_clean(cfg="cfail2")]
432432
#[rustc_clean(cfg="cfail3")]
433433
impl Foo {
434-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
434+
#[rustc_clean(cfg="cfail2")]
435435
#[rustc_clean(cfg="cfail3")]
436436
#[no_mangle]
437437
pub fn add_no_mangle_to_method(&self) { }

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ static mut STATIC_MUTABILITY: u8 = 0;
4141
static STATIC_LINKAGE: u8 = 0;
4242

4343
#[cfg(not(cfail1))]
44-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
44+
#[rustc_clean(cfg="cfail2")]
4545
#[rustc_clean(cfg="cfail3")]
4646
#[linkage="weak_odr"]
4747
static STATIC_LINKAGE: u8 = 0;
@@ -52,7 +52,7 @@ static STATIC_LINKAGE: u8 = 0;
5252
static STATIC_NO_MANGLE: u8 = 0;
5353

5454
#[cfg(not(cfail1))]
55-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
55+
#[rustc_clean(cfg="cfail2")]
5656
#[rustc_clean(cfg="cfail3")]
5757
#[no_mangle]
5858
static STATIC_NO_MANGLE: u8 = 0;
@@ -63,7 +63,7 @@ static STATIC_NO_MANGLE: u8 = 0;
6363
static STATIC_THREAD_LOCAL: u8 = 0;
6464

6565
#[cfg(not(cfail1))]
66-
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes")]
66+
#[rustc_clean(cfg="cfail2")]
6767
#[rustc_clean(cfg="cfail3")]
6868
#[thread_local]
6969
static STATIC_THREAD_LOCAL: u8 = 0;

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
pub struct LayoutPacked;
2525

2626
#[cfg(not(cfail1))]
27-
#[rustc_dirty(label="hir_owner", cfg="cfail2")]
28-
#[rustc_dirty(label="hir_owner_nodes", cfg="cfail2")]
27+
#[rustc_clean(label="hir_owner", cfg="cfail2")]
28+
#[rustc_clean(label="hir_owner_nodes", cfg="cfail2")]
2929
#[rustc_dirty(label="type_of", cfg="cfail2")]
3030
#[rustc_clean(label="generics_of", cfg="cfail2")]
3131
#[rustc_clean(label="predicates_of", cfg="cfail2")]
@@ -41,8 +41,8 @@ pub struct LayoutPacked;
4141
struct LayoutC;
4242

4343
#[cfg(not(cfail1))]
44-
#[rustc_dirty(label="hir_owner", cfg="cfail2")]
45-
#[rustc_dirty(label="hir_owner_nodes", cfg="cfail2")]
44+
#[rustc_clean(label="hir_owner", cfg="cfail2")]
45+
#[rustc_clean(label="hir_owner_nodes", cfg="cfail2")]
4646
#[rustc_dirty(label="type_of", cfg="cfail2")]
4747
#[rustc_clean(label="generics_of", cfg="cfail2")]
4848
#[rustc_clean(label="predicates_of", cfg="cfail2")]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ impl AddNoMangleToMethod for Foo {
457457
#[rustc_clean(label="hir_owner", cfg="cfail2")]
458458
#[rustc_clean(label="hir_owner", cfg="cfail3")]
459459
impl AddNoMangleToMethod for Foo {
460-
#[rustc_dirty(label="hir_owner", cfg="cfail2")]
460+
#[rustc_clean(label="hir_owner", cfg="cfail2")]
461461
#[rustc_clean(label="hir_owner", cfg="cfail3")]
462462
#[no_mangle]
463463
fn add_no_mangle_to_method(&self) { }
@@ -478,7 +478,7 @@ impl MakeMethodInline for Foo {
478478
#[rustc_clean(label="hir_owner", cfg="cfail2")]
479479
#[rustc_clean(label="hir_owner", cfg="cfail3")]
480480
impl MakeMethodInline for Foo {
481-
#[rustc_dirty(label="hir_owner", cfg="cfail2")]
481+
#[rustc_clean(label="hir_owner", cfg="cfail2")]
482482
#[rustc_clean(label="hir_owner", cfg="cfail3")]
483483
#[inline]
484484
fn make_method_inline(&self) -> u8 { 0 }

0 commit comments

Comments
 (0)