Skip to content

Commit 0927a35

Browse files
cjgillotcjgillot
committed
Bless tests.
1 parent 443333d commit 0927a35

File tree

4 files changed

+30
-30
lines changed

4 files changed

+30
-30
lines changed

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ pub fn change_condition(x: bool) -> u32 {
3030
}
3131

3232
#[cfg(not(any(cfail1,cfail4)))]
33-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
33+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
3434
#[rustc_clean(cfg="cfail3")]
35-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
35+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
3636
#[rustc_clean(cfg="cfail6")]
3737
pub fn change_condition(x: bool) -> u32 {
3838
if !x {
@@ -106,9 +106,9 @@ pub fn add_else_branch(x: bool) -> u32 {
106106
}
107107

108108
#[cfg(not(any(cfail1,cfail4)))]
109-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
109+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,typeck")]
110110
#[rustc_clean(cfg="cfail3")]
111-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
111+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,typeck")]
112112
#[rustc_clean(cfg="cfail6")]
113113
pub fn add_else_branch(x: bool) -> u32 {
114114
let mut ret = 1;
@@ -159,9 +159,9 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
159159
}
160160

161161
#[cfg(not(any(cfail1,cfail4)))]
162-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
162+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
163163
#[rustc_clean(cfg="cfail3")]
164-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
164+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
165165
#[rustc_clean(cfg="cfail6")]
166166
pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
167167
if let Some(x) = x {
@@ -212,9 +212,9 @@ pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
212212
}
213213

214214
#[cfg(not(any(cfail1,cfail4)))]
215-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
215+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,typeck")]
216216
#[rustc_clean(cfg="cfail3")]
217-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck,optimized_mir")]
217+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,typeck,optimized_mir")]
218218
#[rustc_clean(cfg="cfail6")]
219219
pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
220220
let mut ret = 1;

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ fn add_lower_bound(slice: &[u32]) -> &[u32] {
7777
}
7878

7979
#[cfg(not(any(cfail1,cfail4)))]
80-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail2")]
80+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail2")]
8181
#[rustc_clean(cfg="cfail3")]
82-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail5")]
82+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail5")]
8383
#[rustc_clean(cfg="cfail6")]
8484
fn add_lower_bound(slice: &[u32]) -> &[u32] {
8585
&slice[3..4]
@@ -94,9 +94,9 @@ fn add_upper_bound(slice: &[u32]) -> &[u32] {
9494
}
9595

9696
#[cfg(not(any(cfail1,cfail4)))]
97-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail2")]
97+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail2")]
9898
#[rustc_clean(cfg="cfail3")]
99-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail5")]
99+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail5")]
100100
#[rustc_clean(cfg="cfail6")]
101101
fn add_upper_bound(slice: &[u32]) -> &[u32] {
102102
&slice[3..7]
@@ -128,9 +128,9 @@ fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
128128
}
129129

130130
#[cfg(not(any(cfail1,cfail4)))]
131-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail2")]
131+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail2")]
132132
#[rustc_clean(cfg="cfail3")]
133-
#[rustc_clean(except="hir_owner_nodes,typeck", cfg="cfail5")]
133+
#[rustc_clean(except="hir_owner,hir_owner_nodes,typeck", cfg="cfail5")]
134134
#[rustc_clean(cfg="cfail6")]
135135
fn exclusive_to_inclusive_range(slice: &[u32]) -> &[u32] {
136136
&slice[3..=7]

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ pub fn add_arm(x: u32) -> u32 {
3131
}
3232

3333
#[cfg(not(any(cfail1,cfail4)))]
34-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
34+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
3535
#[rustc_clean(cfg="cfail3")]
36-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
36+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
3737
#[rustc_clean(cfg="cfail6")]
3838
pub fn add_arm(x: u32) -> u32 {
3939
match x {
@@ -82,9 +82,9 @@ pub fn add_guard_clause(x: u32, y: bool) -> u32 {
8282
}
8383

8484
#[cfg(not(any(cfail1,cfail4)))]
85-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
85+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
8686
#[rustc_clean(cfg="cfail3")]
87-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
87+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
8888
#[rustc_clean(cfg="cfail6")]
8989
pub fn add_guard_clause(x: u32, y: bool) -> u32 {
9090
match x {
@@ -107,9 +107,9 @@ pub fn change_guard_clause(x: u32, y: bool) -> u32 {
107107
}
108108

109109
#[cfg(not(any(cfail1,cfail4)))]
110-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
110+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
111111
#[rustc_clean(cfg="cfail3")]
112-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
112+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
113113
#[rustc_clean(cfg="cfail6")]
114114
pub fn change_guard_clause(x: u32, y: bool) -> u32 {
115115
match x {
@@ -132,9 +132,9 @@ pub fn add_at_binding(x: u32) -> u32 {
132132
}
133133

134134
#[cfg(not(any(cfail1,cfail4)))]
135-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
135+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
136136
#[rustc_clean(cfg="cfail3")]
137-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
137+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
138138
#[rustc_clean(cfg="cfail6")]
139139
pub fn add_at_binding(x: u32) -> u32 {
140140
match x {
@@ -181,9 +181,9 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 {
181181
}
182182

183183
#[cfg(not(any(cfail1,cfail4)))]
184-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
184+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
185185
#[rustc_clean(cfg="cfail3")]
186-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
186+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
187187
#[rustc_clean(cfg="cfail6")]
188188
pub fn change_simple_name_to_pattern(x: u32) -> u32 {
189189
match (x, x & 1) {
@@ -275,9 +275,9 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
275275
}
276276

277277
#[cfg(not(any(cfail1,cfail4)))]
278-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
278+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
279279
#[rustc_clean(cfg="cfail3")]
280-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
280+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
281281
#[rustc_clean(cfg="cfail6")]
282282
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
283283
match (&x, x & 1) {
@@ -324,9 +324,9 @@ pub fn add_alternative_to_arm(x: u32) -> u32 {
324324
}
325325

326326
#[cfg(not(any(cfail1,cfail4)))]
327-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
327+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
328328
#[rustc_clean(cfg="cfail3")]
329-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
329+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
330330
#[rustc_clean(cfg="cfail6")]
331331
pub fn add_alternative_to_arm(x: u32) -> u32 {
332332
match x {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ pub fn add_field_regular_struct() -> RegularStruct {
9393
}
9494

9595
#[cfg(not(any(cfail1,cfail4)))]
96-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
96+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
9797
#[rustc_clean(cfg="cfail3")]
98-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
98+
#[rustc_clean(cfg="cfail5", except="hir_owner,hir_owner_nodes,optimized_mir,typeck")]
9999
#[rustc_clean(cfg="cfail6")]
100100
pub fn add_field_regular_struct() -> RegularStruct {
101101
let struct1 = RegularStruct {

0 commit comments

Comments
 (0)