Updated some tests that may seem unrelated, due to the introduction of the "Trait" struct in std/mem/type_info.rs, which caused the tests to change their error messages, causing them to fail

izagawd · izagawd · commit f782c2f2e224 · 2026-01-18T08:51:23.000-04:00
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.not-diag-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.not-diag-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> $DIR/auxiliary/trait.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.only-debuginfo-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.only-debuginfo-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> $DIR/auxiliary/trait-debuginfo.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.only-diag-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.only-diag-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> remapped/errors/auxiliary/trait-diag.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.only-macro-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.only-macro-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> $DIR/auxiliary/trait-macro.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.with-debuginfo-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.with-debuginfo-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> $DIR/auxiliary/trait-debuginfo.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.with-diag-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.with-diag-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> remapped/errors/auxiliary/trait-diag.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/errors/remap-path-prefix-diagnostics.with-macro-in-deps.stderr b/tests/ui/errors/remap-path-prefix-diagnostics.with-macro-in-deps.stderr
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
    |
 LL | struct A;
    | ^^^^^^^^
-note: required by a bound in `Trait`
+note: required by a bound in `r#trait::Trait`
   --> $DIR/auxiliary/trait-macro.rs:LL:COL
    |
 LL | pub trait Trait: std::fmt::Display {}
diff --git a/tests/ui/privacy/private-inferred-type.rs b/tests/ui/privacy/private-inferred-type.rs
@@ -115,11 +115,11 @@ fn main() {
 
     m::m!();
 
-    m::leak_anon1(); //~ ERROR trait `Trait` is private
+    m::leak_anon1(); //~ ERROR trait `m::Trait` is private
     m::leak_anon2(); //~ ERROR type `Priv` is private
     m::leak_anon3(); //~ ERROR type `Priv` is private
 
-    m::leak_dyn1(); //~ ERROR trait `Trait` is private
+    m::leak_dyn1(); //~ ERROR trait `m::Trait` is private
     m::leak_dyn2(); //~ ERROR type `Priv` is private
     m::leak_dyn3(); //~ ERROR type `Priv` is private
 
diff --git a/tests/ui/privacy/private-inferred-type.stderr b/tests/ui/privacy/private-inferred-type.stderr
@@ -172,7 +172,7 @@ LL |     m::m!();
    |
    = note: this error originates in the macro `m::m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error: trait `Trait` is private
+error: trait `m::Trait` is private
   --> $DIR/private-inferred-type.rs:118:5
    |
 LL |     m::leak_anon1();
@@ -190,7 +190,7 @@ error: type `Priv` is private
 LL |     m::leak_anon3();
    |     ^^^^^^^^^^^^^^^ private type
 
-error: trait `Trait` is private
+error: trait `m::Trait` is private
   --> $DIR/private-inferred-type.rs:122:5
    |
 LL |     m::leak_dyn1();
diff --git a/tests/ui/trait-bounds/suggest-maybe-sized-bound.stderr b/tests/ui/trait-bounds/suggest-maybe-sized-bound.stderr
@@ -22,7 +22,7 @@ LL |         type P<X> = [u8];
    |                     ^^^^ doesn't have a size known at compile-time
    |
    = help: the trait `Sized` is not implemented for `[u8]`
-note: required by a bound in `Trait::P`
+note: required by a bound in `main::Trait::P`
   --> $DIR/suggest-maybe-sized-bound.rs:13:9
    |
 LL |         type P<X>;
diff --git a/tests/ui/traits/bound/on-structs-and-enums-xc.stderr b/tests/ui/traits/bound/on-structs-and-enums-xc.stderr
@@ -1,20 +1,20 @@
-error[E0277]: the trait bound `usize: Trait` is not satisfied
+error[E0277]: the trait bound `usize: on_structs_and_enums_xc::Trait` is not satisfied
   --> $DIR/on-structs-and-enums-xc.rs:7:15
    |
 LL | fn explode(x: Foo<usize>) {}
-   |               ^^^^^^^^^^ the trait `Trait` is not implemented for `usize`
+   |               ^^^^^^^^^^ the trait `on_structs_and_enums_xc::Trait` is not implemented for `usize`
    |
 note: required by a bound in `Foo`
   --> $DIR/auxiliary/on_structs_and_enums_xc.rs:5:18
    |
 LL | pub struct Foo<T:Trait> {
    |                  ^^^^^ required by this bound in `Foo`
 
-error[E0277]: the trait bound `f32: Trait` is not satisfied
+error[E0277]: the trait bound `f32: on_structs_and_enums_xc::Trait` is not satisfied
   --> $DIR/on-structs-and-enums-xc.rs:10:14
    |
 LL | fn kaboom(y: Bar<f32>) {}
-   |              ^^^^^^^^ the trait `Trait` is not implemented for `f32`
+   |              ^^^^^^^^ the trait `on_structs_and_enums_xc::Trait` is not implemented for `f32`
    |
 note: required by a bound in `Bar`
   --> $DIR/auxiliary/on_structs_and_enums_xc.rs:9:16
diff --git a/tests/ui/traits/bound/on-structs-and-enums-xc1.stderr b/tests/ui/traits/bound/on-structs-and-enums-xc1.stderr
@@ -1,20 +1,20 @@
-error[E0277]: the trait bound `{integer}: Trait` is not satisfied
+error[E0277]: the trait bound `{integer}: on_structs_and_enums_xc::Trait` is not satisfied
   --> $DIR/on-structs-and-enums-xc1.rs:9:12
    |
 LL |         x: 3
-   |            ^ the trait `Trait` is not implemented for `{integer}`
+   |            ^ the trait `on_structs_and_enums_xc::Trait` is not implemented for `{integer}`
    |
 note: required by a bound in `Foo`
   --> $DIR/auxiliary/on_structs_and_enums_xc.rs:5:18
    |
 LL | pub struct Foo<T:Trait> {
    |                  ^^^^^ required by this bound in `Foo`
 
-error[E0277]: the trait bound `f64: Trait` is not satisfied
+error[E0277]: the trait bound `f64: on_structs_and_enums_xc::Trait` is not satisfied
   --> $DIR/on-structs-and-enums-xc1.rs:12:14
    |
 LL |     let bar: Bar<f64> = return;
-   |              ^^^^^^^^ the trait `Trait` is not implemented for `f64`
+   |              ^^^^^^^^ the trait `on_structs_and_enums_xc::Trait` is not implemented for `f64`
    |
 note: required by a bound in `Bar`
   --> $DIR/auxiliary/on_structs_and_enums_xc.rs:9:16
diff --git a/tests/ui/traits/wrong-multiple-different-versions-of-a-crate.rs b/tests/ui/traits/wrong-multiple-different-versions-of-a-crate.rs
@@ -5,8 +5,8 @@
 // Issue #148892.
 //@ aux-crate:crate1=crate1.rs
 
-struct MyStruct; //~ HELP  the trait `Trait` is not implemented for `MyStruct`
+struct MyStruct; //~ HELP  the trait `crate1::Trait` is not implemented for `MyStruct`
 
 fn main() {
-    crate1::foo(MyStruct); //~ ERROR the trait bound `MyStruct: Trait` is not satisfied
+    crate1::foo(MyStruct); //~ ERROR the trait bound `MyStruct: crate1::Trait` is not satisfied
 }
diff --git a/tests/ui/traits/wrong-multiple-different-versions-of-a-crate.stderr b/tests/ui/traits/wrong-multiple-different-versions-of-a-crate.stderr
@@ -1,12 +1,12 @@
-error[E0277]: the trait bound `MyStruct: Trait` is not satisfied
+error[E0277]: the trait bound `MyStruct: crate1::Trait` is not satisfied
   --> $DIR/wrong-multiple-different-versions-of-a-crate.rs:11:17
    |
 LL |     crate1::foo(MyStruct);
    |     ----------- ^^^^^^^^ unsatisfied trait bound
    |     |
    |     required by a bound introduced by this call
    |
-help: the trait `Trait` is not implemented for `MyStruct`
+help: the trait `crate1::Trait` is not implemented for `MyStruct`
   --> $DIR/wrong-multiple-different-versions-of-a-crate.rs:8:1
    |
 LL | struct MyStruct;
diff --git a/tests/ui/unresolved/unresolved-candidates.stderr b/tests/ui/unresolved/unresolved-candidates.stderr
@@ -4,8 +4,10 @@ error[E0432]: unresolved import `Trait`
 LL |     use Trait;
    |         ^^^^^ no `Trait` in the root
    |
-help: consider importing this trait instead
+help: consider importing one of these items instead
    |
+LL |     use std::mem::type_info::Trait;
+   |         +++++++++++++++++++++
 LL |     use a::Trait;
    |         +++
 
diff --git a/tests/ui/unstable-feature-bound/unstable_impl_coherence.disabled.stderr b/tests/ui/unstable-feature-bound/unstable_impl_coherence.disabled.stderr
@@ -1,11 +1,11 @@
-error[E0119]: conflicting implementations of trait `Trait` for type `LocalTy`
+error[E0119]: conflicting implementations of trait `aux::Trait` for type `LocalTy`
   --> $DIR/unstable_impl_coherence.rs:14:1
    |
 LL | impl aux::Trait for LocalTy {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: conflicting implementation in crate `unstable_impl_coherence_aux`:
-           - impl<T> Trait for T
+           - impl<T> aux::Trait for T
              where feature(foo) is enabled;
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/unstable-feature-bound/unstable_impl_coherence.enabled.stderr b/tests/ui/unstable-feature-bound/unstable_impl_coherence.enabled.stderr
@@ -1,11 +1,11 @@
-error[E0119]: conflicting implementations of trait `Trait` for type `LocalTy`
+error[E0119]: conflicting implementations of trait `aux::Trait` for type `LocalTy`
   --> $DIR/unstable_impl_coherence.rs:14:1
    |
 LL | impl aux::Trait for LocalTy {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: conflicting implementation in crate `unstable_impl_coherence_aux`:
-           - impl<T> Trait for T
+           - impl<T> aux::Trait for T
              where feature(foo) is enabled;
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/unstable-feature-bound/unstable_impl_coherence.rs b/tests/ui/unstable-feature-bound/unstable_impl_coherence.rs
@@ -12,6 +12,6 @@ use aux::Trait;
 struct LocalTy;
 
 impl aux::Trait for LocalTy {}
-//~^ ERROR: conflicting implementations of trait `Trait` for type `LocalTy`
+//~^ ERROR: conflicting implementations of trait `aux::Trait` for type `LocalTy`
 
 fn main(){}
diff --git a/tests/ui/unstable-feature-bound/unstable_impl_method_selection.stderr b/tests/ui/unstable-feature-bound/unstable_impl_method_selection.stderr
@@ -4,9 +4,9 @@ error[E0283]: type annotations needed
 LL |     vec![].foo();
    |            ^^^ cannot infer type for struct `Vec<_>`
    |
-   = note: multiple `impl`s satisfying `Vec<_>: Trait` found in the `unstable_impl_method_selection_aux` crate:
-           - impl Trait for Vec<u32>;
-           - impl Trait for Vec<u64>
+   = note: multiple `impl`s satisfying `Vec<_>: aux::Trait` found in the `unstable_impl_method_selection_aux` crate:
+           - impl aux::Trait for Vec<u32>;
+           - impl aux::Trait for Vec<u64>
              where feature(bar) is enabled;
 
 error: aborting due to 1 previous error
diff --git a/tests/ui/use/issue-18986.stderr b/tests/ui/use/issue-18986.stderr
@@ -3,6 +3,11 @@ error[E0574]: expected struct, variant or union type, found trait `Trait`
    |
 LL |         Trait { x: 42 } => ()
    |         ^^^^^ not a struct, variant or union type
+   |
+help: consider importing this struct instead
+   |
+LL + use std::mem::type_info::Trait;
+   |
 
 error: aborting due to 1 previous error
 

Original file line number	Diff line number	Diff line change
@@ -9,7 +9,7 @@ help: the trait `std::fmt::Display` is not implemented for `A`
`9`	`9`	`\|`
`10`	`10`	`LL \| struct A;`
`11`	`11`	`\| ^^^^^^^^`
`12`		-note: required by a bound in `Trait`
	`12`	+note: required by a bound in `r#trait::Trait`
`13`	`13`	`--> $DIR/auxiliary/trait.rs:LL:COL`
`14`	`14`	`\|`
`15`	`15`	`LL \| pub trait Trait: std::fmt::Display {}`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ LL \| m::m!();`
`172`	`172`	`\|`
`173`	`173`	= note: this error originates in the macro `m::m` (in Nightly builds, run with -Z macro-backtrace for more info)
`174`	`174`
`175`		-error: trait `Trait` is private
	`175`	+error: trait `m::Trait` is private
`176`	`176`	`--> $DIR/private-inferred-type.rs:118:5`
`177`	`177`	`\|`
`178`	`178`	`LL \| m::leak_anon1();`
@@ -190,7 +190,7 @@ error: type `Priv` is private
`190`	`190`	`LL \| m::leak_anon3();`
`191`	`191`	`\| ^^^^^^^^^^^^^^^ private type`
`192`	`192`
`193`		-error: trait `Trait` is private
	`193`	+error: trait `m::Trait` is private
`194`	`194`	`--> $DIR/private-inferred-type.rs:122:5`
`195`	`195`	`\|`
`196`	`196`	`LL \| m::leak_dyn1();`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ LL \| type P<X> = [u8];`
`22`	`22`	`\| ^^^^ doesn't have a size known at compile-time`
`23`	`23`	`\|`
`24`	`24`	= help: the trait `Sized` is not implemented for `[u8]`
`25`		-note: required by a bound in `Trait::P`
	`25`	+note: required by a bound in `main::Trait::P`
`26`	`26`	`--> $DIR/suggest-maybe-sized-bound.rs:13:9`
`27`	`27`	`\|`
`28`	`28`	`LL \| type P<X>;`