revert wording changes to main message

Author: estebank

compiler/rustc_lint/messages.ftl

@@ -604,7 +604,7 @@ lint_opaque_hidden_inferred_bound_sugg = add this bound
 lint_or_patterns_back_compat = the meaning of the `pat` fragment specifier is changing in Rust 2021, which may affect this macro
     .suggestion = use pat_param to preserve semantics
 
-lint_out_of_scope_macro_calls = cannot find macro `{$path}`
+lint_out_of_scope_macro_calls = cannot find macro `{$path}` in this scope
     .label = not found in this scope
     .help = import `macro_rules` with `use` to make it callable above its definition
 
@@ -646,7 +646,7 @@ lint_pattern_in_foreign = patterns aren't allowed in foreign function declaratio
 lint_private_extern_crate_reexport = extern crate `{$ident}` is private and cannot be re-exported
     .suggestion = consider making the `extern crate` item publicly accessible
 
-lint_proc_macro_derive_resolution_fallback = cannot find {$ns} `{$ident}`
+lint_proc_macro_derive_resolution_fallback = cannot find {$ns} `{$ident}` in this scope
     .label = names from parent modules are not accessible without an explicit import
 
 lint_ptr_null_checks_fn_ptr = function pointers are not nullable, so checking them for null will always return false

compiler/rustc_resolve/messages.ftl

@@ -80,7 +80,7 @@ resolve_cannot_determine_macro_resolution =
 resolve_cannot_find_builtin_macro_with_name =
     cannot find a built-in macro with name `{$ident}`
 
-resolve_cannot_find_ident_in_this_scope = cannot find {$expected} `{$ident}`
+resolve_cannot_find_ident_in_this_scope = cannot find {$expected} `{$ident}` in this scope
     .label = not found in this scope
 
 resolve_cannot_glob_import_possible_crates =

compiler/rustc_resolve/src/late.rs

@@ -3917,7 +3917,7 @@ impl<'a: 'ast, 'b, 'ast, 'tcx> LateResolutionVisitor<'a, 'b, 'ast, 'tcx> {
 
             // There are two different error messages user might receive at
             // this point:
-            // - E0412 cannot find type `{}`
+            // - E0412 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

compiler/rustc_resolve/src/late/diagnostics.rs

@@ -351,7 +351,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
             };
 
             BaseError {
-                msg: format!("cannot find {expected} `{item_str}`"),
+                msg: format!("cannot find {expected} `{item_str}` in {mod_prefix}{mod_str}"),
                 fallback_label,
                 span: item_span,
                 span_label,
@@ -2528,7 +2528,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
                 if let Some(generics) = kind.generics() {
                     if span.overlaps(generics.span) {
                         // Avoid the following:
-                        // error[E0405]: cannot find trait `A`
+                        // error[E0405]: cannot find trait `A` in this scope
                         //  --> $DIR/typo-suggestion-named-underscore.rs:CC:LL
                         //   |
                         // L | fn foo<T: A>(x: T) {} // Shouldn't suggest underscore

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

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

src/tools/clippy/tests/ui/option_map_unit_fn_unfixable.stderr

@@ -1,22 +1,22 @@
-error[E0425]: cannot find value `x`
+error[E0425]: cannot find value `x` in this scope
   --> 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`
+error[E0425]: cannot find value `x` in this scope
   --> 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`
+error[E0425]: cannot find value `x` in this scope
   --> 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`
+error[E0425]: cannot find value `x` in this scope
   --> tests/ui/option_map_unit_fn_unfixable.rs:27:5
    |
 LL |     x.field.map(|value| { do_nothing(value); do_nothing(value); });

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`
+error[E0425]: cannot find value `no` in this scope
   --> $DIR/failed-doctest-output.rs:26:1
    |
 LL | no

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

@@ -1,58 +1,58 @@
-error: cannot find macro `unknown_macro`
+error: cannot find macro `unknown_macro` in this scope
   --> $DIR/impl-fn-nesting.rs:32:13
    |
 LL |             unknown_macro!();
    |             ^^^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownBound`
+error[E0405]: cannot find trait `UnknownBound` in this scope
   --> $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`
+error[E0412]: cannot find type `UnknownType` in this scope
   --> $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`
+error[E0405]: cannot find trait `UnknownTrait` in this scope
   --> $DIR/impl-fn-nesting.rs:14:10
    |
 LL |     impl UnknownTrait for ValidType {}
    |          ^^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownTrait`
+error[E0405]: cannot find trait `UnknownTrait` in this scope
   --> $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`
+error[E0405]: cannot find trait `UnknownBound` in this scope
   --> $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`
+error[E0412]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:18:25
    |
 LL |     impl ValidTrait for UnknownType {}
    |                         ^^^^^^^^^^^ not found in this scope
 
-error[E0405]: cannot find trait `UnknownBound`
+error[E0405]: cannot find trait `UnknownBound` in this scope
   --> $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`
+error[E0412]: 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`
+error[E0412]: cannot find type `UnknownType` in this scope
   --> $DIR/impl-fn-nesting.rs:44:37
    |
 LL |             pub fn doubly_nested(c: UnknownType) {

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`
+$DIR/issue-81662-shortness.rs:9:1: error[E0425]: cannot find function `foo` in this scope
 error: aborting due to 1 previous error
 Couldn't compile the test.
 

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

@@ -1,4 +1,4 @@
-error[E0412]: cannot find type `Iter`
+error[E0412]: cannot find type `Iter` in this scope
   --> $DIR/missing-type.rs:5:12
    |
 LL |     let x: Iter;