Skip to content

Commit 26c75df

Browse files
zetanumberszetanumbers
committed
Rename typeck into typeck_root in tests/ui
1 parent 94ed03a commit 26c75df

15 files changed

Lines changed: 64 additions & 64 deletions

‎tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ mod x {
2626
mod y {
2727
use crate::Foo;
2828

29-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
29+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
3030
pub fn use_char_assoc() {
3131
// Careful here: in the representation, <char as Foo>::T gets
3232
// normalized away, so at a certain point we had no edge to

‎tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error: OK
22
--> $DIR/dep-graph-assoc-type-codegen.rs:29:34
33
|
4-
LL | #[rustc_then_this_would_need(typeck)]
5-
| ^^^^^^
4+
LL | #[rustc_then_this_would_need(typeck_root)]
5+
| ^^^^^^^^^^^
66

77
error: aborting due to 1 previous error
88

‎tests/ui/dep-graph/dep-graph-caller-callee.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mod y {
1818
use crate::x;
1919

2020
// These dependencies SHOULD exist:
21-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
21+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
2222
pub fn y() {
2323
x::x();
2424
}
@@ -29,7 +29,7 @@ mod z {
2929

3030
// These are expected to yield errors, because changes to `x`
3131
// affect the BODY of `y`, but not its signature.
32-
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
32+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
3333
pub fn z() {
3434
y::y();
3535
}

‎tests/ui/dep-graph/dep-graph-caller-callee.stderr‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error: OK
22
--> $DIR/dep-graph-caller-callee.rs:21:34
33
|
4-
LL | #[rustc_then_this_would_need(typeck)]
5-
| ^^^^^^
4+
LL | #[rustc_then_this_would_need(typeck_root)]
5+
| ^^^^^^^^^^^
66

7-
error: no path from `x` to `typeck`
7+
error: no path from `x` to `typeck_root`
88
--> $DIR/dep-graph-caller-callee.rs:32:34
99
|
10-
LL | #[rustc_then_this_would_need(typeck)]
11-
| ^^^^^^
10+
LL | #[rustc_then_this_would_need(typeck_root)]
11+
| ^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
1414

‎tests/ui/dep-graph/dep-graph-struct-signature.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@ mod signatures {
3434
}
3535

3636
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
37-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
37+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
3838
fn some_fn(x: WillChange) { }
3939

4040
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
41-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
41+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
4242
fn new_foo(x: u32, y: u32) -> WillChange {
4343
WillChange { x: x, y: y }
4444
}
4545

4646
#[rustc_then_this_would_need(type_of)] //~ ERROR OK
4747
impl WillChange {
4848
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
49-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
49+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
5050
fn new(x: u32, y: u32) -> WillChange { loop { } }
5151
}
5252

5353
#[rustc_then_this_would_need(type_of)] //~ ERROR OK
5454
impl WillChange {
5555
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
56-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
56+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
5757
fn method(&self, x: u32) { }
5858
}
5959

@@ -82,6 +82,6 @@ mod invalid_signatures {
8282
fn b(x: WontChange) { }
8383

8484
#[rustc_then_this_would_need(fn_sig)] //~ ERROR no path from `WillChange`
85-
#[rustc_then_this_would_need(typeck)] //~ ERROR no path from `WillChange`
85+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path from `WillChange`
8686
fn c(x: u32) { }
8787
}

‎tests/ui/dep-graph/dep-graph-struct-signature.stderr‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
2525
error: OK
2626
--> $DIR/dep-graph-struct-signature.rs:37:34
2727
|
28-
LL | #[rustc_then_this_would_need(typeck)]
29-
| ^^^^^^
28+
LL | #[rustc_then_this_would_need(typeck_root)]
29+
| ^^^^^^^^^^^
3030

3131
error: OK
3232
--> $DIR/dep-graph-struct-signature.rs:40:34
@@ -37,8 +37,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
3737
error: OK
3838
--> $DIR/dep-graph-struct-signature.rs:41:34
3939
|
40-
LL | #[rustc_then_this_would_need(typeck)]
41-
| ^^^^^^
40+
LL | #[rustc_then_this_would_need(typeck_root)]
41+
| ^^^^^^^^^^^
4242

4343
error: OK
4444
--> $DIR/dep-graph-struct-signature.rs:46:34
@@ -88,11 +88,11 @@ error: no path from `WillChange` to `fn_sig`
8888
LL | #[rustc_then_this_would_need(fn_sig)]
8989
| ^^^^^^
9090

91-
error: no path from `WillChange` to `typeck`
91+
error: no path from `WillChange` to `typeck_root`
9292
--> $DIR/dep-graph-struct-signature.rs:85:34
9393
|
94-
LL | #[rustc_then_this_would_need(typeck)]
95-
| ^^^^^^
94+
LL | #[rustc_then_this_would_need(typeck_root)]
95+
| ^^^^^^^^^^^
9696

9797
error: OK
9898
--> $DIR/dep-graph-struct-signature.rs:32:38
@@ -115,8 +115,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
115115
error: OK
116116
--> $DIR/dep-graph-struct-signature.rs:49:38
117117
|
118-
LL | #[rustc_then_this_would_need(typeck)]
119-
| ^^^^^^
118+
LL | #[rustc_then_this_would_need(typeck_root)]
119+
| ^^^^^^^^^^^
120120

121121
error: OK
122122
--> $DIR/dep-graph-struct-signature.rs:55:38
@@ -127,8 +127,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
127127
error: OK
128128
--> $DIR/dep-graph-struct-signature.rs:56:38
129129
|
130-
LL | #[rustc_then_this_would_need(typeck)]
131-
| ^^^^^^
130+
LL | #[rustc_then_this_would_need(typeck_root)]
131+
| ^^^^^^^^^^^
132132

133133
error: aborting due to 22 previous errors
134134

‎tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ mod x {
3030
mod y {
3131
use crate::{Foo, Bar};
3232

33-
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
33+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
3434
pub fn with_char() {
3535
char::method('a');
3636
}
@@ -39,7 +39,7 @@ mod y {
3939
mod z {
4040
use crate::y;
4141

42-
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
42+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
4343
pub fn z() {
4444
y::with_char();
4545
}

‎tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
error: OK
22
--> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:33:34
33
|
4-
LL | #[rustc_then_this_would_need(typeck)]
5-
| ^^^^^^
4+
LL | #[rustc_then_this_would_need(typeck_root)]
5+
| ^^^^^^^^^^^
66

7-
error: no path from `x::<impl Foo for u32>` to `typeck`
7+
error: no path from `x::<impl Foo for u32>` to `typeck_root`
88
--> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:42:34
99
|
10-
LL | #[rustc_then_this_would_need(typeck)]
11-
| ^^^^^^
10+
LL | #[rustc_then_this_would_need(typeck_root)]
11+
| ^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
1414

‎tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ mod x {
2929
mod y {
3030
use crate::{Foo, Bar};
3131

32-
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
32+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
3333
pub fn call_bar() {
3434
char::bar('a');
3535
}
@@ -38,7 +38,7 @@ mod y {
3838
mod z {
3939
use crate::y;
4040

41-
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
41+
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
4242
pub fn z() {
4343
y::call_bar();
4444
}

‎tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
error: no path from `x::<impl Foo for char>` to `typeck`
1+
error: no path from `x::<impl Foo for char>` to `typeck_root`
22
--> $DIR/dep-graph-trait-impl-two-traits.rs:32:34
33
|
4-
LL | #[rustc_then_this_would_need(typeck)]
5-
| ^^^^^^
4+
LL | #[rustc_then_this_would_need(typeck_root)]
5+
| ^^^^^^^^^^^
66

7-
error: no path from `x::<impl Foo for char>` to `typeck`
7+
error: no path from `x::<impl Foo for char>` to `typeck_root`
88
--> $DIR/dep-graph-trait-impl-two-traits.rs:41:34
99
|
10-
LL | #[rustc_then_this_would_need(typeck)]
11-
| ^^^^^^
10+
LL | #[rustc_then_this_would_need(typeck_root)]
11+
| ^^^^^^^^^^^
1212

1313
error: aborting due to 2 previous errors
1414

0 commit comments

Comments
 (0)