cannot find type

Author: estebank

compiler/rustc_resolve/src/diagnostics.rs

@@ -2501,6 +2501,7 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> {
                 )
             });
 
+            let message = format!("cannot find type `{ident}` in {scope}");
             (message, format!("use of undeclared type `{ident}`"), suggestion)
         } else {
             let mut suggestion = None;

tests/ui/borrowck/non-ADT-struct-pattern-box-pattern-ice-121463.rs

@@ -4,9 +4,9 @@
 
 fn main() {
     let mut a = E::StructVar { boxed: Box::new(5_i32) };
-    //~^ ERROR cannot find `E`
+    //~^ ERROR cannot find type `E`
     match a {
         E::StructVar { box boxed } => { }
-        //~^ ERROR cannot find `E`
+        //~^ ERROR cannot find type `E`
     }
 }

tests/ui/borrowck/non-ADT-struct-pattern-box-pattern-ice-121463.stderr

@@ -1,4 +1,4 @@
-error[E0433]: cannot find `E` in this scope
+error[E0433]: cannot find type `E` in this scope
   --> $DIR/non-ADT-struct-pattern-box-pattern-ice-121463.rs:6:17
    |
 LL |     let mut a = E::StructVar { boxed: Box::new(5_i32) };
@@ -7,7 +7,7 @@ LL |     let mut a = E::StructVar { boxed: Box::new(5_i32) };
    |                 use of undeclared type `E`
    |                 help: a trait with a similar name exists: `Eq`
 
-error[E0433]: cannot find `E` in this scope
+error[E0433]: cannot find type `E` in this scope
   --> $DIR/non-ADT-struct-pattern-box-pattern-ice-121463.rs:9:9
    |
 LL |         E::StructVar { box boxed } => { }

tests/ui/const-generics/generic_const_exprs/ice-predicates-of-no-entry-found-for-key-119275.stderr

@@ -43,7 +43,7 @@ error: defaults for generic parameters are not allowed in `for<...>` binders
 LL |     for<const N: usize = 3, T = u32> [(); COT::BYTES]:,
    |                             ^^^^^^^
 
-error[E0433]: cannot find `COT` in this scope
+error[E0433]: cannot find type `COT` in this scope
   --> $DIR/ice-predicates-of-no-entry-found-for-key-119275.rs:10:43
    |
 LL |     for<const N: usize = 3, T = u32> [(); COT::BYTES]:,

tests/ui/const-generics/issues/issue-82956.stderr

@@ -1,4 +1,4 @@
-error[E0433]: cannot find `IntoIter` in this scope
+error[E0433]: cannot find type `IntoIter` in this scope
   --> $DIR/issue-82956.rs:25:24
    |
 LL |         let mut iter = IntoIter::new(self);

tests/ui/consts/const_refs_to_static-ice-121413.stderr

@@ -1,4 +1,4 @@
-error[E0433]: cannot find `AtomicUsize` in this scope
+error[E0433]: cannot find type `AtomicUsize` in this scope
   --> $DIR/const_refs_to_static-ice-121413.rs:8:24
    |
 LL |     static FOO: Sync = AtomicUsize::new(0);

tests/ui/derived-errors/issue-31997-1.stderr

@@ -1,4 +1,4 @@
-error[E0433]: cannot find `HashMap` in this scope
+error[E0433]: cannot find type `HashMap` in this scope
   --> $DIR/issue-31997-1.rs:20:19
    |
 LL |     let mut map = HashMap::new();

tests/ui/error-codes/E0433.stderr

@@ -1,4 +1,4 @@
-error[E0433]: cannot find `NonExistingMap` in this scope
+error[E0433]: cannot find type `NonExistingMap` in this scope
   --> $DIR/E0433.rs:2:15
    |
 LL |     let map = NonExistingMap::new();

tests/ui/generic-associated-types/equality-bound.rs

@@ -8,7 +8,7 @@ fn sum2<I: Iterator>(i: I) -> i32 where I::Item = i32 {
 }
 fn sum3<J: Iterator>(i: J) -> i32 where I::Item = i32 {
 //~^ ERROR equality constraints are not yet supported in `where` clauses
-//~| ERROR cannot find `I`
+//~| ERROR cannot find type `I`
     panic!()
 }
 

tests/ui/generic-associated-types/equality-bound.stderr

@@ -164,7 +164,7 @@ LL | struct K {}
 LL |     fn from_iter<T>(_: T) -> Self where T::Item = A, T: IntoIterator,
    |                                                   ^ help: a struct with a similar name exists: `K`
 
-error[E0433]: cannot find `I` in this scope
+error[E0433]: cannot find type `I` in this scope
   --> $DIR/equality-bound.rs:9:41
    |
 LL | fn sum3<J: Iterator>(i: J) -> i32 where I::Item = i32 {