fixing errors

xonx4l · xonx4l · commit b6cb948e8bb6 · 2025-11-07T23:32:49.000Z
diff --git a/compiler/rustc_error_codes/src/error_codes/E0412.md b/compiler/rustc_error_codes/src/error_codes/E0412.md
@@ -1,5 +1,6 @@
 This error code is no longer emitted by the compiler.
 
-Unresolved types are now reported under the unified error code E0425 ("cannot find ... in this scope").
+Unresolved types are now reported under the unified error code E0425
+("cannot find ... in this scope").
 
 See the explanation for E0425 for guidance on common causes and fixes.
diff --git a/tests/ui/argument-suggestions/issue-109831.stderr b/tests/ui/argument-suggestions/issue-109831.stderr
@@ -48,5 +48,5 @@ LL +     f(/* B */, /* B */, B);
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0061, E0425, E0425.
+Some errors have detailed explanations: E0061, E0425.
 For more information about an error, try `rustc --explain E0061`.
diff --git a/tests/ui/associated-consts/issue-93835.stderr b/tests/ui/associated-consts/issue-93835.stderr
@@ -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, E0425, E0425, E0658.
+Some errors have detailed explanations: E0405, E0425, E0658.
 For more information about an error, try `rustc --explain E0405`.
diff --git a/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr b/tests/ui/const-generics/early/const_arg_trivial_macro_expansion-2.stderr
@@ -32,5 +32,4 @@ LL | const _<const x: /* Type */>: A<
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr b/tests/ui/const-generics/generic_const_exprs/unevaluated-const-ice-119731.stderr
@@ -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: E0425, E0422, E0425, E0432, E0592.
-For more information about an error, try `rustc --explain E0425`.
+Some errors have detailed explanations: E0422, E0425, E0432, E0592.
+For more information about an error, try `rustc --explain E0422`.
diff --git a/tests/ui/const-generics/parent_generics_of_nested_in_default.stderr b/tests/ui/const-generics/parent_generics_of_nested_in_default.stderr
@@ -20,5 +20,4 @@ LL | impl<const A: i32 = { || [0; B] }> Tr {}
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr b/tests/ui/did_you_mean/issue-56028-there-is-an-enum-variant.stderr
@@ -40,5 +40,4 @@ LL + use PutDown::Set;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/error-codes/E0412.stderr b/tests/ui/error-codes/E0412.stderr
@@ -1,5 +1,5 @@
 error[E0425]: cannot find type `Something` in this scope
-  --> $DIR/E0425.rs:1:6
+  --> $DIR/E0412.rs:1:6
    |
 LL | impl Something {}
    |      ^^^^^^^^^ not found in this scope
diff --git a/tests/ui/imports/glob-resolve1.stderr b/tests/ui/imports/glob-resolve1.stderr
@@ -115,5 +115,5 @@ LL |     type D = isize;
 
 error: aborting due to 8 previous errors
 
-Some errors have detailed explanations: E0425, E0423, E0425.
-For more information about an error, try `rustc --explain E0425`.
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/tests/ui/imports/issue-4366-2.stderr b/tests/ui/imports/issue-4366-2.stderr
@@ -28,5 +28,5 @@ LL + use foo::foo;
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0425, E0423.
-For more information about an error, try `rustc --explain E0425`.
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/tests/ui/lint/use_suggestion_json.stderr b/tests/ui/lint/use_suggestion_json.stderr
@@ -3,70 +3,66 @@
   "message": "cannot find type `Iter` in this scope",
   "code": {
     "code": "E0425",
-    "explanation": "A used type name is not in scope.
+    "explanation": "An unresolved name was used.
 
 Erroneous code examples:
 
 ```compile_fail,E0425
-impl Something {} // error: type name `Something` is not in scope
+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!
+enum something_that_does_exist {
+    Foo,
 }
+```
 
-// or:
+Or:
 
-fn foo<T>(x: T) {} // ok!
 ```
+mod something_that_does_exist {
+    pub static foo : i32 = 0i32;
+}
 
-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:
+something_that_does_exist::foo; // ok!
+```
 
-```compile_fail,E0425
-use std::fs::File;
+Or:
 
-mod foo {
-    fn some_function(f: File) {}
-}
 ```
-
+let unknown_variable = 12u32;
+let x = unknown_variable; // ok!
 ```
-use std::fs::File;
 
-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
+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",
diff --git a/tests/ui/macros/macro-context.stderr b/tests/ui/macros/macro-context.stderr
@@ -80,8 +80,7 @@ LL |     let i = m!();
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+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
diff --git a/tests/ui/match/issue-82866.stderr b/tests/ui/match/issue-82866.stderr
@@ -12,5 +12,4 @@ LL |         Some::<v>(v) => (),
 
 error: aborting due to 2 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/parser/unmatched-langle-1.stderr b/tests/ui/parser/unmatched-langle-1.stderr
@@ -24,5 +24,4 @@ LL |     foo::<<<<Ty<i32>>();
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/privacy/privacy-ns1.stderr b/tests/ui/privacy/privacy-ns1.stderr
@@ -90,5 +90,5 @@ LL |     let _x: Box<Bar>;
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0425, E0423, E0425, E0747.
-For more information about an error, try `rustc --explain E0425`.
+Some errors have detailed explanations: E0423, E0425, E0747.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/tests/ui/privacy/sysroot-private.default.stderr b/tests/ui/privacy/sysroot-private.default.stderr
@@ -36,5 +36,5 @@ LL |     memchr2(b'a', b'b', buf)
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0220, E0405, E0425, E0425.
+Some errors have detailed explanations: E0220, E0405, E0425.
 For more information about an error, try `rustc --explain E0220`.
diff --git a/tests/ui/privacy/sysroot-private.rustc_private_enabled.stderr b/tests/ui/privacy/sysroot-private.rustc_private_enabled.stderr
@@ -36,5 +36,5 @@ LL |     memchr2(b'a', b'b', buf)
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0220, E0405, E0425, E0425.
+Some errors have detailed explanations: E0220, E0405, E0425.
 For more information about an error, try `rustc --explain E0220`.
diff --git a/tests/ui/proc-macro/mixed-site-span.stderr b/tests/ui/proc-macro/mixed-site-span.stderr
@@ -604,5 +604,5 @@ LL |         local_def;
 
 error: aborting due to 52 previous errors
 
-Some errors have detailed explanations: E0425, E0425, E0426, E0432.
+Some errors have detailed explanations: E0425, E0426, E0432.
 For more information about an error, try `rustc --explain E0425`.
diff --git a/tests/ui/proc-macro/span-from-proc-macro.stderr b/tests/ui/proc-macro/span-from-proc-macro.stderr
@@ -58,5 +58,5 @@ LL |     error_from_bang!();
 
 error: aborting due to 4 previous errors
 
-Some errors have detailed explanations: E0308, E0425, E0425.
+Some errors have detailed explanations: E0308, E0425.
 For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/resolve/issue-35675.stderr b/tests/ui/resolve/issue-35675.stderr
@@ -73,5 +73,5 @@ LL | fn qux() -> Some {
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0425, E0425, E0573.
+Some errors have detailed explanations: E0425, E0573.
 For more information about an error, try `rustc --explain E0425`.
diff --git a/tests/ui/resolve/levenshtein.stderr b/tests/ui/resolve/levenshtein.stderr
@@ -67,5 +67,4 @@ LL |     foobar(); // Misspelled function name.
 
 error: aborting due to 8 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/resolve/privacy-enum-ctor.stderr b/tests/ui/resolve/privacy-enum-ctor.stderr
@@ -433,5 +433,5 @@ LL |     let _: Z = m::n::Z::Struct { s: /* value */ };
 
 error: aborting due to 23 previous errors
 
-Some errors have detailed explanations: E0308, E0425, E0423, E0533, E0603, E0618.
+Some errors have detailed explanations: E0308, E0423, E0425, E0533, E0603, E0618.
 For more information about an error, try `rustc --explain E0308`.
diff --git a/tests/ui/resolve/resolve-assoc-suggestions.stderr b/tests/ui/resolve/resolve-assoc-suggestions.stderr
@@ -69,5 +69,5 @@ LL |         self.method;
 
 error: aborting due to 9 previous errors
 
-Some errors have detailed explanations: E0425, E0425, E0531.
+Some errors have detailed explanations: E0425, E0531.
 For more information about an error, try `rustc --explain E0425`.
diff --git a/tests/ui/resolve/resolve-primitive-fallback.stderr b/tests/ui/resolve/resolve-primitive-fallback.stderr
@@ -36,5 +36,5 @@ LL +     std::mem::size_of();
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0061, E0425, E0423.
+Some errors have detailed explanations: E0061, E0423, E0425.
 For more information about an error, try `rustc --explain E0061`.
diff --git a/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
@@ -101,5 +101,4 @@ LL +         ba();
 
 error: aborting due to 7 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/resolve/use_suggestion_placement.stderr b/tests/ui/resolve/use_suggestion_placement.stderr
@@ -33,5 +33,4 @@ LL + use std::collections::HashMap;
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0425, E0425.
-For more information about an error, try `rustc --explain E0425`.
+For more information about this error, try `rustc --explain E0425`.
diff --git a/tests/ui/type/type-path-err-node-types.stderr b/tests/ui/type/type-path-err-node-types.stderr
@@ -35,5 +35,5 @@ LL |     let _ = |a: /* Type */, b: _| -> _ { 0 };
 
 error: aborting due to 5 previous errors
 
-Some errors have detailed explanations: E0282, E0425, E0425, E0433, E0576.
+Some errors have detailed explanations: E0282, E0425, E0433, E0576.
 For more information about an error, try `rustc --explain E0282`.

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0425]: cannot find type `Something` in this scope
`2`		`- --> $DIR/E0425.rs:1:6`
	`2`	`+ --> $DIR/E0412.rs:1:6`
`3`	`3`	`\|`
`4`	`4`	`LL \| impl Something {}`
`5`	`5`	`\| ^^^^^^^^^ not found in this scope`