review comments: change wording

diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 6821921e45467026898799f122bb2d76e3c067d8..9b02f98164fdf9c0aba89153d9931c415b9d3e23 100644 (file)
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -176,7 +176,7 @@ pub(crate) fn smart_resolve_report_errors(
                         } else {
                             err.span_label(
                                 span,
-                                format!("a field by this name exists in `Self::{}`", path_str),
+                                "a field by this name exists in `Self`",
                             );
                         }
                     }

diff --git a/src/test/ui/issues/issue-60057.stderr b/src/test/ui/issues/issue-60057.stderr
index 0bee87a43722f1aaab816394f3b27c834fdf8995..bbe16d04919c0847fab2f63f2378e546b41827b8 100644 (file)
--- a/src/test/ui/issues/issue-60057.stderr
+++ b/src/test/ui/issues/issue-60057.stderr
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `banana` in this scope
   --> $DIR/issue-60057.rs:8:21
    |
 LL |             banana: banana
-   |                     ^^^^^^ a field by this name exists in `Self::banana`
+   |                     ^^^^^^ a field by this name exists in `Self`
 
 error[E0425]: cannot find value `banana` in this scope
   --> $DIR/issue-60057.rs:14:21

diff --git a/src/test/ui/resolve/issue-2356.stderr b/src/test/ui/resolve/issue-2356.stderr
index 10fcbfc74f2591d168c08dfa3e72f07ceeac4a71..7790383843e17743a1c0cc99f619c4b783484e2c 100644 (file)
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/src/test/ui/resolve/issue-2356.stderr
@@ -20,7 +20,7 @@ error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:39:5
    |
 LL |     whiskers -= other;
-   |     ^^^^^^^^ a field by this name exists in `Self::whiskers`
+   |     ^^^^^^^^ a field by this name exists in `Self`
 
 error[E0425]: cannot find function `shave` in this scope
   --> $DIR/issue-2356.rs:41:5
@@ -86,7 +86,7 @@ error[E0425]: cannot find value `whiskers` in this scope
   --> $DIR/issue-2356.rs:84:5
    |
 LL |     whiskers = 4;
-   |     ^^^^^^^^ a field by this name exists in `Self::whiskers`
+   |     ^^^^^^^^ a field by this name exists in `Self`
 
 error[E0425]: cannot find function `purr_louder` in this scope
   --> $DIR/issue-2356.rs:86:5

diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/src/test/ui/resolve/unresolved_static_type_field.stderr
index 7008fadad8170f845c8f799c77b8824bd5128470..06926b53ddd35e3eee1319df19a4a5f4b8e7dc8f 100644 (file)
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/src/test/ui/resolve/unresolved_static_type_field.stderr
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `cx` in this scope
   --> $DIR/unresolved_static_type_field.rs:9:11
    |
 LL |         f(cx);
-   |           ^^ a field by this name exists in `Self::cx`
+   |           ^^ a field by this name exists in `Self`
 
 error: aborting due to previous error