Skip to content

Commit 5cf7376

Browse files
zetanumberszetanumbers
committed
Rename typeck into typeck_root in tests/incremental
1 parent 26c75df commit 5cf7376

35 files changed

Lines changed: 231 additions & 231 deletions

‎tests/incremental/callee_caller_cross_crate/b.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
extern crate a;
99

10-
#[rustc_clean(except="typeck", cfg="rpass2")]
10+
#[rustc_clean(except="typeck_root", cfg="rpass2")]
1111
pub fn call_function0() {
1212
a::function0(77);
1313
}

‎tests/incremental/change_add_field/struct_point.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ pub mod point {
7070
pub mod fn_with_type_in_sig {
7171
use point::Point;
7272

73-
#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="cfail2")]
73+
#[rustc_clean(except="typeck_root,fn_sig,optimized_mir", cfg="cfail2")]
7474
pub fn boop(p: Option<&Point>) -> f32 {
7575
p.map(|p| p.total()).unwrap_or(0.0)
7676
}
@@ -86,7 +86,7 @@ pub mod fn_with_type_in_sig {
8686
pub mod call_fn_with_type_in_sig {
8787
use fn_with_type_in_sig;
8888

89-
#[rustc_clean(except="typeck,optimized_mir", cfg="cfail2")]
89+
#[rustc_clean(except="typeck_root,optimized_mir", cfg="cfail2")]
9090
pub fn bip() -> f32 {
9191
fn_with_type_in_sig::boop(None)
9292
}
@@ -102,7 +102,7 @@ pub mod call_fn_with_type_in_sig {
102102
pub mod fn_with_type_in_body {
103103
use point::Point;
104104

105-
#[rustc_clean(except="typeck,optimized_mir", cfg="cfail2")]
105+
#[rustc_clean(except="typeck_root,optimized_mir", cfg="cfail2")]
106106
pub fn boop() -> f32 {
107107
Point::origin().total()
108108
}
@@ -125,7 +125,7 @@ pub mod call_fn_with_type_in_body {
125125
pub mod fn_make_struct {
126126
use point::Point;
127127

128-
#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="cfail2")]
128+
#[rustc_clean(except="typeck_root,fn_sig,optimized_mir", cfg="cfail2")]
129129
pub fn make_origin(p: Point) -> Point {
130130
Point { ..p }
131131
}
@@ -135,7 +135,7 @@ pub mod fn_make_struct {
135135
pub mod fn_read_field {
136136
use point::Point;
137137

138-
#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="cfail2")]
138+
#[rustc_clean(except="typeck_root,fn_sig,optimized_mir", cfg="cfail2")]
139139
pub fn get_x(p: Point) -> f32 {
140140
p.x
141141
}
@@ -145,7 +145,7 @@ pub mod fn_read_field {
145145
pub mod fn_write_field {
146146
use point::Point;
147147

148-
#[rustc_clean(except="typeck,fn_sig,optimized_mir", cfg="cfail2")]
148+
#[rustc_clean(except="typeck_root,fn_sig,optimized_mir", cfg="cfail2")]
149149
pub fn inc_x(p: &mut Point) {
150150
p.x += 1.0;
151151
}

‎tests/incremental/change_crate_order/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extern crate a;
1919
use a::A;
2020
use b::B;
2121

22-
//? #[rustc_clean(label="typeck", cfg="rpass2")]
22+
//? #[rustc_clean(label="typeck_root", cfg="rpass2")]
2323
pub fn main() {
2424
A + B;
2525
}

‎tests/incremental/change_private_fn/struct_point.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ pub mod fn_calls_methods_in_same_impl {
5454
// The cached result should actually be loaded from disk
5555
// (not just marked green) - for example, `DeadVisitor`
5656
// always runs during compilation as a "pass", and loads
57-
// the typeck results for bodies.
58-
#[rustc_clean(cfg="cfail2", loaded_from_disk="typeck")]
57+
// the typeck_root results for bodies.
58+
#[rustc_clean(cfg="cfail2", loaded_from_disk="typeck_root")]
5959
pub fn check() {
6060
let x = Point { x: 2.0, y: 2.0 };
6161
x.distance_from_origin();

‎tests/incremental/change_pub_inherent_method_sig/struct_point.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ pub mod point {
5252
pub mod fn_calls_changed_method {
5353
use point::Point;
5454

55-
#[rustc_clean(except="typeck,optimized_mir", cfg="cfail2")]
55+
#[rustc_clean(except="typeck_root,optimized_mir", cfg="cfail2")]
5656
pub fn check() {
5757
let p = Point { x: 2.0, y: 2.0 };
5858
p.distance_from_point(None);

‎tests/incremental/clean.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ mod y {
3636
//[cfail2]~| ERROR `predicates_of(y)` should be dirty but is not
3737
//[cfail2]~| ERROR `type_of(y)` should be dirty but is not
3838
//[cfail2]~| ERROR `fn_sig(y)` should be dirty but is not
39-
//[cfail2]~| ERROR `typeck(y)` should be clean but is not
39+
//[cfail2]~| ERROR `typeck_root(y)` should be clean but is not
4040
x::x();
4141
}
4242
}
4343

4444
mod z {
45-
#[rustc_clean(except="typeck", cfg="cfail2")]
45+
#[rustc_clean(except="typeck_root", cfg="cfail2")]
4646
pub fn z() {
47-
//[cfail2]~^ ERROR `typeck(z)` should be dirty but is not
47+
//[cfail2]~^ ERROR `typeck_root(z)` should be dirty but is not
4848
}
4949
}

‎tests/incremental/hashes/call_expressions.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ pub fn change_callee_function() {
2929
}
3030

3131
#[cfg(not(any(cfail1,cfail4)))]
32-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
32+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
3333
#[rustc_clean(cfg="cfail3")]
34-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
34+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
3535
#[rustc_clean(cfg="cfail6")]
3636
pub fn change_callee_function() {
3737
callee2(1, 2)
@@ -63,9 +63,9 @@ mod change_callee_indirectly_function {
6363
#[cfg(not(any(cfail1,cfail4)))]
6464
use super::callee2 as callee;
6565

66-
#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail2")]
66+
#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="cfail2")]
6767
#[rustc_clean(cfg="cfail3")]
68-
#[rustc_clean(except="opt_hir_owner_nodes,typeck", cfg="cfail5")]
68+
#[rustc_clean(except="opt_hir_owner_nodes,typeck_root", cfg="cfail5")]
6969
#[rustc_clean(cfg="cfail6")]
7070
pub fn change_callee_indirectly_function() {
7171
callee(1, 2)
@@ -87,9 +87,9 @@ pub fn change_callee_method() {
8787
}
8888

8989
#[cfg(not(any(cfail1,cfail4)))]
90-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
90+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
9191
#[rustc_clean(cfg="cfail3")]
92-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
92+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
9393
#[rustc_clean(cfg="cfail6")]
9494
pub fn change_callee_method() {
9595
let s = Struct;
@@ -125,9 +125,9 @@ pub fn change_ufcs_callee_method() {
125125
}
126126

127127
#[cfg(not(any(cfail1,cfail4)))]
128-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
128+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
129129
#[rustc_clean(cfg="cfail3")]
130-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
130+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
131131
#[rustc_clean(cfg="cfail6")]
132132
pub fn change_ufcs_callee_method() {
133133
let s = Struct;
@@ -163,9 +163,9 @@ pub fn change_to_ufcs() {
163163
}
164164

165165
#[cfg(not(any(cfail1,cfail4)))]
166-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
166+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
167167
#[rustc_clean(cfg="cfail3")]
168-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
168+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
169169
#[rustc_clean(cfg="cfail6")]
170170
// One might think this would be expanded in the opt_hir_owner_nodes/Mir, but it actually
171171
// results in slightly different hir_owner/Mir.
@@ -187,9 +187,9 @@ pub mod change_ufcs_callee_indirectly {
187187
#[cfg(not(any(cfail1,cfail4)))]
188188
use super::Struct2 as Struct;
189189

190-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
190+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
191191
#[rustc_clean(cfg="cfail3")]
192-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
192+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
193193
#[rustc_clean(cfg="cfail6")]
194194
pub fn change_ufcs_callee_indirectly() {
195195
let s = Struct;

‎tests/incremental/hashes/closure_expressions.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ pub fn add_parameter() {
4343
}
4444

4545
#[cfg(not(any(cfail1,cfail4)))]
46-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, typeck")]
46+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, typeck_root")]
4747
#[rustc_clean(cfg="cfail3")]
48-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, typeck")]
48+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, typeck_root")]
4949
#[rustc_clean(cfg="cfail6")]
5050
pub fn add_parameter() {
5151
let x = 0u32;
@@ -61,9 +61,9 @@ pub fn change_parameter_pattern() {
6161
}
6262

6363
#[cfg(not(any(cfail1,cfail4)))]
64-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, typeck")]
64+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, typeck_root")]
6565
#[rustc_clean(cfg="cfail3")]
66-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, typeck")]
66+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, typeck_root")]
6767
#[rustc_clean(cfg="cfail6")]
6868
pub fn change_parameter_pattern() {
6969
let _ = |(x,): (u32,)| x;
@@ -96,9 +96,9 @@ pub fn add_type_ascription_to_parameter() {
9696
}
9797

9898
#[cfg(not(any(cfail1,cfail4)))]
99-
#[rustc_clean(cfg = "cfail2", except = "opt_hir_owner_nodes, typeck")]
99+
#[rustc_clean(cfg = "cfail2", except = "opt_hir_owner_nodes, typeck_root")]
100100
#[rustc_clean(cfg = "cfail3")]
101-
#[rustc_clean(cfg = "cfail5", except = "opt_hir_owner_nodes, typeck")]
101+
#[rustc_clean(cfg = "cfail5", except = "opt_hir_owner_nodes, typeck_root")]
102102
#[rustc_clean(cfg = "cfail6")]
103103
pub fn add_type_ascription_to_parameter() {
104104
let closure = |x: u32| x + 1u32;
@@ -115,9 +115,9 @@ pub fn change_parameter_type() {
115115
}
116116

117117
#[cfg(not(any(cfail1,cfail4)))]
118-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck")]
118+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
119119
#[rustc_clean(cfg="cfail3")]
120-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck")]
120+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
121121
#[rustc_clean(cfg="cfail6")]
122122
pub fn change_parameter_type() {
123123
let closure = |x: u16| (x as u64) + 1;

‎tests/incremental/hashes/enum_constructors.rs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ pub fn change_field_order_struct_like() -> Enum {
6363
}
6464

6565
#[cfg(not(any(cfail1,cfail4)))]
66-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
66+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck_root")]
6767
#[rustc_clean(cfg="cfail3")]
68-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
68+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck_root")]
6969
#[rustc_clean(cfg="cfail6")]
7070
// FIXME(michaelwoerister):Interesting. I would have thought that that changes the MIR. And it
7171
// would if it were not all constants
@@ -104,9 +104,9 @@ pub fn change_constructor_path_struct_like() {
104104
}
105105

106106
#[cfg(not(any(cfail1,cfail4)))]
107-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck")]
107+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,typeck_root")]
108108
#[rustc_clean(cfg="cfail3")]
109-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck")]
109+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,typeck_root")]
110110
#[rustc_clean(cfg="cfail6")]
111111
pub fn change_constructor_path_struct_like() {
112112
let _ = Enum2::Struct {
@@ -149,9 +149,9 @@ pub mod change_constructor_path_indirectly_struct_like {
149149
#[cfg(not(any(cfail1,cfail4)))]
150150
use super::Enum2 as TheEnum;
151151

152-
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
152+
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
153153
#[rustc_clean(cfg="cfail3")]
154-
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
154+
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
155155
#[rustc_clean(cfg="cfail6")]
156156
pub fn function() -> TheEnum {
157157
TheEnum::Struct {
@@ -211,12 +211,12 @@ pub fn change_constructor_path_tuple_like() {
211211
#[cfg(not(any(cfail1,cfail4)))]
212212
#[rustc_clean(
213213
cfg="cfail2",
214-
except="opt_hir_owner_nodes,typeck"
214+
except="opt_hir_owner_nodes,typeck_root"
215215
)]
216216
#[rustc_clean(cfg="cfail3")]
217217
#[rustc_clean(
218218
cfg="cfail5",
219-
except="opt_hir_owner_nodes,typeck"
219+
except="opt_hir_owner_nodes,typeck_root"
220220
)]
221221
#[rustc_clean(cfg="cfail6")]
222222
pub fn change_constructor_path_tuple_like() {
@@ -234,12 +234,12 @@ pub fn change_constructor_variant_tuple_like() {
234234
#[cfg(not(any(cfail1,cfail4)))]
235235
#[rustc_clean(
236236
cfg="cfail2",
237-
except="opt_hir_owner_nodes,typeck"
237+
except="opt_hir_owner_nodes,typeck_root"
238238
)]
239239
#[rustc_clean(cfg="cfail3")]
240240
#[rustc_clean(
241241
cfg="cfail5",
242-
except="opt_hir_owner_nodes,typeck"
242+
except="opt_hir_owner_nodes,typeck_root"
243243
)]
244244
#[rustc_clean(cfg="cfail6")]
245245
pub fn change_constructor_variant_tuple_like() {
@@ -254,9 +254,9 @@ pub mod change_constructor_path_indirectly_tuple_like {
254254
#[cfg(not(any(cfail1,cfail4)))]
255255
use super::Enum2 as TheEnum;
256256

257-
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
257+
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
258258
#[rustc_clean(cfg="cfail3")]
259-
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
259+
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
260260
#[rustc_clean(cfg="cfail6")]
261261
pub fn function() -> TheEnum {
262262
TheEnum::Tuple(0, 1, 2)
@@ -273,9 +273,9 @@ pub mod change_constructor_variant_indirectly_tuple_like {
273273
#[cfg(not(any(cfail1,cfail4)))]
274274
use super::Enum2::Tuple2 as Variant;
275275

276-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
276+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
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,optimized_mir,typeck_root")]
279279
#[rustc_clean(cfg="cfail6")]
280280
pub fn function() -> Enum2 {
281281
Variant(0, 1, 2)
@@ -302,9 +302,9 @@ pub fn change_constructor_path_c_like() {
302302
}
303303

304304
#[cfg(not(any(cfail1,cfail4)))]
305-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck")]
305+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
306306
#[rustc_clean(cfg="cfail3")]
307-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck")]
307+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes,optimized_mir,typeck_root")]
308308
#[rustc_clean(cfg="cfail6")]
309309
pub fn change_constructor_path_c_like() {
310310
let _x = Clike2::B;
@@ -335,9 +335,9 @@ pub mod change_constructor_path_indirectly_c_like {
335335
#[cfg(not(any(cfail1,cfail4)))]
336336
use super::Clike2 as TheEnum;
337337

338-
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
338+
#[rustc_clean(cfg="cfail2", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
339339
#[rustc_clean(cfg="cfail3")]
340-
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck")]
340+
#[rustc_clean(cfg="cfail5", except="fn_sig,opt_hir_owner_nodes,optimized_mir,typeck_root")]
341341
#[rustc_clean(cfg="cfail6")]
342342
pub fn function() -> TheEnum {
343343
TheEnum::B

‎tests/incremental/hashes/for_loops.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,9 @@ pub fn change_iteration_variable_pattern() {
7979
}
8080

8181
#[cfg(not(any(cfail1,cfail4)))]
82-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck")]
82+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
8383
#[rustc_clean(cfg="cfail3")]
84-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck")]
84+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
8585
#[rustc_clean(cfg="cfail6")]
8686
pub fn change_iteration_variable_pattern() {
8787
let mut _x = 0;
@@ -129,9 +129,9 @@ pub fn add_break() {
129129
}
130130

131131
#[cfg(not(any(cfail1,cfail4)))]
132-
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck")]
132+
#[rustc_clean(cfg="cfail2", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
133133
#[rustc_clean(cfg="cfail3")]
134-
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck")]
134+
#[rustc_clean(cfg="cfail5", except="opt_hir_owner_nodes, optimized_mir, typeck_root")]
135135
#[rustc_clean(cfg="cfail6")]
136136
pub fn add_break() {
137137
let mut _x = 0;

0 commit comments

Comments
 (0)