mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
Rename typeck into typeck_root in tests/ui
This commit is contained in:
@@ -26,7 +26,7 @@ mod x {
|
||||
mod y {
|
||||
use crate::Foo;
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn use_char_assoc() {
|
||||
// Careful here: in the representation, <char as Foo>::T gets
|
||||
// normalized away, so at a certain point we had no edge to
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
error: OK
|
||||
--> $DIR/dep-graph-assoc-type-codegen.rs:29:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 1 previous error
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ mod y {
|
||||
use crate::x;
|
||||
|
||||
// These dependencies SHOULD exist:
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn y() {
|
||||
x::x();
|
||||
}
|
||||
@@ -29,7 +29,7 @@ mod z {
|
||||
|
||||
// These are expected to yield errors, because changes to `x`
|
||||
// affect the BODY of `y`, but not its signature.
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
|
||||
pub fn z() {
|
||||
y::y();
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
error: OK
|
||||
--> $DIR/dep-graph-caller-callee.rs:21:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: no path from `x` to `typeck`
|
||||
error: no path from `x` to `typeck_root`
|
||||
--> $DIR/dep-graph-caller-callee.rs:32:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
||||
@@ -34,11 +34,11 @@ trait Bar {
|
||||
}
|
||||
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn some_fn(x: WillChange) { }
|
||||
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn new_foo(x: u32, y: u32) -> WillChange {
|
||||
WillChange { x: x, y: y }
|
||||
}
|
||||
@@ -46,14 +46,14 @@ fn new_foo(x: u32, y: u32) -> WillChange {
|
||||
#[rustc_then_this_would_need(type_of)] //~ ERROR OK
|
||||
impl WillChange {
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn new(x: u32, y: u32) -> WillChange { loop { } }
|
||||
}
|
||||
|
||||
#[rustc_then_this_would_need(type_of)] //~ ERROR OK
|
||||
impl WillChange {
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn method(&self, x: u32) { }
|
||||
}
|
||||
|
||||
@@ -82,6 +82,6 @@ trait A {
|
||||
fn b(x: WontChange) { }
|
||||
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR no path from `WillChange`
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path from `WillChange`
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path from `WillChange`
|
||||
fn c(x: u32) { }
|
||||
}
|
||||
|
||||
@@ -25,8 +25,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:37:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:40:34
|
||||
@@ -37,8 +37,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:41:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:46:34
|
||||
@@ -88,11 +88,11 @@ error: no path from `WillChange` to `fn_sig`
|
||||
LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
| ^^^^^^
|
||||
|
||||
error: no path from `WillChange` to `typeck`
|
||||
error: no path from `WillChange` to `typeck_root`
|
||||
--> $DIR/dep-graph-struct-signature.rs:85:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:32:38
|
||||
@@ -115,8 +115,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:49:38
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:55:38
|
||||
@@ -127,8 +127,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-struct-signature.rs:56:38
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 22 previous errors
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ impl Bar for char { }
|
||||
mod y {
|
||||
use crate::{Foo, Bar};
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn with_char() {
|
||||
char::method('a');
|
||||
}
|
||||
@@ -39,7 +39,7 @@ pub fn with_char() {
|
||||
mod z {
|
||||
use crate::y;
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
|
||||
pub fn z() {
|
||||
y::with_char();
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
error: OK
|
||||
--> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:33:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: no path from `x::<impl Foo for u32>` to `typeck`
|
||||
error: no path from `x::<impl Foo for u32>` to `typeck_root`
|
||||
--> $DIR/dep-graph-trait-impl-two-traits-same-method.rs:42:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ impl Bar for char { }
|
||||
mod y {
|
||||
use crate::{Foo, Bar};
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
|
||||
pub fn call_bar() {
|
||||
char::bar('a');
|
||||
}
|
||||
@@ -38,7 +38,7 @@ pub fn call_bar() {
|
||||
mod z {
|
||||
use crate::y;
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
|
||||
pub fn z() {
|
||||
y::call_bar();
|
||||
}
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
error: no path from `x::<impl Foo for char>` to `typeck`
|
||||
error: no path from `x::<impl Foo for char>` to `typeck_root`
|
||||
--> $DIR/dep-graph-trait-impl-two-traits.rs:32:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: no path from `x::<impl Foo for char>` to `typeck`
|
||||
error: no path from `x::<impl Foo for char>` to `typeck_root`
|
||||
--> $DIR/dep-graph-trait-impl-two-traits.rs:41:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
|
||||
@@ -25,22 +25,22 @@ impl Foo for u32 { }
|
||||
mod y {
|
||||
use crate::Foo;
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn with_char() {
|
||||
char::method('a');
|
||||
}
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn take_foo_with_char() {
|
||||
take_foo::<char>('a');
|
||||
}
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn with_u32() {
|
||||
u32::method(22);
|
||||
}
|
||||
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
pub fn take_foo_with_u32() {
|
||||
take_foo::<u32>(22);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ mod z {
|
||||
|
||||
// These are expected to yield errors, because changes to `x`
|
||||
// affect the BODY of `y`, but not its signature.
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR no path
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR no path
|
||||
pub fn z() {
|
||||
y::with_char();
|
||||
y::with_u32();
|
||||
|
||||
@@ -1,32 +1,32 @@
|
||||
error: OK
|
||||
--> $DIR/dep-graph-trait-impl.rs:28:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-trait-impl.rs:33:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-trait-impl.rs:38:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-trait-impl.rs:43:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: no path from `x::<impl Foo for char>` to `typeck`
|
||||
error: no path from `x::<impl Foo for char>` to `typeck_root`
|
||||
--> $DIR/dep-graph-trait-impl.rs:56:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 5 previous errors
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ trait Trait {
|
||||
#[rustc_then_this_would_need(type_of)] //~ ERROR no path
|
||||
impl SomeType {
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn method(&self, _: TypeAlias) {}
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ fn method(&self, _: TypeAlias) {}
|
||||
type TypeAlias2 = TypeAlias;
|
||||
|
||||
#[rustc_then_this_would_need(fn_sig)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck)] //~ ERROR OK
|
||||
#[rustc_then_this_would_need(typeck_root)] //~ ERROR OK
|
||||
fn function(_: TypeAlias) {
|
||||
|
||||
}
|
||||
|
||||
@@ -49,8 +49,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-type-alias.rs:53:30
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: OK
|
||||
--> $DIR/dep-graph-type-alias.rs:36:34
|
||||
@@ -67,8 +67,8 @@ LL | #[rustc_then_this_would_need(fn_sig)]
|
||||
error: OK
|
||||
--> $DIR/dep-graph-type-alias.rs:45:34
|
||||
|
|
||||
LL | #[rustc_then_this_would_need(typeck)]
|
||||
| ^^^^^^
|
||||
LL | #[rustc_then_this_would_need(typeck_root)]
|
||||
| ^^^^^^^^^^^
|
||||
|
||||
error: aborting due to 12 previous errors
|
||||
|
||||
|
||||
@@ -40,7 +40,7 @@ note: rustc $VERSION running on $TARGET
|
||||
note: compiler flags: ... -Z ui-testing ... -Z track-diagnostics
|
||||
|
||||
query stack during panic:
|
||||
#0 [typeck] type-checking `main`
|
||||
#0 [typeck_root] type-checking `main`
|
||||
#1 [analysis] running analysis passes on crate `track`
|
||||
end of query stack
|
||||
error: aborting due to 3 previous errors
|
||||
|
||||
Reference in New Issue
Block a user