about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2019-04-18 09:43:15 -0700
committerEsteban Küber <esteban@kuber.com.ar>2019-04-18 18:39:56 -0700
commit7b050fe831b7cf49a3b3290992a2421990f81834 (patch)
tree50f1dd71796268783ce338eee7b7d2c782f65990
parent248fe949afbebb0df59d84d17b0e45762965238f (diff)
downloadrust-7b050fe831b7cf49a3b3290992a2421990f81834.tar.gz
rust-7b050fe831b7cf49a3b3290992a2421990f81834.zip
review comments: change wording
-rw-r--r--src/librustc_resolve/diagnostics.rs2
-rw-r--r--src/test/ui/issues/issue-60057.stderr2
-rw-r--r--src/test/ui/resolve/issue-2356.stderr4
-rw-r--r--src/test/ui/resolve/unresolved_static_type_field.stderr2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_resolve/diagnostics.rs b/src/librustc_resolve/diagnostics.rs
index 6821921e454..9b02f98164f 100644
--- a/src/librustc_resolve/diagnostics.rs
+++ b/src/librustc_resolve/diagnostics.rs
@@ -176,7 +176,7 @@ impl<'a> Resolver<'a> {
                         } 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 0bee87a4372..bbe16d04919 100644
--- 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 10fcbfc74f2..7790383843e 100644
--- 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 7008fadad81..06926b53ddd 100644
--- 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