Skip to content

Commit fc832a4

Browse files
scottmcmscottmcm
committed
Yay, it broke some incremental compilation tests too
1 parent cd2a713 commit fc832a4

File tree

7 files changed

+50
-50
lines changed

7 files changed

+50
-50
lines changed

‎tests/incremental/hashes/enum_constructors.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,9 @@ pub fn change_constructor_path_c_like() {
301301
}
302302

303303
#[cfg(not(any(cfail1,cfail4)))]
304-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
304+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
305305
#[rustc_clean(cfg="cfail3")]
306-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
306+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
307307
#[rustc_clean(cfg="cfail6")]
308308
pub fn change_constructor_path_c_like() {
309309
let _x = Clike2::B;
@@ -318,9 +318,9 @@ pub fn change_constructor_variant_c_like() {
318318
}
319319

320320
#[cfg(not(any(cfail1,cfail4)))]
321-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir")]
321+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
322322
#[rustc_clean(cfg="cfail3")]
323-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir")]
323+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
324324
#[rustc_clean(cfg="cfail6")]
325325
pub fn change_constructor_variant_c_like() {
326326
let _x = Clike::C;

‎tests/incremental/hashes/for_loops.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ pub fn change_loop_body() {
2828
}
2929

3030
#[cfg(not(any(cfail1,cfail4)))]
31-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
31+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
3232
#[rustc_clean(cfg="cfail3")]
33-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
33+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
3434
#[rustc_clean(cfg="cfail6")]
3535
pub fn change_loop_body() {
3636
let mut _x = 0;
@@ -53,9 +53,9 @@ pub fn change_iteration_variable_name() {
5353
}
5454

5555
#[cfg(not(any(cfail1,cfail4)))]
56-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
56+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
5757
#[rustc_clean(cfg="cfail3")]
58-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
58+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
5959
#[rustc_clean(cfg="cfail6")]
6060
pub fn change_iteration_variable_name() {
6161
let mut _x = 0;
@@ -78,9 +78,9 @@ pub fn change_iteration_variable_pattern() {
7878
}
7979

8080
#[cfg(not(any(cfail1,cfail4)))]
81-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck")]
81+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, typeck")]
8282
#[rustc_clean(cfg="cfail3")]
83-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck")]
83+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, typeck")]
8484
#[rustc_clean(cfg="cfail6")]
8585
pub fn change_iteration_variable_pattern() {
8686
let mut _x = 0;
@@ -180,7 +180,7 @@ pub fn add_loop_label_to_break() {
180180
#[cfg(not(any(cfail1,cfail4)))]
181181
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
182182
#[rustc_clean(cfg="cfail3")]
183-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
183+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
184184
#[rustc_clean(cfg="cfail6")]
185185
pub fn add_loop_label_to_break() {
186186
let mut _x = 0;

‎tests/incremental/hashes/if_expressions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
131131
}
132132

133133
#[cfg(not(any(cfail1,cfail4)))]
134-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
134+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
135135
#[rustc_clean(cfg="cfail3")]
136-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
136+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
137137
#[rustc_clean(cfg="cfail6")]
138138
pub fn change_condition_if_let(x: Option<u32>) -> u32 {
139139
if let Some(_ ) = x {

‎tests/incremental/hashes/let_expressions.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ pub fn change_name() {
2323
}
2424

2525
#[cfg(not(any(cfail1,cfail4)))]
26-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir")]
26+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
2727
#[rustc_clean(cfg="cfail3")]
28-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir")]
28+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
2929
#[rustc_clean(cfg="cfail6")]
3030
pub fn change_name() {
3131
let _y = 2u64;
@@ -57,9 +57,9 @@ pub fn change_type() {
5757
}
5858

5959
#[cfg(not(any(cfail1,cfail4)))]
60-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
60+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
6161
#[rustc_clean(cfg="cfail3")]
62-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
62+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
6363
#[rustc_clean(cfg="cfail6")]
6464
pub fn change_type() {
6565
let _x: u8 = 2;
@@ -74,9 +74,9 @@ pub fn change_mutability_of_reference_type() {
7474
}
7575

7676
#[cfg(not(any(cfail1,cfail4)))]
77-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
77+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
7878
#[rustc_clean(cfg="cfail3")]
79-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
79+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
8080
#[rustc_clean(cfg="cfail6")]
8181
pub fn change_mutability_of_reference_type() {
8282
let _x: &mut u64;
@@ -93,7 +93,7 @@ pub fn change_mutability_of_slot() {
9393
#[cfg(not(any(cfail1,cfail4)))]
9494
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
9595
#[rustc_clean(cfg="cfail3")]
96-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
96+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
9797
#[rustc_clean(cfg="cfail6")]
9898
pub fn change_mutability_of_slot() {
9999
let _x: u64 = 0;
@@ -108,9 +108,9 @@ pub fn change_simple_binding_to_pattern() {
108108
}
109109

110110
#[cfg(not(any(cfail1,cfail4)))]
111-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
111+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
112112
#[rustc_clean(cfg="cfail3")]
113-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
113+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
114114
#[rustc_clean(cfg="cfail6")]
115115
pub fn change_simple_binding_to_pattern() {
116116
let (_a, _b) = (0u8, 'x');
@@ -125,9 +125,9 @@ pub fn change_name_in_pattern() {
125125
}
126126

127127
#[cfg(not(any(cfail1,cfail4)))]
128-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir")]
128+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
129129
#[rustc_clean(cfg="cfail3")]
130-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir")]
130+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
131131
#[rustc_clean(cfg="cfail6")]
132132
pub fn change_name_in_pattern() {
133133
let (_a, _c) = (1u8, 'y');
@@ -142,9 +142,9 @@ pub fn add_ref_in_pattern() {
142142
}
143143

144144
#[cfg(not(any(cfail1,cfail4)))]
145-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
145+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
146146
#[rustc_clean(cfg="cfail3")]
147-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
147+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
148148
#[rustc_clean(cfg="cfail6")]
149149
pub fn add_ref_in_pattern() {
150150
let (ref _a, _b) = (1u8, 'y');
@@ -159,9 +159,9 @@ pub fn add_amp_in_pattern() {
159159
}
160160

161161
#[cfg(not(any(cfail1,cfail4)))]
162-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
162+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
163163
#[rustc_clean(cfg="cfail3")]
164-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
164+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
165165
#[rustc_clean(cfg="cfail6")]
166166
pub fn add_amp_in_pattern() {
167167
let (&_a, _b) = (&1u8, 'y');
@@ -178,7 +178,7 @@ pub fn change_mutability_of_binding_in_pattern() {
178178
#[cfg(not(any(cfail1,cfail4)))]
179179
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
180180
#[rustc_clean(cfg="cfail3")]
181-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
181+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
182182
#[rustc_clean(cfg="cfail6")]
183183
pub fn change_mutability_of_binding_in_pattern() {
184184
let (mut _a, _b) = (99u8, 'q');
@@ -193,9 +193,9 @@ pub fn add_initializer() {
193193
}
194194

195195
#[cfg(not(any(cfail1,cfail4)))]
196-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck,optimized_mir")]
196+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
197197
#[rustc_clean(cfg="cfail3")]
198-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck,optimized_mir")]
198+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
199199
#[rustc_clean(cfg="cfail6")]
200200
pub fn add_initializer() {
201201
let _x: i16 = 3i16;
@@ -210,9 +210,9 @@ pub fn change_initializer() {
210210
}
211211

212212
#[cfg(not(any(cfail1,cfail4)))]
213-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
213+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
214214
#[rustc_clean(cfg="cfail3")]
215-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
215+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
216216
#[rustc_clean(cfg="cfail6")]
217217
pub fn change_initializer() {
218218
let _x = 5u16;

‎tests/incremental/hashes/loop_expressions.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ pub fn change_loop_body() {
2828
}
2929

3030
#[cfg(not(any(cfail1,cfail4)))]
31-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
31+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
3232
#[rustc_clean(cfg="cfail3")]
33-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
33+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
3434
#[rustc_clean(cfg="cfail6")]
3535
pub fn change_loop_body() {
3636
let mut _x = 0;

‎tests/incremental/hashes/match_expressions.rs

+10-10
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ pub fn change_name_of_at_binding(x: u32) -> u32 {
154154
}
155155

156156
#[cfg(not(any(cfail1,cfail4)))]
157-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir")]
157+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
158158
#[rustc_clean(cfg="cfail3")]
159-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir")]
159+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
160160
#[rustc_clean(cfg="cfail6")]
161161
pub fn change_name_of_at_binding(x: u32) -> u32 {
162162
match x {
@@ -178,7 +178,7 @@ pub fn change_simple_name_to_pattern(x: u32) -> u32 {
178178
}
179179

180180
#[cfg(not(any(cfail1,cfail4)))]
181-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
181+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
182182
#[rustc_clean(cfg="cfail3")]
183183
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
184184
#[rustc_clean(cfg="cfail6")]
@@ -202,9 +202,9 @@ pub fn change_name_in_pattern(x: u32) -> u32 {
202202
}
203203

204204
#[cfg(not(any(cfail1,cfail4)))]
205-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir")]
205+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
206206
#[rustc_clean(cfg="cfail3")]
207-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir")]
207+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
208208
#[rustc_clean(cfg="cfail6")]
209209
pub fn change_name_in_pattern(x: u32) -> u32 {
210210
match (x, x & 1) {
@@ -229,7 +229,7 @@ pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
229229
#[cfg(not(any(cfail1,cfail4)))]
230230
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
231231
#[rustc_clean(cfg="cfail3")]
232-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
232+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
233233
#[rustc_clean(cfg="cfail6")]
234234
pub fn change_mutability_of_binding_in_pattern(x: u32) -> u32 {
235235
match (x, x & 1) {
@@ -250,9 +250,9 @@ pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
250250
}
251251

252252
#[cfg(not(any(cfail1,cfail4)))]
253-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
253+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
254254
#[rustc_clean(cfg="cfail3")]
255-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
255+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
256256
#[rustc_clean(cfg="cfail6")]
257257
pub fn add_ref_to_binding_in_pattern(x: u32) -> u32 {
258258
match (x, x & 1) {
@@ -273,9 +273,9 @@ pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
273273
}
274274

275275
#[cfg(not(any(cfail1,cfail4)))]
276-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
276+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
277277
#[rustc_clean(cfg="cfail3")]
278-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
278+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
279279
#[rustc_clean(cfg="cfail6")]
280280
pub fn add_amp_to_binding_in_pattern(x: u32) -> u32 {
281281
match (&x, x & 1) {

‎tests/incremental/hashes/while_loops.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ pub fn change_loop_body() {
2828
}
2929

3030
#[cfg(not(any(cfail1,cfail4)))]
31-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
31+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
3232
#[rustc_clean(cfg="cfail3")]
33-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
33+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
3434
#[rustc_clean(cfg="cfail6")]
3535
pub fn change_loop_body() {
3636
let mut _x = 0;
@@ -53,9 +53,9 @@ pub fn change_loop_condition() {
5353
}
5454

5555
#[cfg(not(any(cfail1,cfail4)))]
56-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir")]
56+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
5757
#[rustc_clean(cfg="cfail3")]
58-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
58+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
5959
#[rustc_clean(cfg="cfail6")]
6060
pub fn change_loop_condition() {
6161
let mut _x = 0;
@@ -211,7 +211,7 @@ pub fn change_continue_label() {
211211
#[cfg(not(any(cfail1,cfail4)))]
212212
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes")]
213213
#[rustc_clean(cfg="cfail3")]
214-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes")]
214+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir")]
215215
#[rustc_clean(cfg="cfail6")]
216216
pub fn change_continue_label() {
217217
let mut _x = 0;

0 commit comments

Comments
 (0)