Auto merge of rust-lang#126810 - estebank:resolve-error-wording, r=Bo…

…xyUwU Remove redundancy in resolve error between main message and primary label ``` error[E0576]: cannot find method or associated constant `BAR` --> $DIR/issue-87638.rs:20:27 | LL | let _ = <S as Trait>::BAR; | ^^^ not found in trait `Trait` ``` instead of ``` error[E0576]: cannot find method or associated constant `BAR` in trait `Trait` --> $DIR/issue-87638.rs:20:27 | LL | let _ = <S as Trait>::BAR; | ^^^ not found in `Trait` ``` The general rule is that the primary span label should work well on its own (suitable to be shown in editors), while the main message provides additional context of the general case. When using `--error-format=short`, we will concatenate the main message and the primary labels, so they should be complementary.
rust-lang-ci · Jun 23, 2024 · 84e6a0c · 84e6a0c
2 parents bcf94de + 1e450c7
commit 84e6a0c
Show file tree

Hide file tree

Showing 736 changed files with 1,572 additions and 1,572 deletions.
diff --git a/compiler/rustc_resolve/src/late/diagnostics.rs b/compiler/rustc_resolve/src/late/diagnostics.rs
@@ -347,11 +347,11 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                     } else {
                         suggestion
                     };
-                (format!("not found in {mod_str}"), override_suggestion)
+                (format!("not found in {mod_prefix}{mod_str}"), override_suggestion)
             };
 
             BaseError {
-                msg: format!("cannot find {expected} `{item_str}` in {mod_prefix}{mod_str}"),
+                msg: format!("cannot find {expected} `{item_str}`"),
                 fallback_label,
                 span: item_span,
                 span_label,

diff --git a/src/tools/clippy/tests/ui/crashes/ice-6252.stderr b/src/tools/clippy/tests/ui/crashes/ice-6252.stderr
@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `PhantomData` in this scope
+error[E0412]: cannot find type `PhantomData`
   --> 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[E0412]: cannot find type `VAL`
   --> tests/ui/crashes/ice-6252.rs:11:63
    |
 LL | impl<N, M> TypeVal<usize> for Multiply<N, M> where N: TypeVal<VAL> {}

diff --git a/src/tools/clippy/tests/ui/option_map_unit_fn_unfixable.stderr b/src/tools/clippy/tests/ui/option_map_unit_fn_unfixable.stderr
@@ -1,22 +1,22 @@
-error[E0425]: cannot find value `x` in this scope
+error[E0425]: cannot find value `x`
   --> tests/ui/option_map_unit_fn_unfixable.rs:17:5
    |
 LL |     x.field.map(|value| { do_nothing(value); do_nothing(value) });
    |     ^ not found in this scope
 
-error[E0425]: cannot find value `x` in this scope
+error[E0425]: cannot find value `x`
   --> tests/ui/option_map_unit_fn_unfixable.rs:19:5
    |
 LL |     x.field.map(|value| if value > 0 { do_nothing(value); do_nothing(value) });
    |     ^ not found in this scope
 
-error[E0425]: cannot find value `x` in this scope
+error[E0425]: cannot find value `x`
   --> tests/ui/option_map_unit_fn_unfixable.rs:23:5
    |
 LL |     x.field.map(|value| {
    |     ^ not found in this scope
 
-error[E0425]: cannot find value `x` in this scope
+error[E0425]: cannot find value `x`
   --> tests/ui/option_map_unit_fn_unfixable.rs:27:5
    |
 LL |     x.field.map(|value| { do_nothing(value); do_nothing(value); });

diff --git a/tests/rustdoc-ui/doctest/failed-doctest-output.stdout b/tests/rustdoc-ui/doctest/failed-doctest-output.stdout
@@ -6,7 +6,7 @@ test $DIR/failed-doctest-output.rs - SomeStruct (line 15) ... FAILED
 failures:
 
 ---- $DIR/failed-doctest-output.rs - OtherStruct (line 25) stdout ----
-error[E0425]: cannot find value `no` in this scope
+error[E0425]: cannot find value `no`
   --> $DIR/failed-doctest-output.rs:26:1
    |
 LL | no

diff --git a/tests/rustdoc-ui/impl-fn-nesting.rs b/tests/rustdoc-ui/impl-fn-nesting.rs
@@ -9,28 +9,28 @@ pub trait NeedsBody {
 
 /// This function has docs
 pub fn f<B: UnknownBound>(a: UnknownType, b: B) {
-//~^ ERROR cannot find trait `UnknownBound` in this scope
-//~| ERROR cannot find type `UnknownType` in this scope
+//~^ ERROR cannot find trait `UnknownBound`
+//~| ERROR cannot find type `UnknownType`
     impl UnknownTrait for ValidType {} //~ ERROR cannot find trait `UnknownTrait`
     impl<T: UnknownBound> UnknownTrait for T {}
-    //~^ ERROR cannot find trait `UnknownBound` in this scope
-    //~| ERROR cannot find trait `UnknownTrait` in this scope
+    //~^ ERROR cannot find trait `UnknownBound`
+    //~| ERROR cannot find trait `UnknownTrait`
     impl ValidTrait for UnknownType {}
-    //~^ ERROR cannot find type `UnknownType` in this scope
+    //~^ ERROR cannot find type `UnknownType`
     impl ValidTrait for ValidType where ValidTrait: UnknownBound {}
-    //~^ ERROR cannot find trait `UnknownBound` in this scope
+    //~^ ERROR cannot find trait `UnknownBound`
 
     /// This impl has documentation
     impl NeedsBody for ValidType {
         type Item = UnknownType;
-        //~^ ERROR cannot find type `UnknownType` in this scope
+        //~^ ERROR cannot find type `UnknownType`
 
         /// This function has documentation
         fn f() {
             <UnknownTypeShouldBeIgnored>::a();
             content::shouldnt::matter();
             unknown_macro!();
-            //~^ ERROR cannot find macro `unknown_macro` in this scope
+            //~^ ERROR cannot find macro `unknown_macro`
 
             /// This is documentation for a macro
             macro_rules! can_define_macros_here_too {
@@ -42,7 +42,7 @@ pub fn f<B: UnknownBound>(a: UnknownType, b: B) {
 
             /// This also is documented.
             pub fn doubly_nested(c: UnknownType) {
-            //~^ ERROR cannot find type `UnknownType` in this scope
+            //~^ ERROR cannot find type `UnknownType`
             }
         }
     }

diff --git a/tests/rustdoc-ui/impl-fn-nesting.stderr b/tests/rustdoc-ui/impl-fn-nesting.stderr
@@ -4,55 +4,55 @@ error: cannot find macro `unknown_macro` in this scope
 LL |             unknown_macro!();
    |             ^^^^^^^^^^^^^
 
-error[E0405]: cannot find trait `UnknownBound` in this scope
+error[E0405]: cannot find trait `UnknownBound`
   --> $DIR/impl-fn-nesting.rs:11:13
    |
 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[E0412]: cannot find type `UnknownType`
   --> $DIR/impl-fn-nesting.rs:11:30
    |
 LL | pub fn f<B: UnknownBound>(a: UnknownType, b: B) {
    |                              ^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownTrait` in this scope
+error[E0405]: cannot find trait `UnknownTrait`
   --> $DIR/impl-fn-nesting.rs:14:10
    |
 LL |     impl UnknownTrait for ValidType {}
    |          ^^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownTrait` in this scope
+error[E0405]: cannot find trait `UnknownTrait`
   --> $DIR/impl-fn-nesting.rs:15:27
    |
 LL |     impl<T: UnknownBound> UnknownTrait for T {}
    |                           ^^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownBound` in this scope
+error[E0405]: cannot find trait `UnknownBound`
   --> $DIR/impl-fn-nesting.rs:15:13
    |
 LL |     impl<T: UnknownBound> UnknownTrait for T {}
    |             ^^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0412]: cannot find type `UnknownType`
   --> $DIR/impl-fn-nesting.rs:18:25
    |
 LL |     impl ValidTrait for UnknownType {}
    |                         ^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownBound` in this scope
+error[E0405]: cannot find trait `UnknownBound`
   --> $DIR/impl-fn-nesting.rs:20:53
    |
 LL |     impl ValidTrait for ValidType where ValidTrait: UnknownBound {}
    |                                                     ^^^^^^^^^^^^ not found in this scope
 
-error[E0412]: cannot find type `UnknownType` in this scope
+error[E0412]: cannot find type `UnknownType`
   --> $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[E0412]: cannot find type `UnknownType`
   --> $DIR/impl-fn-nesting.rs:44:37
    |
 LL |             pub fn doubly_nested(c: UnknownType) {

diff --git a/tests/rustdoc-ui/issues/issue-81662-shortness.rs b/tests/rustdoc-ui/issues/issue-81662-shortness.rs
@@ -1,6 +1,6 @@
 //@ compile-flags:--test --error-format=short
 //@ check-stdout
-//@ error-pattern:cannot find function `foo` in this scope
+//@ error-pattern:cannot find function `foo`
 //@ normalize-stdout-test: "tests/rustdoc-ui/issues" -> "$$DIR"
 //@ normalize-stdout-test "finished in \d+\.\d+s" -> "finished in $$TIME"
 //@ failure-status: 101

diff --git a/tests/rustdoc-ui/issues/issue-81662-shortness.stdout b/tests/rustdoc-ui/issues/issue-81662-shortness.stdout
@@ -5,7 +5,7 @@ test $DIR/issue-81662-shortness.rs - foo (line 8) ... FAILED
 failures:
 
 ---- $DIR/issue-81662-shortness.rs - foo (line 8) stdout ----
-$DIR/issue-81662-shortness.rs:9:1: error[E0425]: cannot find function `foo` in this scope
+$DIR/issue-81662-shortness.rs:9:1: error[E0425]: cannot find function `foo`
 error: aborting due to 1 previous error
 Couldn't compile the test.
 

diff --git a/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.rs
@@ -73,7 +73,7 @@ struct InvalidLitNestedAttr {}
 
 #[derive(Diagnostic)]
 #[diag(nonsense, code = E0123)]
-//~^ ERROR cannot find value `nonsense` in module `crate::fluent_generated`
+//~^ ERROR cannot find value `nonsense`
 struct InvalidNestedStructAttr {}
 
 #[derive(Diagnostic)]
@@ -805,7 +805,7 @@ struct SuggestionsInvalidItem {
     sub: Span,
 }
 
-#[derive(Diagnostic)] //~ ERROR cannot find value `__code_34` in this scope
+#[derive(Diagnostic)] //~ ERROR cannot find value `__code_34`
 #[diag(no_crate_example)]
 struct SuggestionsInvalidLiteral {
     #[suggestion(code = 3)]

diff --git a/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr b/tests/ui-fulldeps/session-diagnostic/diagnostic-derive.stderr
@@ -596,13 +596,13 @@ error: cannot find attribute `multipart_suggestion` in this scope
 LL |     #[multipart_suggestion(no_crate_suggestion)]
    |       ^^^^^^^^^^^^^^^^^^^^
 
-error[E0425]: cannot find value `nonsense` in module `crate::fluent_generated`
+error[E0425]: cannot find value `nonsense`
   --> $DIR/diagnostic-derive.rs:75:8
    |
 LL | #[diag(nonsense, code = E0123)]
-   |        ^^^^^^^^ not found in `crate::fluent_generated`
+   |        ^^^^^^^^ not found in module `crate::fluent_generated`
 
-error[E0425]: cannot find value `__code_34` in this scope
+error[E0425]: cannot find value `__code_34`
   --> $DIR/diagnostic-derive.rs:808:10
    |
 LL | #[derive(Diagnostic)]

diff --git a/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.rs
@@ -66,7 +66,7 @@ struct D {
 #[derive(Subdiagnostic)]
 #[foo]
 //~^ ERROR `#[foo]` is not a valid attribute
-//~^^ ERROR cannot find attribute `foo` in this scope
+//~^^ ERROR cannot find attribute `foo`
 struct E {
     #[primary_span]
     span: Span,
@@ -124,8 +124,8 @@ struct K {
 
 #[derive(Subdiagnostic)]
 #[label(slug)]
-//~^ ERROR cannot find value `slug` in module `crate::fluent_generated`
-//~^^ NOTE not found in `crate::fluent_generated`
+//~^ ERROR cannot find value `slug`
+//~^^ NOTE not found in module `crate::fluent_generated`
 struct L {
     #[primary_span]
     span: Span,
@@ -712,7 +712,7 @@ struct BP {
 }
 
 #[derive(Subdiagnostic)]
-//~^ ERROR cannot find value `__code_29` in this scope
+//~^ ERROR cannot find value `__code_29`
 //~| NOTE in this expansion
 //~| NOTE not found in this scope
 #[multipart_suggestion(no_crate_example)]

diff --git a/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr b/tests/ui-fulldeps/session-diagnostic/subdiagnostic-derive.stderr
@@ -553,13 +553,13 @@ error: cannot find attribute `bar` in this scope
 LL |     #[bar("...")]
    |       ^^^
 
-error[E0425]: cannot find value `slug` in module `crate::fluent_generated`
+error[E0425]: cannot find value `slug`
   --> $DIR/subdiagnostic-derive.rs:126:9
    |
 LL | #[label(slug)]
-   |         ^^^^ not found in `crate::fluent_generated`
+   |         ^^^^ not found in module `crate::fluent_generated`
 
-error[E0425]: cannot find value `__code_29` in this scope
+error[E0425]: cannot find value `__code_29`
   --> $DIR/subdiagnostic-derive.rs:714:10
    |
 LL | #[derive(Subdiagnostic)]

diff --git a/tests/ui/annotate-snippet/missing-type.rs b/tests/ui/annotate-snippet/missing-type.rs
@@ -1,5 +1,5 @@
 //@ compile-flags: --error-format human-annotate-rs -Z unstable-options
-//@ error-pattern:cannot find type `Iter` in this scope
+//@ error-pattern:cannot find type `Iter`
 
 pub fn main() {
     let x: Iter;

diff --git a/tests/ui/annotate-snippet/missing-type.stderr b/tests/ui/annotate-snippet/missing-type.stderr
@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Iter` in this scope
+error[E0412]: cannot find type `Iter`
   --> $DIR/missing-type.rs:5:12
    |
 LL |     let x: Iter;

diff --git a/tests/ui/argument-suggestions/extern-fn-arg-names.rs b/tests/ui/argument-suggestions/extern-fn-arg-names.rs
@@ -1,6 +1,6 @@
 extern "Rust" {
     fn dstfn(src: i32, dst: err);
-    //~^ ERROR cannot find type `err` in this scope
+    //~^ ERROR cannot find type `err`
 }
 
 fn main() {

diff --git a/tests/ui/argument-suggestions/extern-fn-arg-names.stderr b/tests/ui/argument-suggestions/extern-fn-arg-names.stderr
@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `err` in this scope
+error[E0412]: cannot find type `err`
   --> $DIR/extern-fn-arg-names.rs:2:29
    |
 LL |     fn dstfn(src: i32, dst: err);

diff --git a/tests/ui/argument-suggestions/issue-109831.stderr b/tests/ui/argument-suggestions/issue-109831.stderr
@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `C` in this scope
+error[E0412]: cannot find type `C`
   --> $DIR/issue-109831.rs:4:24
    |
 LL | struct A;
@@ -16,7 +16,7 @@ help: you might be missing a type parameter
 LL | fn f<C>(b1: B, b2: B, a2: C) {}
    |     +++
 
-error[E0425]: cannot find value `C` in this scope
+error[E0425]: cannot find value `C`
   --> $DIR/issue-109831.rs:7:16
    |
 LL | struct A;

diff --git a/tests/ui/array-slice-vec/slice-pat-type-mismatches.rs b/tests/ui/array-slice-vec/slice-pat-type-mismatches.rs
@@ -24,8 +24,8 @@ fn main() {
     };
 
     match does_not_exist {
-        //~^ ERROR cannot find value `does_not_exist` in this scope
-        [] => {} // ERROR cannot find value `does_not_exist` in this scope
+        //~^ ERROR cannot find value `does_not_exist`
+        [] => {} // ERROR cannot find value `does_not_exist`
     };
 }
 

diff --git a/tests/ui/array-slice-vec/slice-pat-type-mismatches.stderr b/tests/ui/array-slice-vec/slice-pat-type-mismatches.stderr
@@ -1,4 +1,4 @@
-error[E0425]: cannot find value `does_not_exist` in this scope
+error[E0425]: cannot find value `does_not_exist`
   --> $DIR/slice-pat-type-mismatches.rs:26:11
    |
 LL |     match does_not_exist {

diff --git a/tests/ui/asm/issue-113788.rs b/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` [E0412]
     unsafe { std::arch::asm!("mov {0}, fs:[0x30]", out(reg) peb); }
 }
diff --git a/tests/ui/asm/issue-113788.stderr b/tests/ui/asm/issue-113788.stderr
@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `PEB` in this scope
+error[E0412]: cannot find type `PEB`
   --> $DIR/issue-113788.rs:5:21
    |
 LL |     let peb: *const PEB;

diff --git a/tests/ui/associated-consts/issue-93835.rs b/tests/ui/associated-consts/issue-93835.rs
@@ -2,10 +2,10 @@
 
 fn e() {
     type_ascribe!(p, a<p:p<e=6>>);
-    //~^ ERROR cannot find type `a` in this scope
+    //~^ ERROR cannot find type `a`
     //~| ERROR cannot find value
     //~| ERROR associated const equality
-    //~| ERROR cannot find trait `p` in this scope
+    //~| ERROR cannot find trait `p`
 }
 
 fn main() {}
diff --git a/tests/ui/associated-consts/issue-93835.stderr b/tests/ui/associated-consts/issue-93835.stderr
@@ -1,16 +1,16 @@
-error[E0425]: cannot find value `p` in this scope
+error[E0425]: cannot find value `p`
   --> $DIR/issue-93835.rs:4:19
    |
 LL |     type_ascribe!(p, a<p:p<e=6>>);
    |                   ^ not found in this scope
 
-error[E0412]: cannot find type `a` in this scope
+error[E0412]: cannot find type `a`
   --> $DIR/issue-93835.rs:4:22
    |
 LL |     type_ascribe!(p, a<p:p<e=6>>);
    |                      ^ not found in this scope
 
-error[E0405]: cannot find trait `p` in this scope
+error[E0405]: cannot find trait `p`
   --> $DIR/issue-93835.rs:4:26
    |
 LL |     type_ascribe!(p, a<p:p<e=6>>);

diff --git a/tests/ui/associated-item/issue-87638.fixed b/tests/ui/associated-item/issue-87638.fixed
@@ -14,9 +14,9 @@ impl Trait for S {
 }
 
 fn main() {
-    let _: <S as Trait>::Target; //~ ERROR cannot find associated type `Output` in trait `Trait`
+    let _: <S as Trait>::Target; //~ ERROR cannot find associated type `Output`
                                  //~^ HELP maybe you meant this associated type
 
-    let _ = <S as Trait>::FOO; //~ ERROR cannot find method or associated constant `BAR` in trait `Trait`
+    let _ = <S as Trait>::FOO; //~ ERROR cannot find method or associated constant `BAR`
                                //~^ HELP maybe you meant this associated constant
 }