Rollup merge of #148678 - xonx4l:EO412_replacement_with_EO425, r=Kivooeo

Merge E0412 into E0425

This PR merge E0412 into E0425  as both mean the same thing to users.

This fixes https://github.com/rust-lang/rust/issues/148558.

compiler/rustc_error_codes/src/error_codes/E0412.md

@@ -1,8 +1,8 @@
-A used type name is not in scope.
+#### Note: this error code is no longer emitted by the compiler.
 
 Erroneous code examples:
 
-```compile_fail,E0412
+```compile_fail,E0425
 impl Something {} // error: type name `Something` is not in scope
 
 // or:
@@ -42,7 +42,7 @@ module. To fix this, you can follow the suggestion and use File directly or
 `use super::File;` which will import the types from the parent namespace. An
 example that causes this error is below:
 
-```compile_fail,E0412
+```compile_fail,E0425
 use std::fs::File;
 
 mod foo {

compiler/rustc_resolve/src/late.rs

@@ -622,7 +622,7 @@ impl PathSource<'_, '_, '_> {
             (PathSource::Trait(_), true) => E0404,
             (PathSource::Trait(_), false) => E0405,
             (PathSource::Type | PathSource::DefineOpaques, true) => E0573,
-            (PathSource::Type | PathSource::DefineOpaques, false) => E0412,
+            (PathSource::Type | PathSource::DefineOpaques, false) => E0425,
             (PathSource::Struct(_), true) => E0574,
             (PathSource::Struct(_), false) => E0422,
             (PathSource::Expr(..), true) | (PathSource::Delegation, true) => E0423,
@@ -3158,7 +3158,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
         result
     }
 
-    /// When evaluating a `trait` use its associated types' idents for suggestions in E0412.
+    /// When evaluating a `trait` use its associated types' idents for suggestions in E0425.
     fn resolve_trait_items(&mut self, trait_items: &'ast [Box<AssocItem>]) {
         let trait_assoc_items =
             replace(&mut self.diag_metadata.current_trait_assoc_items, Some(trait_items));
@@ -4363,7 +4363,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
 
                 // There are two different error messages user might receive at
                 // this point:
-                // - E0412 cannot find type `{}` in this scope
+                // - E0425 cannot find type `{}` in this scope
                 // - E0433 failed to resolve: use of undeclared type or module `{}`
                 //
                 // The first one is emitted for paths in type-position, and the
@@ -4371,7 +4371,7 @@ impl<'a, 'ast, 'ra, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                 //
                 // Thus (since we're in expression-position at this point), not to
                 // confuse the user, we want to keep the *message* from E0433 (so
-                // `parent_err`), but we want *hints* from E0412 (so `err`).
+                // `parent_err`), but we want *hints* from E0425 (so `err`).
                 //
                 // And that's what happens below - we're just mixing both messages
                 // into a single one.

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -705,7 +705,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
             if !enum_candidates.is_empty() {
                 enum_candidates.sort();
 
-                // Contextualize for E0412 "cannot find type", but don't belabor the point
+                // Contextualize for E0425 "cannot find type", but don't belabor the point
                 // (that it's a variant) for E0573 "expected type, found variant".
                 let preamble = if res.is_none() {
                     let others = match enum_candidates.len() {
@@ -1135,7 +1135,7 @@ impl<'ast, 'ra, 'tcx> LateResolutionVisitor<'_, 'ast, 'ra, 'tcx> {
                 }
 
                 self.suggest_ident_hidden_by_hygiene(err, path, span);
-            } else if err_code == E0412 {
+                // cannot find type in this scope
                 if let Some(correct) = Self::likely_rust_type(path) {
                     err.span_suggestion(
                         span,

src/tools/clippy/tests/ui/crashes/ice-6252.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `PhantomData` in this scope
+error[E0425]: cannot find type `PhantomData` in this scope
   --> tests/ui/crashes/ice-6252.rs:9:9
    |
 LL |     _n: PhantomData,
@@ -9,7 +9,7 @@ help: consider importing this struct
 LL + use std::marker::PhantomData;
    |
 
-error[E0412]: cannot find type `VAL` in this scope
+error[E0425]: cannot find type `VAL` in this scope
   --> tests/ui/crashes/ice-6252.rs:12:63
    |
 LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
@@ -31,5 +31,5 @@ LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0046, E0412.
+Some errors have detailed explanations: E0046, E0425.
 For more information about an error, try `rustc --explain E0046`.

tests/rustdoc-ui/impl-fn-nesting.stderr

@@ -10,7 +10,7 @@ error[E0405]: cannot find trait `UnknownBound` in this scope
 LL | pub fn f<B: UnknownBound>(a: UnknownType, b: B) {
    |             ^^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0425]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:11:30
    |
 LL | pub fn f<B: UnknownBound>(a: UnknownType, b: B) {
@@ -34,7 +34,7 @@ error[E0405]: cannot find trait `UnknownBound` in this scope
 LL |     impl<T: UnknownBound> UnknownTrait for T {}
    |             ^^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0425]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:18:25
    |
 LL |     impl ValidTrait for UnknownType {}
@@ -46,13 +46,13 @@ error[E0405]: cannot find trait `UnknownBound` in this scope
 LL |     impl ValidTrait for ValidType where ValidTrait: UnknownBound {}
    |                                                     ^^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0425]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:25:21
    |
 LL |         type Item = UnknownType;
    |                     ^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0425]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:44:37
    |
 LL |             pub fn doubly_nested(c: UnknownType) {
@@ -60,5 +60,5 @@ LL |             pub fn doubly_nested(c: UnknownType) {
 
 error: aborting due to 10 previous errors
 
-Some errors have detailed explanations: E0405, E0412.
+Some errors have detailed explanations: E0405, E0425.
 For more information about an error, try `rustc --explain E0405`.

tests/ui/annotate-snippet/missing-type.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Iter` in this scope
+error[E0425]: cannot find type `Iter` in this scope
   --> $DIR/missing-type.rs:5:12
    |
 LL |     let x: Iter;
@@ -18,4 +18,4 @@ LL + use std::collections::hash_map::Iter;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/argument-suggestions/extern-fn-arg-names.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `err` in this scope
+error[E0425]: cannot find type `err` in this scope
   --> $DIR/extern-fn-arg-names.rs:2:29
    |
 LL |     fn dstfn(src: i32, dst: err);
@@ -22,5 +22,5 @@ LL |     dstfn(1, /* dst */);
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0061, E0412.
+Some errors have detailed explanations: E0061, E0425.
 For more information about an error, try `rustc --explain E0061`.

tests/ui/argument-suggestions/issue-109831.rs

@@ -1,7 +1,7 @@
 struct A;
 struct B;
 
-fn f(b1: B, b2: B, a2: C) {} //~ ERROR E0412
+fn f(b1: B, b2: B, a2: C) {} //~ ERROR E0425
 
 fn main() {
     f(A, A, B, C); //~ ERROR E0425

tests/ui/argument-suggestions/issue-109831.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `C` in this scope
+error[E0425]: cannot find type `C` in this scope
   --> $DIR/issue-109831.rs:4:24
    |
 LL | struct A;
@@ -48,5 +48,5 @@ LL +     f(/* B */, /* B */, B);
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0061, E0412, E0425.
+Some errors have detailed explanations: E0061, E0425.
 For more information about an error, try `rustc --explain E0061`.

tests/ui/asm/issue-113788.rs

@@ -2,6 +2,6 @@
 //@ needs-asm-support
 //@ only-x86_64
 fn main() {
-    let peb: *const PEB; //~ ERROR cannot find type `PEB` in this scope [E0412]
+    let peb: *const PEB; //~ ERROR cannot find type `PEB` in this scope [E0425]
     unsafe { std::arch::asm!("mov {0}, fs:[0x30]", out(reg) peb); }
 }

tests/ui/asm/issue-113788.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `PEB` in this scope
+error[E0425]: cannot find type `PEB` in this scope
   --> $DIR/issue-113788.rs:5:21
    |
 LL |     let peb: *const PEB;
@@ -6,4 +6,4 @@ LL |     let peb: *const PEB;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/associated-consts/issue-93835.stderr

@@ -4,7 +4,7 @@ error[E0425]: cannot find value `p` in this scope
 LL |     type_ascribe!(p, a<p:p<e=6>>);
    |                   ^ not found in this scope
 
-error[E0412]: cannot find type `a` in this scope
+error[E0425]: cannot find type `a` in this scope
   --> $DIR/issue-93835.rs:4:22
    |
 LL |     type_ascribe!(p, a<p:p<e=6>>);
@@ -39,5 +39,5 @@ LL |     type_ascribe!(p, a<p:p<e=6>>);
 
 error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0405, E0412, E0425, E0658.
+Some errors have detailed explanations: E0405, E0425, E0658.
 For more information about an error, try `rustc --explain E0405`.

tests/ui/associated-type-bounds/return-type-notation/not-a-method.stderr

@@ -16,7 +16,7 @@ error[E0576]: cannot find function `method` in this scope
 LL |     method(..): Send,
    |     ^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `method` in this scope
+error[E0425]: cannot find type `method` in this scope
   --> $DIR/not-a-method.rs:36:5
    |
 LL |     method(): Send,
@@ -36,5 +36,5 @@ LL |     method(..): Send,
 
 error: aborting due to 6 previous errors
 
-Some errors have detailed explanations: E0412, E0573, E0575, E0576.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0573, E0575, E0576.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/associated-types/associated-types-eq-1.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/associated-types-eq-1.rs:10:12
    |
 LL | fn foo2<I: Foo>(x: I) {
@@ -18,4 +18,4 @@ LL | fn foo2<I: Foo, A>(x: I) {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/async-await/in-trait/return-not-existing-pair.rs

@@ -3,7 +3,7 @@
 
 trait MyTrait<'a, 'b, T> {
     async fn foo(&'a self, key: &'b T) -> (&'a ConnImpl, &'b T);
-    //~^ ERROR: cannot find type `ConnImpl` in this scope [E0412]
+    //~^ ERROR: cannot find type `ConnImpl` in this scope [E0425]
 }
 
 impl<'a, 'b, T, U> MyTrait<T> for U {

tests/ui/async-await/in-trait/return-not-existing-pair.stderr

@@ -9,7 +9,7 @@ help: indicate the anonymous lifetimes
 LL | impl<'a, 'b, T, U> MyTrait<'_, '_, T> for U {
    |                            +++++++
 
-error[E0412]: cannot find type `ConnImpl` in this scope
+error[E0425]: cannot find type `ConnImpl` in this scope
   --> $DIR/return-not-existing-pair.rs:5:48
    |
 LL |     async fn foo(&'a self, key: &'b T) -> (&'a ConnImpl, &'b T);
@@ -26,5 +26,5 @@ LL |     async fn foo(_: T) -> (&'a U, &'b T) {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0308, E0412, E0726.
+Some errors have detailed explanations: E0308, E0425, E0726.
 For more information about an error, try `rustc --explain E0308`.

tests/ui/async-await/in-trait/return-not-existing-type-wrapping-rpitit.rs

@@ -5,7 +5,7 @@ struct Wrapper<T>(T);
 
 trait Foo {
     fn bar() -> Wrapper<Missing<impl Sized>>;
-    //~^ ERROR: cannot find type `Missing` in this scope [E0412]
+    //~^ ERROR: cannot find type `Missing` in this scope [E0425]
 }
 
 impl Foo for () {

tests/ui/async-await/in-trait/return-not-existing-type-wrapping-rpitit.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/return-not-existing-type-wrapping-rpitit.rs:7:25
    |
 LL |     fn bar() -> Wrapper<Missing<impl Sized>>;
@@ -6,4 +6,4 @@ LL |     fn bar() -> Wrapper<Missing<impl Sized>>;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/async-await/issue-72590-type-error-sized.stderr

@@ -1,10 +1,10 @@
-error[E0412]: cannot find type `Nonexistent` in this scope
+error[E0425]: cannot find type `Nonexistent` in this scope
   --> $DIR/issue-72590-type-error-sized.rs:6:10
    |
 LL |     foo: Nonexistent,
    |          ^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/issue-72590-type-error-sized.rs:11:11
    |
 LL |     test: Missing
@@ -30,5 +30,5 @@ LL |     async fn frob(&self) {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0277, E0412.
+Some errors have detailed explanations: E0277, E0425.
 For more information about an error, try `rustc --explain E0277`.

tests/ui/async-await/unconstrained-lifetimes.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/unconstrained-lifetimes.rs:6:17
    |
 LL | async fn foo(_: Missing<'_>) {}
@@ -6,4 +6,4 @@ LL | async fn foo(_: Missing<'_>) {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/attributes/align-on-fields-143987.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `usize8` in this scope
+error[E0425]: cannot find type `usize8` in this scope
   --> $DIR/align-on-fields-143987.rs:17:8
    |
 LL |     x: usize8,
@@ -30,4 +30,4 @@ LL |     #[rustc_align(32)]
 
 error: aborting due to 4 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/borrowck/bad-drop-side-effects.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/bad-drop-side-effects.rs:7:16
    |
 LL | impl<U> B for &Missing {
@@ -6,4 +6,4 @@ LL | impl<U> B for &Missing {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/c-variadic/issue-86053-1.stderr

@@ -54,7 +54,7 @@ LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b
    |
    = help: only `extern "C"` and `extern "C-unwind"` functions may have a C variable argument list
 
-error[E0412]: cannot find type `F` in this scope
+error[E0425]: cannot find type `F` in this scope
   --> $DIR/issue-86053-1.rs:11:54
    |
 LL |     self , _: ... ,   self ,   self , _: ... ) where F : FnOnce ( & 'a & 'b usize ) {
@@ -74,4 +74,4 @@ LL | fn ordering4 < 'a , 'b, F     > ( a :            ,   self , self ,   self ,
 
 error: aborting due to 10 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/cast/casts-issue-46365.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Ipsum` in this scope
+error[E0425]: cannot find type `Ipsum` in this scope
   --> $DIR/casts-issue-46365.rs:2:12
    |
 LL |     ipsum: Ipsum
@@ -6,4 +6,4 @@ LL |     ipsum: Ipsum
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/cast/ice-cast-type-with-error-124848.stderr

@@ -31,7 +31,7 @@ help: consider introducing lifetime `'a` here
 LL | fn main<'a>() {
    |        ++++
 
-error[E0412]: cannot find type `Pin` in this scope
+error[E0425]: cannot find type `Pin` in this scope
   --> $DIR/ice-cast-type-with-error-124848.rs:7:60
    |
 LL | struct MyType<'a>(Cell<Option<&'unpinned mut MyType<'a>>>, Pin);
@@ -66,5 +66,5 @@ LL |     let bad_addr = &unpinned as *const Cell<Option<&'a mut MyType<'a>>> as
 
 error: aborting due to 6 previous errors
 
-Some errors have detailed explanations: E0061, E0261, E0412, E0606.
+Some errors have detailed explanations: E0061, E0261, E0425, E0606.
 For more information about an error, try `rustc --explain E0061`.

tests/ui/closures/issue-78720.stderr

@@ -4,7 +4,7 @@ error: at least one trait must be specified
 LL | fn server() -> impl {
    |                ^^^^
 
-error[E0412]: cannot find type `F` in this scope
+error[E0425]: cannot find type `F` in this scope
   --> $DIR/issue-78720.rs:14:12
    |
 LL |     _func: F,
@@ -55,5 +55,5 @@ LL |     fn map2<F>(&self, f: F) -> Map2<F> {}
 
 error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0277, E0282, E0308, E0412.
+Some errors have detailed explanations: E0277, E0282, E0308, E0425.
 For more information about an error, try `rustc --explain E0277`.

tests/ui/closures/issue-90871.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `n` in this scope
+error[E0425]: cannot find type `n` in this scope
   --> $DIR/issue-90871.rs:4:22
    |
 LL |     type_ascribe!(2, n([u8; || 1]))
@@ -23,5 +23,5 @@ LL |     type_ascribe!(2, n([u8; (|| 1)()]))
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0308, E0412.
+Some errors have detailed explanations: E0308, E0425.
 For more information about an error, try `rustc --explain E0308`.

tests/ui/cmse-nonsecure/cmse-nonsecure-call/generics.stderr

@@ -4,7 +4,7 @@ error: function pointer types may not have generic parameters
 LL |     f1: extern "cmse-nonsecure-call" fn<U: Copy>(U, u32, u32, u32) -> u64,
    |                                        ^^^^^^^^^
 
-error[E0412]: cannot find type `U` in this scope
+error[E0425]: cannot find type `U` in this scope
   --> $DIR/generics.rs:14:50
    |
 LL | struct Test<T: Copy> {
@@ -101,5 +101,5 @@ LL | type WithVarArgs = extern "cmse-nonsecure-call" fn(u32, ...);
 
 error: aborting due to 12 previous errors
 
-Some errors have detailed explanations: E0045, E0412, E0562, E0798.
+Some errors have detailed explanations: E0045, E0425, E0562, E0798.
 For more information about an error, try `rustc --explain E0045`.

tests/ui/coercion/type-errors.stderr

@@ -1,16 +1,16 @@
-error[E0412]: cannot find type `TypeError` in this scope
+error[E0425]: cannot find type `TypeError` in this scope
   --> $DIR/type-errors.rs:5:23
    |
 LL | pub fn has_error() -> TypeError {}
    |                       ^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `TypeError` in this scope
+error[E0425]: cannot find type `TypeError` in this scope
   --> $DIR/type-errors.rs:18:29
    |
 LL | pub fn autoderef_source(e: &TypeError) {
    |                             ^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `TypeError` in this scope
+error[E0425]: cannot find type `TypeError` in this scope
   --> $DIR/type-errors.rs:23:29
    |
 LL | pub fn autoderef_target(_: &TypeError) {}
@@ -18,4 +18,4 @@ LL | pub fn autoderef_target(_: &TypeError) {}
 
 error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/coherence/coherence-error-suppression.rs

@@ -7,7 +7,7 @@ impl Foo for i16 {}
 impl Foo for i32 {}
 impl Foo for i64 {}
 impl Foo for DoesNotExist {}
-//~^ ERROR E0412
+//~^ ERROR E0425
 impl Foo for u8 {}
 impl Foo for u16 {}
 impl Foo for u32 {}

tests/ui/coherence/coherence-error-suppression.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `DoesNotExist` in this scope
+error[E0425]: cannot find type `DoesNotExist` in this scope
   --> $DIR/coherence-error-suppression.rs:9:14
    |
 LL | impl Foo for DoesNotExist {}
@@ -6,4 +6,4 @@ LL | impl Foo for DoesNotExist {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/coherence/illegal-copy-bad-projection.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `void` in this scope
+error[E0425]: cannot find type `void` in this scope
   --> $DIR/illegal-copy-bad-projection.rs:6:23
    |
 LL |     type Ptr = *const void;
@@ -6,4 +6,4 @@ LL |     type Ptr = *const void;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/coherence/impl-coherence-error-for-undefined-type-18058.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Undefined` in this scope
+error[E0425]: cannot find type `Undefined` in this scope
   --> $DIR/impl-coherence-error-for-undefined-type-18058.rs:2:6
    |
 LL | impl Undefined {}
@@ -6,4 +6,4 @@ LL | impl Undefined {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/compiletest-self-test/ui-testing-optout.stderr

@@ -1,10 +1,10 @@
-error[E0412]: cannot find type `B` in this scope
+error[E0425]: cannot find type `B` in this scope
  --> $DIR/ui-testing-optout.rs:4:10
   |
 4 | type A = B;
   |          ^ not found in this scope
 
-error[E0412]: cannot find type `D` in this scope
+error[E0425]: cannot find type `D` in this scope
  --> $DIR/ui-testing-optout.rs:7:10
   |
 4 | type A = B;
@@ -13,7 +13,7 @@ error[E0412]: cannot find type `D` in this scope
 7 | type C = D;
   |          ^ help: a type alias with a similar name exists: `A`
 
-error[E0412]: cannot find type `F` in this scope
+error[E0425]: cannot find type `F` in this scope
   --> $DIR/ui-testing-optout.rs:92:10
    |
  4 | type A = B;
@@ -24,4 +24,4 @@ error[E0412]: cannot find type `F` in this scope
 
 error: aborting due to 3 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr

@@ -9,7 +9,7 @@ LL | | >;
    | |__|
    |
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/const_arg_trivial_macro_expansion-2.rs:12:10
    |
 LL | const _: A<
@@ -32,5 +32,4 @@ LL | const _<const x: /* Type */>: A<
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/const-generics/early/invalid-const-arguments.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `N` in this scope
+error[E0425]: cannot find type `N` in this scope
   --> $DIR/invalid-const-arguments.rs:5:16
    |
 LL | struct A<const N: u8>;
@@ -17,7 +17,7 @@ help: you might be missing a type parameter
 LL | impl<N> Foo for A<N> {}
    |     +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/invalid-const-arguments.rs:14:32
    |
 LL | struct A<const N: u8>;
@@ -72,5 +72,5 @@ LL | impl<const N: u8> Foo for C<N, { T }> {}
 
 error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0412, E0747.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0747.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/const-generics/generic_const_exprs/expected-type-of-closure-body-to-be-a-closure-or-coroutine-ice-113776.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `F` in this scope
+error[E0425]: cannot find type `F` in this scope
   --> $DIR/expected-type-of-closure-body-to-be-a-closure-or-coroutine-ice-113776.rs:11:17
    |
 LL |          let f: F = async { 1 };
@@ -59,5 +59,5 @@ LL | ) -> impl Iterator<Item = SubAssign> {
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0277, E0412, E0782.
+Some errors have detailed explanations: E0277, E0425, E0782.
 For more information about an error, try `rustc --explain E0277`.

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

@@ -15,7 +15,7 @@ LL | fn bug<const N: Nat>(&self)
 LL |     for<const N: usize = 3, T = u32> [(); COT::BYTES]:,
    |               ^ already used
 
-error[E0412]: cannot find type `Nat` in this scope
+error[E0425]: cannot find type `Nat` in this scope
   --> $DIR/ice-predicates-of-no-entry-found-for-key-119275.rs:6:17
    |
 LL | fn bug<const N: Nat>(&self)
@@ -51,5 +51,5 @@ LL |     for<const N: usize = 3, T = u32> [(); COT::BYTES]:,
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0403, E0412, E0433, E0658.
+Some errors have detailed explanations: E0403, E0425, E0433, E0658.
 For more information about an error, try `rustc --explain E0403`.

tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr

@@ -13,7 +13,7 @@ error[E0425]: cannot find value `v8` in this scope
 LL |     const v0: [[usize; v4]; v4] = v6(v8);
    |                                      ^^ not found in this scope
 
-error[E0412]: cannot find type `v18` in this scope
+error[E0425]: cannot find type `v18` in this scope
   --> $DIR/unevaluated-const-ice-119731.rs:23:31
    |
 LL |     pub type v11 = [[usize; v4]; v4];
@@ -22,7 +22,7 @@ LL |     pub type v11 = [[usize; v4]; v4];
 LL |         pub const fn v21() -> v18 {}
    |                               ^^^ help: a type alias with a similar name exists: `v11`
 
-error[E0412]: cannot find type `v18` in this scope
+error[E0425]: cannot find type `v18` in this scope
   --> $DIR/unevaluated-const-ice-119731.rs:35:31
    |
 LL |     pub type v11 = [[usize; v4]; v4];
@@ -129,5 +129,5 @@ LL |         pub const fn v21() -> v18 {
 
 error: aborting due to 14 previous errors; 2 warnings emitted
 
-Some errors have detailed explanations: E0412, E0422, E0425, E0432, E0592.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0422, E0425, E0432, E0592.
+For more information about an error, try `rustc --explain E0422`.

tests/ui/const-generics/mgca/projection-error.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/projection-error.rs:14:17
    |
 LL | pub trait Tr<A> {
@@ -16,7 +16,7 @@ help: you might be missing a type parameter
 LL | fn mk_array<T>(_x: T) -> [(); <T as Tr<bool>>::SIZE] {}
    |            +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/projection-error.rs:14:29
    |
 LL | pub trait Tr<A> {
@@ -36,4 +36,4 @@ LL | fn mk_array<T>(_x: T) -> [(); <T as Tr<bool>>::SIZE] {}
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/const-generics/parent_generics_of_nested_in_default.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Tr` in this scope
+error[E0425]: cannot find type `Tr` in this scope
   --> $DIR/parent_generics_of_nested_in_default.rs:1:36
    |
 LL | impl<const A: i32 = { || [0; B] }> Tr {}
@@ -20,5 +20,4 @@ LL | impl<const A: i32 = { || [0; B] }> Tr {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/const-generics/trait-resolution-error-with-const-generics-77919.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `PhantomData` in this scope
+error[E0425]: cannot find type `PhantomData` in this scope
   --> $DIR/trait-resolution-error-with-const-generics-77919.rs:10:9
    |
 LL |     _n: PhantomData,
@@ -9,7 +9,7 @@ help: consider importing this struct
 LL + use std::marker::PhantomData;
    |
 
-error[E0412]: cannot find type `VAL` in this scope
+error[E0425]: cannot find type `VAL` in this scope
   --> $DIR/trait-resolution-error-with-const-generics-77919.rs:12:63
    |
 LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
@@ -31,5 +31,5 @@ LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0046, E0412.
+Some errors have detailed explanations: E0046, E0425.
 For more information about an error, try `rustc --explain E0046`.

tests/ui/const-generics/type_not_in_scope.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `X` in this scope
+error[E0425]: cannot find type `X` in this scope
   --> $DIR/type_not_in_scope.rs:1:6
    |
 LL | impl X {
@@ -20,5 +20,5 @@ LL | fn getn<const N: cfg_attr>() -> [u8; N] {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0308, E0412, E0573.
+Some errors have detailed explanations: E0308, E0425, E0573.
 For more information about an error, try `rustc --explain E0308`.

tests/ui/const-generics/unknown_adt.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `UnknownStruct` in this scope
+error[E0425]: cannot find type `UnknownStruct` in this scope
   --> $DIR/unknown_adt.rs:2:12
    |
 LL |     let _: UnknownStruct<7>;
@@ -6,4 +6,4 @@ LL |     let _: UnknownStruct<7>;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/const_prop/ice-type-mismatch-when-copying-112824.stderr

@@ -9,7 +9,7 @@ help: consider introducing lifetime `'a` here
 LL | pub struct Opcode2<'a>(&'a S);
    |                   ++++
 
-error[E0412]: cannot find type `S` in this scope
+error[E0425]: cannot find type `S` in this scope
   --> $DIR/ice-type-mismatch-when-copying-112824.rs:5:24
    |
 LL | pub struct Opcode2(&'a S);
@@ -22,5 +22,5 @@ LL | pub struct Opcode2<S>(&'a S);
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0261, E0412.
+Some errors have detailed explanations: E0261, E0425.
 For more information about an error, try `rustc --explain E0261`.

tests/ui/consts/erroneous_type_in_const_return_value.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Sum` in this scope
+error[E0425]: cannot find type `Sum` in this scope
   --> $DIR/erroneous_type_in_const_return_value.rs:6:22
    |
 LL |     UnusedByTheConst(Sum),
@@ -11,4 +11,4 @@ LL + use std::iter::Sum;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/consts/erroneous_type_in_promoted.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Sum` in this scope
+error[E0425]: cannot find type `Sum` in this scope
   --> $DIR/erroneous_type_in_promoted.rs:6:22
    |
 LL |     UnusedByTheConst(Sum),
@@ -11,4 +11,4 @@ LL + use std::iter::Sum;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/consts/error-is-freeze.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `UndefinedType` in this scope
+error[E0425]: cannot find type `UndefinedType` in this scope
   --> $DIR/error-is-freeze.rs:4:17
    |
 LL |     foo: Option<UndefinedType>,
@@ -11,4 +11,4 @@ LL | struct MyStruct<UndefinedType> {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/consts/ice-bad-input-type-for-cast-83056.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/ice-bad-input-type-for-cast-83056.rs:5:11
    |
 LL | struct S([bool; f as usize]);
@@ -18,4 +18,4 @@ LL | fn f<T>() -> T {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Set` in this scope
+error[E0425]: cannot find type `Set` in this scope
   --> $DIR/issue-56028-there-is-an-enum-variant.rs:10:15
    |
 LL | fn setup() -> Set { Set }
@@ -40,5 +40,4 @@ LL + use PutDown::Set;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/did_you_mean/sugg-stable-import-first-issue-140240.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Range` in this scope
+error[E0425]: cannot find type `Range` in this scope
   --> $DIR/sugg-stable-import-first-issue-140240.rs:3:14
    |
 LL |     const _: Range = 0..1;
@@ -17,4 +17,4 @@ LL + use std::range::Range;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/dropck/drop-on-non-struct.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Nonexistent` in this scope
+error[E0425]: cannot find type `Nonexistent` in this scope
   --> $DIR/drop-on-non-struct.rs:9:15
    |
 LL | impl Drop for Nonexistent {
@@ -24,5 +24,5 @@ LL | impl<'a> Drop for &'a mut isize {
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0117, E0120, E0412.
+Some errors have detailed explanations: E0117, E0120, E0425.
 For more information about an error, try `rustc --explain E0117`.

tests/ui/dyn-compatibility/erroneous_signature.stderr

@@ -1,10 +1,10 @@
-error[E0412]: cannot find type `MissingType` in this scope
+error[E0425]: cannot find type `MissingType` in this scope
   --> $DIR/erroneous_signature.rs:2:22
    |
 LL |     fn err(&self) -> MissingType;
    |                      ^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `MissingType` in this scope
+error[E0425]: cannot find type `MissingType` in this scope
   --> $DIR/erroneous_signature.rs:7:22
    |
 LL |     fn err(&self) -> MissingType {
@@ -12,4 +12,4 @@ LL |     fn err(&self) -> MissingType {
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/enum-discriminant/ice-from-type-error-issue-148515.stderr

@@ -1,10 +1,10 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/ice-from-type-error-issue-148515.rs:7:34
    |
 LL | fn test1(x: impl Iterator<Item = Foo>) {
    |                                  ^^^ not found in this scope
 
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/ice-from-type-error-issue-148515.rs:12:34
    |
 LL | fn test2(_: impl Iterator<Item = Foo>) {
@@ -20,5 +20,5 @@ LL |     0u8 == -3;
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0412, E0600.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0600.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/error-codes/E0412.rs

@@ -1,4 +1,4 @@
-impl Something {} //~ ERROR E0412
+impl Something {} //~ ERROR E0425
 
 fn main() {
 }

tests/ui/error-codes/E0412.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Something` in this scope
+error[E0425]: cannot find type `Something` in this scope
   --> $DIR/E0412.rs:1:6
    |
 LL | impl Something {}
@@ -6,4 +6,4 @@ LL | impl Something {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/extern/issue-112363-extern-item-where-clauses-debug-ice.stderr

@@ -20,13 +20,13 @@ LL |     type Item = [T] where [T]: Sized;
    |
    = note: for more information, visit https://doc.rust-lang.org/std/keyword.extern.html
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/issue-112363-extern-item-where-clauses-debug-ice.rs:2:28
    |
 LL |     type Item = [T] where [T]: Sized;
    |                            ^ not found in this scope
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/issue-112363-extern-item-where-clauses-debug-ice.rs:2:18
    |
 LL |     type Item = [T] where [T]: Sized;
@@ -44,5 +44,5 @@ LL |     type Item = [T] where [T]: Sized;
 
 error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0412, E0658.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0658.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/fn/trait-fn-generic-mismatch.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `XXX` in this scope
+error[E0425]: cannot find type `XXX` in this scope
   --> $DIR/trait-fn-generic-mismatch.rs:5:11
    |
 LL | impl Core<XXX> {
@@ -28,5 +28,5 @@ LL +     core.spawn();
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0061, E0412.
+Some errors have detailed explanations: E0061, E0425.
 For more information about an error, try `rustc --explain E0061`.

tests/ui/functions-closures/fn-help-with-err-generic-is-not-function.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/fn-help-with-err-generic-is-not-function.rs:2:13
    |
 LL | impl Struct<T>
@@ -9,7 +9,7 @@ help: you might be missing a type parameter
 LL | impl<T> Struct<T>
    |     +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/fn-help-with-err-generic-is-not-function.rs:7:5
    |
 LL |     T: Copy,
@@ -17,4 +17,4 @@ LL |     T: Copy,
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

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

@@ -110,7 +110,7 @@ LL -     fn from_iter<T>(_: T) -> Self where T::Item = A, T: IntoIterator,
 LL +     fn from_iter<T>(_: T) -> Self where T: IntoIterator<Item = A>,
    |
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:20:79
    |
 LL |     fn from_iter<T>(_: T) -> Self where T: IntoIterator, IntoIterator::Item = A,
@@ -119,7 +119,7 @@ LL |     fn from_iter<T>(_: T) -> Self where T: IntoIterator, IntoIterator::Item
 LL | struct K {}
    | -------- similarly named struct `K` defined here
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:31:68
    |
 LL |     fn from_iter<T>(_: T) -> Self where T: IntoIterator, T::Item = A,
@@ -128,7 +128,7 @@ LL |     fn from_iter<T>(_: T) -> Self where T: IntoIterator, T::Item = A,
 LL | struct K {}
    | -------- similarly named struct `K` defined here
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:42:76
    |
 LL |     fn from_iter<T: IntoIterator>(_: T) -> Self where IntoIterator::Item = A,
@@ -137,7 +137,7 @@ LL |     fn from_iter<T: IntoIterator>(_: T) -> Self where IntoIterator::Item =
 LL | struct K {}
    | -------- similarly named struct `K` defined here
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:53:65
    |
 LL | struct K {}
@@ -146,7 +146,7 @@ LL | struct K {}
 LL |     fn from_iter<T: IntoIterator>(_: T) -> Self where T::Item = A,
    |                                                                 ^ help: a struct with a similar name exists: `K`
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:64:62
    |
 LL | struct K {}
@@ -155,7 +155,7 @@ LL | struct K {}
 LL |     fn from_iter<T>(_: T) -> Self where IntoIterator::Item = A, T: IntoIterator,
    |                                                              ^ help: a struct with a similar name exists: `K`
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/equality-bound.rs:75:51
    |
 LL | struct K {}
@@ -175,5 +175,5 @@ LL | fn sum3<J: Iterator>(i: J) -> i32 where I::Item = i32 {
 
 error: aborting due to 16 previous errors
 
-Some errors have detailed explanations: E0412, E0433.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0433.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/hygiene/arguments.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `S` in this scope
+error[E0425]: cannot find type `S` in this scope
   --> $DIR/arguments.rs:14:8
    |
 LL |         struct S;
@@ -9,4 +9,4 @@ LL |     m!(S, S);
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/hygiene/generate-mod.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `FromOutside` in this scope
+error[E0425]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:35:13
    |
 LL |     type A = $FromOutside;
@@ -7,7 +7,7 @@ LL |     type A = $FromOutside;
 LL |     genmod!(FromOutside, Outer);
    |             ^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `Outer` in this scope
+error[E0425]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:35:26
    |
 LL |     struct $Outer;
@@ -16,7 +16,7 @@ LL |     struct $Outer;
 LL |     genmod!(FromOutside, Outer);
    |                          ^^^^^ not found in this scope
 
-error[E0412]: cannot find type `FromOutside` in this scope
+error[E0425]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:19:18
    |
 LL |         type A = FromOutside;
@@ -27,7 +27,7 @@ LL |     genmod_transparent!();
    |
    = note: this error originates in the macro `genmod_transparent` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0412]: cannot find type `Outer` in this scope
+error[E0425]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:20:22
    |
 LL |         type Inner = Outer;
@@ -38,7 +38,7 @@ LL |     genmod_transparent!();
    |
    = note: this error originates in the macro `genmod_transparent` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0412]: cannot find type `FromOutside` in this scope
+error[E0425]: cannot find type `FromOutside` in this scope
   --> $DIR/generate-mod.rs:28:18
    |
 LL |         type A = FromOutside;
@@ -49,7 +49,7 @@ LL |     genmod_legacy!();
    |
    = note: this error originates in the macro `genmod_legacy` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0412]: cannot find type `Outer` in this scope
+error[E0425]: cannot find type `Outer` in this scope
   --> $DIR/generate-mod.rs:29:22
    |
 LL |         type Inner = Outer;
@@ -62,4 +62,4 @@ LL |     genmod_legacy!();
 
 error: aborting due to 6 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/impl-trait/in-trait/ensure-rpitits-are-created-before-freezing.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/ensure-rpitits-are-created-before-freezing.rs:8:19
    |
 LL | impl Iterable for Missing {
@@ -6,4 +6,4 @@ LL | impl Iterable for Missing {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/impl-trait/in-trait/refine-err.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/refine-err.rs:4:38
    |
 LL |     fn prepare(self) -> impl Fn() -> T;
@@ -6,4 +6,4 @@ LL |     fn prepare(self) -> impl Fn() -> T;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/impl-trait/in-trait/rpitit-shadowed-by-missing-adt.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/rpitit-shadowed-by-missing-adt.rs:6:35
    |
 LL |     fn w() -> impl Deref<Target = Missing<impl Sized>>;
@@ -6,4 +6,4 @@ LL |     fn w() -> impl Deref<Target = Missing<impl Sized>>;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/impl-trait/issues/issue-54966.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Oper` in this scope
+error[E0425]: cannot find type `Oper` in this scope
   --> $DIR/issue-54966.rs:3:27
    |
 LL | fn generate_duration() -> Oper<impl FnMut()> {}
@@ -6,4 +6,4 @@ LL | fn generate_duration() -> Oper<impl FnMut()> {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/impl-trait/opaque-used-in-extraneous-argument.stderr

@@ -11,7 +11,7 @@ LL - fn frob() -> impl Fn<P, Output = T> + '_ {}
 LL + fn frob() -> impl Fn<P, Output = T> + 'static {}
    |
 
-error[E0412]: cannot find type `P` in this scope
+error[E0425]: cannot find type `P` in this scope
   --> $DIR/opaque-used-in-extraneous-argument.rs:5:22
    |
 LL | fn frob() -> impl Fn<P, Output = T> + '_ {}
@@ -22,7 +22,7 @@ help: you might be missing a type parameter
 LL | fn frob<P>() -> impl Fn<P, Output = T> + '_ {}
    |        +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/opaque-used-in-extraneous-argument.rs:5:34
    |
 LL | fn frob() -> impl Fn<P, Output = T> + '_ {}
@@ -90,5 +90,5 @@ LL +     open_parent()
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0061, E0106, E0412, E0658.
+Some errors have detailed explanations: E0061, E0106, E0425, E0658.
 For more information about an error, try `rustc --explain E0061`.

tests/ui/implied-bounds/references-err.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `DoesNotExist` in this scope
+error[E0425]: cannot find type `DoesNotExist` in this scope
   --> $DIR/references-err.rs:14:18
    |
 LL |     type Assoc = DoesNotExist;
@@ -6,4 +6,4 @@ LL |     type Assoc = DoesNotExist;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/glob-conflict-cross-crate-2.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `C` in this scope
+error[E0425]: cannot find type `C` in this scope
   --> $DIR/glob-conflict-cross-crate-2.rs:8:13
    |
 LL |     let _a: C = 1;
@@ -6,4 +6,4 @@ LL |     let _a: C = 1;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/glob-resolve1.stderr

@@ -68,7 +68,7 @@ help: consider importing this function
 LL + use other::import;
    |
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/glob-resolve1.rs:33:11
    |
 LL |     pub enum B {
@@ -83,7 +83,7 @@ note: enum `bar::A` exists but is inaccessible
 LL |     enum A {
    |     ^^^^^^ not accessible
 
-error[E0412]: cannot find type `C` in this scope
+error[E0425]: cannot find type `C` in this scope
   --> $DIR/glob-resolve1.rs:34:11
    |
 LL |     pub enum B {
@@ -98,7 +98,7 @@ note: struct `bar::C` exists but is inaccessible
 LL |     struct C;
    |     ^^^^^^^^^ not accessible
 
-error[E0412]: cannot find type `D` in this scope
+error[E0425]: cannot find type `D` in this scope
   --> $DIR/glob-resolve1.rs:35:11
    |
 LL |     pub enum B {
@@ -115,5 +115,5 @@ LL |     type D = isize;
 
 error: aborting due to 8 previous errors
 
-Some errors have detailed explanations: E0412, E0423, E0425.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.

tests/ui/imports/import-alias-issue-121168.edition2015.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/import-alias-issue-121168.rs:11:12
    |
 LL |     let _: Foo<i32> = todo!();
@@ -11,4 +11,4 @@ LL + use nice_crate_name::Foo;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/import-alias-issue-121168.edition2018.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/import-alias-issue-121168.rs:11:12
    |
 LL |     let _: Foo<i32> = todo!();
@@ -13,4 +13,4 @@ LL + use import_alias_issue_121168_extern::Foo;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/import-alias-issue-121168.edition2021.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/import-alias-issue-121168.rs:11:12
    |
 LL |     let _: Foo<i32> = todo!();
@@ -13,4 +13,4 @@ LL + use import_alias_issue_121168_extern::Foo;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/inaccessible_type_aliases.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/inaccessible_type_aliases.rs:12:12
    |
 LL |     let x: Foo = 100;
@@ -13,7 +13,7 @@ LL |     type Foo = u64;
 LL |     type Foo = u64;
    |     ^^^^^^^^^^^^^^^ `b::Foo`: not accessible
 
-error[E0412]: cannot find type `Bar` in this scope
+error[E0425]: cannot find type `Bar` in this scope
   --> $DIR/inaccessible_type_aliases.rs:13:12
    |
 LL |     let y: Bar = 100;
@@ -27,4 +27,4 @@ LL |     type Bar = u64;
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/imports/issue-4366-2.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Bar` in this scope
+error[E0425]: cannot find type `Bar` in this scope
   --> $DIR/issue-4366-2.rs:16:21
    |
 LL |         fn sub() -> Bar { 1 }
@@ -28,5 +28,5 @@ LL + use foo::foo;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0423.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.

tests/ui/issues/issue-30589.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `DecoderError` in this scope
+error[E0425]: cannot find type `DecoderError` in this scope
   --> $DIR/issue-30589.rs:3:23
    |
 LL | impl fmt::Display for DecoderError {
@@ -6,4 +6,4 @@ LL | impl fmt::Display for DecoderError {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/issues/issue-36836.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Bar` in this scope
+error[E0425]: cannot find type `Bar` in this scope
   --> $DIR/issue-36836.rs:13:17
    |
 LL | impl<T> Foo for Bar<T> {}
@@ -6,4 +6,4 @@ LL | impl<T> Foo for Bar<T> {}
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/layout/cannot-transmute-unnormalizable-type.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/cannot-transmute-unnormalizable-type.rs:7:5
    |
 LL |     Missing: Trait,
@@ -15,5 +15,5 @@ LL |         std::mem::transmute::<Option<()>, Option<&Other>>(None);
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0512.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0512.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/layout/issue-84108.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `OsStr` in this scope
+error[E0425]: cannot find type `OsStr` in this scope
   --> $DIR/issue-84108.rs:6:24
    |
 LL | static FOO: (dyn AsRef<OsStr>, u8) = ("hello", 42);
@@ -9,7 +9,7 @@ help: consider importing this struct
 LL + use std::ffi::OsStr;
    |
 
-error[E0412]: cannot find type `Path` in this scope
+error[E0425]: cannot find type `Path` in this scope
   --> $DIR/issue-84108.rs:9:14
    |
 LL | const BAR: (&Path, [u8], usize) = ("hello", [], 42);
@@ -40,5 +40,5 @@ LL | const BAR: (&Path, [u8], usize) = ("hello", [], 42);
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0277, E0308, E0412.
+Some errors have detailed explanations: E0277, E0308, E0425.
 For more information about an error, try `rustc --explain E0277`.

tests/ui/layout/malformed-unsized-type-in-union.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Missing` in this scope
+error[E0425]: cannot find type `Missing` in this scope
   --> $DIR/malformed-unsized-type-in-union.rs:3:34
    |
 LL | union W { s: dyn Iterator<Item = Missing> }
@@ -18,5 +18,5 @@ LL | union W { s: std::mem::ManuallyDrop<dyn Iterator<Item = Missing>> }
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0740.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0740.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/layout/thaw-transmute-invalid-enum.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Subset` in this scope
+error[E0425]: cannot find type `Subset` in this scope
   --> $DIR/thaw-transmute-invalid-enum.rs:35:41
    |
 LL |     assert::is_transmutable::<Superset, Subset>();
@@ -75,5 +75,5 @@ LL |         a: std::mem::ManuallyDrop<Ox00>,
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0412, E0517, E0658, E0740.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0517, E0658, E0740.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/layout/transmute-to-tail-with-err.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/transmute-to-tail-with-err.rs:3:26
    |
 LL | struct Bar(Box<dyn Trait<T>>);
@@ -20,5 +20,5 @@ LL |     let x: Bar = unsafe { std::mem::transmute(()) };
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0512.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0512.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/lifetimes/elided-lifetime-in-const-param-type.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `c` in this scope
+error[E0425]: cannot find type `c` in this scope
   --> $DIR/elided-lifetime-in-const-param-type.rs:8:27
    |
 LL | type A = dyn for<const B: c(&())> D;
@@ -16,5 +16,5 @@ LL | type A = dyn for<const B: c(&())> D;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0658.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0658.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/lifetimes/issue-83907-invalid-fn-like-path.stderr

@@ -6,7 +6,7 @@ LL | static STATIC_VAR_FIVE: &One();
    |                               |
    |                               help: provide a definition for the static: `= <expr>;`
 
-error[E0412]: cannot find type `One` in this scope
+error[E0425]: cannot find type `One` in this scope
   --> $DIR/issue-83907-invalid-fn-like-path.rs:3:26
    |
 LL | static STATIC_VAR_FIVE: &One();
@@ -14,4 +14,4 @@ LL | static STATIC_VAR_FIVE: &One();
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/lint/issue-35075.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/issue-35075.rs:3:12
    |
 LL |     inner: Foo<T>
@@ -10,7 +10,7 @@ LL -     inner: Foo<T>
 LL +     inner: Baz
    |
 
-error[E0412]: cannot find type `Foo` in this scope
+error[E0425]: cannot find type `Foo` in this scope
   --> $DIR/issue-35075.rs:7:9
    |
 LL |     Foo(Foo<T>)
@@ -24,4 +24,4 @@ LL +     Foo(Baz)
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/lint/recommend-literal.rs

@@ -8,10 +8,10 @@ fn main() {
     //~^ ERROR cannot find type `long` in this scope
     //~| HELP perhaps you intended to use this type
     let v1: Boolean = true;
-    //~^ ERROR: cannot find type `Boolean` in this scope [E0412]
+    //~^ ERROR: cannot find type `Boolean` in this scope [E0425]
     //~| HELP perhaps you intended to use this type
     let v2: Bool = true;
-    //~^ ERROR: cannot find type `Bool` in this scope [E0412]
+    //~^ ERROR: cannot find type `Bool` in this scope [E0425]
     //~| HELP a builtin type with a similar name exists
     //~| HELP perhaps you intended to use this type
 }

tests/ui/lint/recommend-literal.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `double` in this scope
+error[E0425]: cannot find type `double` in this scope
   --> $DIR/recommend-literal.rs:1:13
    |
 LL | type Real = double;
@@ -7,7 +7,7 @@ LL | type Real = double;
    |             not found in this scope
    |             help: perhaps you intended to use this type: `f64`
 
-error[E0412]: cannot find type `long` in this scope
+error[E0425]: cannot find type `long` in this scope
   --> $DIR/recommend-literal.rs:7:12
    |
 LL |     let y: long = 74802374902374923;
@@ -16,7 +16,7 @@ LL |     let y: long = 74802374902374923;
    |            not found in this scope
    |            help: perhaps you intended to use this type: `i64`
 
-error[E0412]: cannot find type `Boolean` in this scope
+error[E0425]: cannot find type `Boolean` in this scope
   --> $DIR/recommend-literal.rs:10:13
    |
 LL |     let v1: Boolean = true;
@@ -25,7 +25,7 @@ LL |     let v1: Boolean = true;
    |             not found in this scope
    |             help: perhaps you intended to use this type: `bool`
 
-error[E0412]: cannot find type `Bool` in this scope
+error[E0425]: cannot find type `Bool` in this scope
   --> $DIR/recommend-literal.rs:13:13
    |
 LL |     let v2: Bool = true;
@@ -42,7 +42,7 @@ LL -     let v2: Bool = true;
 LL +     let v2: bool = true;
    |
 
-error[E0412]: cannot find type `boolean` in this scope
+error[E0425]: cannot find type `boolean` in this scope
   --> $DIR/recommend-literal.rs:19:9
    |
 LL | fn z(a: boolean) {
@@ -51,7 +51,7 @@ LL | fn z(a: boolean) {
    |         not found in this scope
    |         help: perhaps you intended to use this type: `bool`
 
-error[E0412]: cannot find type `byte` in this scope
+error[E0425]: cannot find type `byte` in this scope
   --> $DIR/recommend-literal.rs:24:11
    |
 LL | fn a() -> byte {
@@ -60,7 +60,7 @@ LL | fn a() -> byte {
    |           not found in this scope
    |           help: perhaps you intended to use this type: `u8`
 
-error[E0412]: cannot find type `float` in this scope
+error[E0425]: cannot find type `float` in this scope
   --> $DIR/recommend-literal.rs:31:12
    |
 LL |     width: float,
@@ -69,7 +69,7 @@ LL |     width: float,
    |            not found in this scope
    |            help: perhaps you intended to use this type: `f32`
 
-error[E0412]: cannot find type `int` in this scope
+error[E0425]: cannot find type `int` in this scope
   --> $DIR/recommend-literal.rs:34:19
    |
 LL |     depth: Option<int>,
@@ -85,7 +85,7 @@ help: you might be missing a type parameter
 LL | struct Data<int> {
    |            +++++
 
-error[E0412]: cannot find type `short` in this scope
+error[E0425]: cannot find type `short` in this scope
   --> $DIR/recommend-literal.rs:40:16
    |
 LL | impl Stuff for short {}
@@ -96,4 +96,4 @@ LL | impl Stuff for short {}
 
 error: aborting due to 9 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/lint/use_suggestion_json.stderr

@@ -2,71 +2,67 @@
   "$message_type": "diagnostic",
   "message": "cannot find type `Iter` in this scope",
   "code": {
-    "code": "E0412",
-    "explanation": "A used type name is not in scope.
+    "code": "E0425",
+    "explanation": "An unresolved name was used.
 
 Erroneous code examples:
 
-```compile_fail,E0412
-impl Something {} // error: type name `Something` is not in scope
+```compile_fail,E0425
+something_that_doesnt_exist::foo;
+// error: unresolved name `something_that_doesnt_exist::foo`
 
 // or:
 
 trait Foo {
-    fn bar(N); // error: type name `N` is not in scope
+    fn bar() {
+        Self; // error: unresolved name `Self`
+    }
 }
 
 // or:
 
-fn foo(x: T) {} // type name `T` is not in scope
+let x = unknown_variable;  // error: unresolved name `unknown_variable`
 ```
 
-To fix this error, please verify you didn't misspell the type name, you did
-declare it or imported it into the scope. Examples:
+Please verify that the name wasn't misspelled and ensure that the
+identifier being referred to is valid for the given situation. Example:
 
 ```
-struct Something;
-
-impl Something {} // ok!
-
-// or:
-
-trait Foo {
-    type N;
-
-    fn bar(_: Self::N); // ok!
-}
-
-// or:
-
-fn foo<T>(x: T) {} // ok!
-```
-
-Another case that causes this error is when a type is imported into a parent
-module. To fix this, you can follow the suggestion and use File directly or
-`use super::File;` which will import the types from the parent namespace. An
-example that causes this error is below:
-
-```compile_fail,E0412
-use std::fs::File;
-
-mod foo {
-    fn some_function(f: File) {}
+enum something_that_does_exist {
+    Foo,
 }
 ```
 
-```
-use std::fs::File;
+Or:
 
-mod foo {
-    // either
-    use super::File;
-    // or
-    // use std::fs::File;
-    fn foo(f: File) {}
-}
-# fn main() {} // don't insert it for us; that'll break imports
 ```
+mod something_that_does_exist {
+    pub static foo : i32 = 0i32;
+}
+
+something_that_does_exist::foo; // ok!
+```
+
+Or:
+
+```
+let unknown_variable = 12u32;
+let x = unknown_variable; // ok!
+```
+
+If the item is not defined in the current module, it must be imported using a
+`use` statement, like so:
+
+```
+# mod foo { pub fn bar() {} }
+# fn main() {
+use foo::bar;
+bar();
+# }
+```
+
+If the item you are importing is not defined in some super-module of the
+current module, then it must also be declared as public (e.g., `pub fn`).
 "
   },
   "level": "error",
@@ -403,7 +399,7 @@ mod foo {
       "rendered": null
     }
   ],
-  "rendered": "\u001b[1m\u001b[91merror[E0412]\u001b[0m\u001b[1m: cannot find type `Iter` in this scope\u001b[0m
+  "rendered": "\u001b[1m\u001b[91merror[E0425]\u001b[0m\u001b[1m: cannot find type `Iter` in this scope\u001b[0m
   \u001b[1m\u001b[94m--> \u001b[0m$DIR/use_suggestion_json.rs:13:12
    \u001b[1m\u001b[94m|\u001b[0m
 \u001b[1m\u001b[94mLL\u001b[0m \u001b[1m\u001b[94m|\u001b[0m     let x: Iter;
@@ -436,11 +432,11 @@ mod foo {
 }
 {
   "$message_type": "diagnostic",
-  "message": "For more information about this error, try `rustc --explain E0412`.",
+  "message": "For more information about this error, try `rustc --explain E0425`.",
   "code": null,
   "level": "failure-note",
   "spans": [],
   "children": [],
-  "rendered": "\u001b[1mFor more information about this error, try `rustc --explain E0412`.\u001b[0m
+  "rendered": "\u001b[1mFor more information about this error, try `rustc --explain E0425`.\u001b[0m
 "
 }

tests/ui/macros/macro-context.stderr

@@ -42,7 +42,7 @@ LL |     m!();
    |
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0412]: cannot find type `i` in this scope
+error[E0425]: cannot find type `i` in this scope
   --> $DIR/macro-context.rs:3:13
    |
 LL |     () => ( i ; typeof );
@@ -80,8 +80,7 @@ LL |     let i = m!();
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.
 Future incompatibility report: Future breakage diagnostic:
 error: trailing semicolon in macro used in expression position
   --> $DIR/macro-context.rs:3:15

tests/ui/match/issue-82866.stderr

@@ -4,7 +4,7 @@ error[E0425]: cannot find value `x` in this scope
 LL |     match x {
    |           ^ not found in this scope
 
-error[E0412]: cannot find type `v` in this scope
+error[E0425]: cannot find type `v` in this scope
   --> $DIR/issue-82866.rs:4:16
    |
 LL |         Some::<v>(v) => (),
@@ -12,5 +12,4 @@ LL |         Some::<v>(v) => (),
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0425.
-For more information about an error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/mir/gvn-nonsensical-coroutine-layout.rs

@@ -4,7 +4,7 @@
 
 pub enum Request {
     TestSome(T),
-    //~^ ERROR cannot find type `T` in this scope [E0412]
+    //~^ ERROR cannot find type `T` in this scope [E0425]
 }
 
 pub async fn handle_event(event: Request) {

tests/ui/mir/gvn-nonsensical-coroutine-layout.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/gvn-nonsensical-coroutine-layout.rs:6:14
    |
 LL |     TestSome(T),
@@ -22,5 +22,5 @@ LL + use std::error::Request;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0412, E0574.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0574.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/mir/issue-83499-input-output-iteration-ice.stderr

@@ -4,7 +4,7 @@ error: at least one trait must be specified
 LL | unsafe extern "C" fn foo(_: Bar, _: ...) -> impl {}
    |                                             ^^^^
 
-error[E0412]: cannot find type `Bar` in this scope
+error[E0425]: cannot find type `Bar` in this scope
   --> $DIR/issue-83499-input-output-iteration-ice.rs:7:29
    |
 LL | unsafe extern "C" fn foo(_: Bar, _: ...) -> impl {}
@@ -12,4 +12,4 @@ LL | unsafe extern "C" fn foo(_: Bar, _: ...) -> impl {}
 
 error: aborting due to 2 previous errors
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/mir/meaningless-bound.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `b` in this scope
+error[E0425]: cannot find type `b` in this scope
   --> $DIR/meaningless-bound.rs:6:5
    |
 LL |     b: Sized,
@@ -15,5 +15,5 @@ LL |     Self: Sized,
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0411, E0412.
+Some errors have detailed explanations: E0411, E0425.
 For more information about an error, try `rustc --explain E0411`.

tests/ui/mir/mir-build-2021-closure-capture-ice-110453-1.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `B` in this scope
+error[E0425]: cannot find type `B` in this scope
   --> $DIR/mir-build-2021-closure-capture-ice-110453-1.rs:12:18
    |
 LL |     pub struct C(B);
@@ -11,4 +11,4 @@ LL +     use crate::B;
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/mir/mir-build-2021-closure-capture-ice-110453-2.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `as_str` in this scope
+error[E0425]: cannot find type `as_str` in this scope
   --> $DIR/mir-build-2021-closure-capture-ice-110453-2.rs:8:47
    |
 LL | pub fn dup(f: impl Fn(i32) -> i32) -> impl Fn(as_str) -> i32 {
@@ -6,4 +6,4 @@ LL | pub fn dup(f: impl Fn(i32) -> i32) -> impl Fn(as_str) -> i32 {
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0412`.
+For more information about this error, try `rustc --explain E0425`.

tests/ui/missing/missing-items/missing-type-parameter2.stderr

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `N` in this scope
+error[E0425]: cannot find type `N` in this scope
   --> $DIR/missing-type-parameter2.rs:3:8
    |
 LL | struct X<const N: u8>();
@@ -17,7 +17,7 @@ help: you might be missing a type parameter
 LL | impl<N> X<N> {}
    |     +++
 
-error[E0412]: cannot find type `N` in this scope
+error[E0425]: cannot find type `N` in this scope
   --> $DIR/missing-type-parameter2.rs:6:28
    |
 LL | impl<T, const A: u8 = 2> X<N> {}
@@ -35,7 +35,7 @@ help: you might be missing a type parameter
 LL | impl<T, const A: u8 = 2, N> X<N> {}
    |                        +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/missing-type-parameter2.rs:11:20
    |
 LL | struct X<const N: u8>();
@@ -54,7 +54,7 @@ help: you might be missing a type parameter
 LL | fn foo<T>(_: T) where T: Send {}
    |       +++
 
-error[E0412]: cannot find type `T` in this scope
+error[E0425]: cannot find type `T` in this scope
   --> $DIR/missing-type-parameter2.rs:11:11
    |
 LL | struct X<const N: u8>();
@@ -73,7 +73,7 @@ help: you might be missing a type parameter
 LL | fn foo<T>(_: T) where T: Send {}
    |       +++
 
-error[E0412]: cannot find type `A` in this scope
+error[E0425]: cannot find type `A` in this scope
   --> $DIR/missing-type-parameter2.rs:15:24
    |
 LL | struct X<const N: u8>();
@@ -122,5 +122,5 @@ LL | impl<T, const A: u8 = 2> X<{ N }> {}
 
 error: aborting due to 8 previous errors
 
-Some errors have detailed explanations: E0412, E0747.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0747.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/offset-of/offset-of-enum.stderr

@@ -7,7 +7,7 @@ LL |     offset_of!(Alpha::One, 0);
    |                not a type
    |                help: try using the variant's enum: `Alpha`
 
-error[E0412]: cannot find type `Beta` in this scope
+error[E0425]: cannot find type `Beta` in this scope
   --> $DIR/offset-of-enum.rs:18:16
    |
 LL |     offset_of!(Beta, One);
@@ -43,5 +43,5 @@ LL |     offset_of!(Alpha, NonExistent);
 
 error: aborting due to 6 previous errors
 
-Some errors have detailed explanations: E0412, E0573, E0599, E0609, E0795.
-For more information about an error, try `rustc --explain E0412`.
+Some errors have detailed explanations: E0425, E0573, E0599, E0609, E0795.
+For more information about an error, try `rustc --explain E0425`.

tests/ui/offset-of/offset-of-self.stderr

@@ -4,7 +4,7 @@ error: offset_of expects dot-separated field and variant names
 LL |         offset_of!(Self, Self::v);
    |                          ^^^^^^^
 
-error[E0412]: cannot find type `S` in module `self`
+error[E0425]: cannot find type `S` in module `self`
   --> $DIR/offset-of-self.rs:33:26
    |
 LL |         offset_of!(self::S, v);
@@ -59,5 +59,5 @@ LL |     offset_of!(S, v.self);
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0411, E0412, E0609, E0616.
+Some errors have detailed explanations: E0411, E0425, E0609, E0616.
 For more information about an error, try `rustc --explain E0411`.

tests/ui/parallel-rustc/ty-variance-issue-124423.stderr

@@ -237,7 +237,7 @@ help: consider introducing lifetime `'a` here
 LL | fn elided4<'a>(_: &impl Copy + 'a) ->  new  { x(x) }
    |           ++++
 
-error[E0412]: cannot find type `new` in this scope
+error[E0425]: cannot find type `new` in this scope
   --> $DIR/ty-variance-issue-124423.rs:48:36
    |
 LL | fn elided4(_: &impl Copy + 'a) ->  new  { x(x) }
@@ -282,5 +282,5 @@ note: if you're trying to build a new `Box<_, _>` consider using one of the foll
 
 error: aborting due to 30 previous errors
 
-Some errors have detailed explanations: E0121, E0224, E0261, E0412, E0599.
-For more information about an error, try `rustc --explain E0121`.
+Some errors have detailed explanations: E0121, E0224, E0261, E0425, E0599.
+For more information about an error, try `rustc --explain E0121`.