From 26c75dfccf8e102c00067897dcac4864b22656e6 Mon Sep 17 00:00:00 2001 From: Daria Sukhonina Date: Wed, 25 Mar 2026 11:56:49 +0300 Subject: [PATCH] Rename typeck into typeck_root in tests/ui --- .../dep-graph/dep-graph-assoc-type-codegen.rs | 2 +- .../dep-graph-assoc-type-codegen.stderr | 4 ++-- tests/ui/dep-graph/dep-graph-caller-callee.rs | 4 ++-- .../dep-graph/dep-graph-caller-callee.stderr | 10 ++++----- .../dep-graph/dep-graph-struct-signature.rs | 10 ++++----- .../dep-graph-struct-signature.stderr | 22 +++++++++---------- ...graph-trait-impl-two-traits-same-method.rs | 4 ++-- ...h-trait-impl-two-traits-same-method.stderr | 10 ++++----- .../dep-graph-trait-impl-two-traits.rs | 4 ++-- .../dep-graph-trait-impl-two-traits.stderr | 12 +++++----- tests/ui/dep-graph/dep-graph-trait-impl.rs | 10 ++++----- .../ui/dep-graph/dep-graph-trait-impl.stderr | 22 +++++++++---------- tests/ui/dep-graph/dep-graph-type-alias.rs | 4 ++-- .../ui/dep-graph/dep-graph-type-alias.stderr | 8 +++---- tests/ui/track-diagnostics/track.stderr | 2 +- 15 files changed, 64 insertions(+), 64 deletions(-) diff --git a/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs index e04975f9c99b..8b87499966de 100644 --- a/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs +++ b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.rs @@ -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, ::T gets // normalized away, so at a certain point we had no edge to diff --git a/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr index b0372051f026..1a56d3181884 100644 --- a/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr +++ b/tests/ui/dep-graph/dep-graph-assoc-type-codegen.stderr @@ -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 diff --git a/tests/ui/dep-graph/dep-graph-caller-callee.rs b/tests/ui/dep-graph/dep-graph-caller-callee.rs index df959a93c9c2..43d10cd57cdb 100644 --- a/tests/ui/dep-graph/dep-graph-caller-callee.rs +++ b/tests/ui/dep-graph/dep-graph-caller-callee.rs @@ -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(); } diff --git a/tests/ui/dep-graph/dep-graph-caller-callee.stderr b/tests/ui/dep-graph/dep-graph-caller-callee.stderr index 33fe91b3500a..379e23fc9a27 100644 --- a/tests/ui/dep-graph/dep-graph-caller-callee.stderr +++ b/tests/ui/dep-graph/dep-graph-caller-callee.stderr @@ -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 diff --git a/tests/ui/dep-graph/dep-graph-struct-signature.rs b/tests/ui/dep-graph/dep-graph-struct-signature.rs index 080a1b5c583d..abef7d2e9884 100644 --- a/tests/ui/dep-graph/dep-graph-struct-signature.rs +++ b/tests/ui/dep-graph/dep-graph-struct-signature.rs @@ -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) { } } diff --git a/tests/ui/dep-graph/dep-graph-struct-signature.stderr b/tests/ui/dep-graph/dep-graph-struct-signature.stderr index 98efedc7244c..24d35b87820d 100644 --- a/tests/ui/dep-graph/dep-graph-struct-signature.stderr +++ b/tests/ui/dep-graph/dep-graph-struct-signature.stderr @@ -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 diff --git a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs index 397a8c6a39d4..ccdd2ff570f6 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs +++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.rs @@ -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(); } diff --git a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr index 293f918a3187..9802d5acce18 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr +++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits-same-method.stderr @@ -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::` to `typeck` +error: no path from `x::` 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 diff --git a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs index 859505a4a7a1..c86923c0468b 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs +++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.rs @@ -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(); } diff --git a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr index 46cb0e9ea86f..7d7ff0543cb3 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr +++ b/tests/ui/dep-graph/dep-graph-trait-impl-two-traits.stderr @@ -1,14 +1,14 @@ -error: no path from `x::` to `typeck` +error: no path from `x::` 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::` to `typeck` +error: no path from `x::` 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 diff --git a/tests/ui/dep-graph/dep-graph-trait-impl.rs b/tests/ui/dep-graph/dep-graph-trait-impl.rs index 80925ddfe0c0..952ccf61c7d5 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl.rs +++ b/tests/ui/dep-graph/dep-graph-trait-impl.rs @@ -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::('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::(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(); diff --git a/tests/ui/dep-graph/dep-graph-trait-impl.stderr b/tests/ui/dep-graph/dep-graph-trait-impl.stderr index a5fce64c3a1c..8a205feb774b 100644 --- a/tests/ui/dep-graph/dep-graph-trait-impl.stderr +++ b/tests/ui/dep-graph/dep-graph-trait-impl.stderr @@ -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::` to `typeck` +error: no path from `x::` 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 diff --git a/tests/ui/dep-graph/dep-graph-type-alias.rs b/tests/ui/dep-graph/dep-graph-type-alias.rs index 1796ebda1fc7..8d0407a74ca8 100644 --- a/tests/ui/dep-graph/dep-graph-type-alias.rs +++ b/tests/ui/dep-graph/dep-graph-type-alias.rs @@ -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) { } diff --git a/tests/ui/dep-graph/dep-graph-type-alias.stderr b/tests/ui/dep-graph/dep-graph-type-alias.stderr index 9f24c1113b98..63312a5f249d 100644 --- a/tests/ui/dep-graph/dep-graph-type-alias.stderr +++ b/tests/ui/dep-graph/dep-graph-type-alias.stderr @@ -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 diff --git a/tests/ui/track-diagnostics/track.stderr b/tests/ui/track-diagnostics/track.stderr index ba314c14b37e..9ac567436939 100644 --- a/tests/ui/track-diagnostics/track.stderr +++ b/tests/ui/track-diagnostics/track.stderr @@ -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