Skip to content

Commit a0f02cd

Browse files
ZoxcZoxc
committed
Update tests
1 parent 6ec66df commit a0f02cd

18 files changed

+155
-155
lines changed

‎src/librustc_incremental/persist/dirty_clean.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ const BASE_IMPL: &[&str] = &[
6767
label_strs::ImplTraitRef,
6868
];
6969

70-
/// DepNodes for MirValidated/Optimized, which is relevant in "executable"
70+
/// DepNodes for MirBuilt/Optimized, which is relevant in "executable"
7171
/// code, i.e., functions+methods
7272
const BASE_MIR: &[&str] = &[
7373
label_strs::MirOptimized,
74-
label_strs::MirValidated,
74+
label_strs::MirBuilt,
7575
];
7676

7777
/// Struct, Enum and Union DepNodes

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn change_callee_function() {
2525
}
2626

2727
#[cfg(not(cfail1))]
28-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
28+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized,TypeckTables")]
2929
#[rustc_clean(cfg="cfail3")]
3030
pub fn change_callee_function() {
3131
callee2(1, 2)
@@ -40,7 +40,7 @@ pub fn change_argument_function() {
4040
}
4141

4242
#[cfg(not(cfail1))]
43-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
43+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
4444
#[rustc_clean(cfg="cfail3")]
4545
pub fn change_argument_function() {
4646
callee1(1, 3)
@@ -81,7 +81,7 @@ pub fn change_callee_method() {
8181
}
8282

8383
#[cfg(not(cfail1))]
84-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
84+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized,TypeckTables")]
8585
#[rustc_clean(cfg="cfail3")]
8686
pub fn change_callee_method() {
8787
let s = Struct;
@@ -98,7 +98,7 @@ pub fn change_argument_method() {
9898
}
9999

100100
#[cfg(not(cfail1))]
101-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
101+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
102102
#[rustc_clean(cfg="cfail3")]
103103
pub fn change_argument_method() {
104104
let s = Struct;
@@ -115,7 +115,7 @@ pub fn change_ufcs_callee_method() {
115115
}
116116

117117
#[cfg(not(cfail1))]
118-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
118+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized,TypeckTables")]
119119
#[rustc_clean(cfg="cfail3")]
120120
pub fn change_ufcs_callee_method() {
121121
let s = Struct;
@@ -132,7 +132,7 @@ pub fn change_argument_method_ufcs() {
132132
}
133133

134134
#[cfg(not(cfail1))]
135-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
135+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
136136
#[rustc_clean(cfg="cfail3")]
137137
pub fn change_argument_method_ufcs() {
138138
let s = Struct;
@@ -149,7 +149,7 @@ pub fn change_to_ufcs() {
149149
}
150150

151151
#[cfg(not(cfail1))]
152-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
152+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized,TypeckTables")]
153153
#[rustc_clean(cfg="cfail3")]
154154
// One might think this would be expanded in the HirBody/Mir, but it actually
155155
// results in slightly different Hir/Mir.
@@ -171,7 +171,7 @@ pub mod change_ufcs_callee_indirectly {
171171
#[cfg(not(cfail1))]
172172
use super::Struct2 as Struct;
173173

174-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
174+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized,TypeckTables")]
175175
#[rustc_clean(cfg="cfail3")]
176176

177177

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub fn add_parameter() {
3737
}
3838

3939
#[cfg(not(cfail1))]
40-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized, TypeckTables")]
40+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized, TypeckTables")]
4141
#[rustc_clean(cfg="cfail3")]
4242
pub fn add_parameter() {
4343
let x = 0u32;
@@ -53,7 +53,7 @@ pub fn change_parameter_pattern() {
5353
}
5454

5555
#[cfg(not(cfail1))]
56-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, TypeckTables")]
56+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, TypeckTables")]
5757
#[rustc_clean(cfg="cfail3")]
5858
pub fn change_parameter_pattern() {
5959
let _ = |&x: &u32| x;
@@ -84,7 +84,7 @@ pub fn add_type_ascription_to_parameter() {
8484
}
8585

8686
#[cfg(not(cfail1))]
87-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, TypeckTables")]
87+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, TypeckTables")]
8888
#[rustc_clean(cfg="cfail3")]
8989
pub fn add_type_ascription_to_parameter() {
9090
let closure = |x: u32| x + 1u32;
@@ -101,7 +101,7 @@ pub fn change_parameter_type() {
101101
}
102102

103103
#[cfg(not(cfail1))]
104-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized, TypeckTables")]
104+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized, TypeckTables")]
105105
#[rustc_clean(cfg="cfail3")]
106106
pub fn change_parameter_type() {
107107
let closure = |x: u16| (x as u64) + 1;

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub fn change_field_value_struct_like() -> Enum {
3434
}
3535

3636
#[cfg(not(cfail1))]
37-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
37+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
3838
#[rustc_clean(cfg="cfail3")]
3939
pub fn change_field_value_struct_like() -> Enum {
4040
Enum::Struct {
@@ -96,7 +96,7 @@ pub fn change_constructor_path_struct_like() {
9696
}
9797

9898
#[cfg(not(cfail1))]
99-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated,TypeckTables")]
99+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt,TypeckTables")]
100100
#[rustc_clean(cfg="cfail3")]
101101
pub fn change_constructor_path_struct_like() {
102102
let _ = Enum2::Struct {
@@ -119,7 +119,7 @@ pub fn change_constructor_variant_struct_like() {
119119
}
120120

121121
#[cfg(not(cfail1))]
122-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
122+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
123123
#[rustc_clean(cfg="cfail3")]
124124
pub fn change_constructor_variant_struct_like() {
125125
let _ = Enum2::Struct2 {
@@ -139,7 +139,7 @@ pub mod change_constructor_path_indirectly_struct_like {
139139

140140
#[rustc_clean(
141141
cfg="cfail2",
142-
except="FnSignature,Hir,HirBody,MirOptimized,MirValidated,\
142+
except="FnSignature,Hir,HirBody,MirOptimized,MirBuilt,\
143143
TypeckTables"
144144
)]
145145
#[rustc_clean(cfg="cfail3")]
@@ -161,7 +161,7 @@ pub mod change_constructor_variant_indirectly_struct_like {
161161
#[cfg(not(cfail1))]
162162
use super::Enum2::Struct2 as Variant;
163163

164-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
164+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
165165
#[rustc_clean(cfg="cfail3")]
166166
pub fn function() -> Enum2 {
167167
Variant {
@@ -180,7 +180,7 @@ pub fn change_field_value_tuple_like() -> Enum {
180180
}
181181

182182
#[cfg(not(cfail1))]
183-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
183+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
184184
#[rustc_clean(cfg="cfail3")]
185185
pub fn change_field_value_tuple_like() -> Enum {
186186
Enum::Tuple(0, 1, 3)
@@ -197,7 +197,7 @@ pub fn change_constructor_path_tuple_like() {
197197
#[cfg(not(cfail1))]
198198
#[rustc_clean(
199199
cfg="cfail2",
200-
except="HirBody,MirOptimized,MirValidated,TypeckTables"
200+
except="HirBody,MirOptimized,MirBuilt,TypeckTables"
201201
)]
202202
#[rustc_clean(cfg="cfail3")]
203203
pub fn change_constructor_path_tuple_like() {
@@ -215,7 +215,7 @@ pub fn change_constructor_variant_tuple_like() {
215215
#[cfg(not(cfail1))]
216216
#[rustc_clean(
217217
cfg="cfail2",
218-
except="HirBody,MirOptimized,MirValidated,TypeckTables"
218+
except="HirBody,MirOptimized,MirBuilt,TypeckTables"
219219
)]
220220
#[rustc_clean(cfg="cfail3")]
221221
pub fn change_constructor_variant_tuple_like() {
@@ -232,7 +232,7 @@ pub mod change_constructor_path_indirectly_tuple_like {
232232

233233
#[rustc_clean(
234234
cfg="cfail2",
235-
except="FnSignature,Hir,HirBody,MirOptimized,MirValidated,\
235+
except="FnSignature,Hir,HirBody,MirOptimized,MirBuilt,\
236236
TypeckTables"
237237
)]
238238
#[rustc_clean(cfg="cfail3")]
@@ -251,7 +251,7 @@ pub mod change_constructor_variant_indirectly_tuple_like {
251251
#[cfg(not(cfail1))]
252252
use super::Enum2::Tuple2 as Variant;
253253

254-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated,TypeckTables")]
254+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt,TypeckTables")]
255255
#[rustc_clean(cfg="cfail3")]
256256
pub fn function() -> Enum2 {
257257
Variant(0, 1, 2)
@@ -278,7 +278,7 @@ pub fn change_constructor_path_c_like() {
278278
}
279279

280280
#[cfg(not(cfail1))]
281-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated,TypeckTables")]
281+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt,TypeckTables")]
282282
#[rustc_clean(cfg="cfail3")]
283283
pub fn change_constructor_path_c_like() {
284284
let _ = Clike2::B;
@@ -293,7 +293,7 @@ pub fn change_constructor_variant_c_like() {
293293
}
294294

295295
#[cfg(not(cfail1))]
296-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
296+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
297297
#[rustc_clean(cfg="cfail3")]
298298
pub fn change_constructor_variant_c_like() {
299299
let _ = Clike::C;
@@ -309,7 +309,7 @@ pub mod change_constructor_path_indirectly_c_like {
309309

310310
#[rustc_clean(
311311
cfg="cfail2",
312-
except="FnSignature,Hir,HirBody,MirOptimized,MirValidated,\
312+
except="FnSignature,Hir,HirBody,MirOptimized,MirBuilt,\
313313
TypeckTables"
314314
)]
315315
#[rustc_clean(cfg="cfail3")]
@@ -328,7 +328,7 @@ pub mod change_constructor_variant_indirectly_c_like {
328328
#[cfg(not(cfail1))]
329329
use super::Clike::B as Variant;
330330

331-
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirValidated")]
331+
#[rustc_clean(cfg="cfail2", except="HirBody,MirOptimized,MirBuilt")]
332332
#[rustc_clean(cfg="cfail3")]
333333
pub fn function() -> Clike {
334334
Variant

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn body_not_exported_to_metadata() -> u32 {
1616
}
1717

1818
#[cfg(not(cfail1))]
19-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
19+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
2020
#[rustc_clean(cfg="cfail3")]
2121
pub fn body_not_exported_to_metadata() -> u32 {
2222
2
@@ -35,7 +35,7 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 {
3535
}
3636

3737
#[cfg(not(cfail1))]
38-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
38+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
3939
#[rustc_clean(cfg="cfail3")]
4040
#[inline]
4141
pub fn body_exported_to_metadata_because_of_inline() -> u32 {
@@ -55,7 +55,7 @@ pub fn body_exported_to_metadata_because_of_generic() -> u32 {
5555
}
5656

5757
#[cfg(not(cfail1))]
58-
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
58+
#[rustc_clean(cfg="cfail2", except="HirBody,MirBuilt,MirOptimized")]
5959
#[rustc_clean(cfg="cfail3")]
6060
#[inline]
6161
pub fn body_exported_to_metadata_because_of_generic() -> u32 {

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ pub fn change_loop_body() {
2525
}
2626

2727
#[cfg(not(cfail1))]
28-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
28+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
2929
#[rustc_clean(cfg="cfail3")]
3030
pub fn change_loop_body() {
3131
let mut _x = 0;
@@ -48,7 +48,7 @@ pub fn change_iteration_variable_name() {
4848
}
4949

5050
#[cfg(not(cfail1))]
51-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
51+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
5252
#[rustc_clean(cfg="cfail3")]
5353
pub fn change_iteration_variable_name() {
5454
let mut _x = 0;
@@ -71,7 +71,7 @@ pub fn change_iteration_variable_pattern() {
7171
}
7272

7373
#[cfg(not(cfail1))]
74-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized, TypeckTables")]
74+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized, TypeckTables")]
7575
#[rustc_clean(cfg="cfail3")]
7676
pub fn change_iteration_variable_pattern() {
7777
let mut _x = 0;
@@ -94,7 +94,7 @@ pub fn change_iterable() {
9494
}
9595

9696
#[cfg(not(cfail1))]
97-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
97+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
9898
#[rustc_clean(cfg="cfail3")]
9999
pub fn change_iterable() {
100100
let mut _x = 0;
@@ -116,7 +116,7 @@ pub fn add_break() {
116116
}
117117

118118
#[cfg(not(cfail1))]
119-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized, TypeckTables")]
119+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized, TypeckTables")]
120120
#[rustc_clean(cfg="cfail3")]
121121
pub fn add_break() {
122122
let mut _x = 0;
@@ -187,7 +187,7 @@ pub fn change_break_label() {
187187
}
188188

189189
#[cfg(not(cfail1))]
190-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
190+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
191191
#[rustc_clean(cfg="cfail3")]
192192
pub fn change_break_label() {
193193
let mut _x = 0;
@@ -237,7 +237,7 @@ pub fn change_continue_label() {
237237
}
238238

239239
#[cfg(not(cfail1))]
240-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
240+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
241241
#[rustc_clean(cfg="cfail3")]
242242
pub fn change_continue_label() {
243243
let mut _x = 0;
@@ -262,7 +262,7 @@ pub fn change_continue_to_break() {
262262
}
263263

264264
#[cfg(not(cfail1))]
265-
#[rustc_clean(cfg="cfail2", except="HirBody, MirValidated, MirOptimized")]
265+
#[rustc_clean(cfg="cfail2", except="HirBody, MirBuilt, MirOptimized")]
266266
#[rustc_clean(cfg="cfail3")]
267267
pub fn change_continue_to_break() {
268268
let mut _x = 0;

0 commit comments

Comments
 (0)