review comments: change wording

estebank · estebank · commit 9daeaa821e0a · 2019-04-18T12:01:17.000-07:00
diff --git 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
@@ -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
@@ -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
@@ -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
 

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ impl<'a> Resolver<'a> {`
`176`	`176`	`} else {`
`177`	`177`	`err.span_label(`
`178`	`178`	`span,`
`179`		- format!("a field by this name exists in `Self::{}`", path_str),
	`179`	+ "a field by this name exists in `Self`",
`180`	`180`	`);`
`181`	`181`	`}`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `banana` in this scope
`2`	`2`	`--> $DIR/issue-60057.rs:8:21`
`3`	`3`	`\|`
`4`	`4`	`LL \| banana: banana`
`5`		- \| ^^^^^^ a field by this name exists in `Self::banana`
	`5`	+ \| ^^^^^^ a field by this name exists in `Self`
`6`	`6`
`7`	`7`	error[E0425]: cannot find value `banana` in this scope
`8`	`8`	`--> $DIR/issue-60057.rs:14:21`
Original file line number	Diff line number	Diff line change
@@ -2,7 +2,7 @@ error[E0425]: cannot find value `cx` in this scope
`2`	`2`	`--> $DIR/unresolved_static_type_field.rs:9:11`
`3`	`3`	`\|`
`4`	`4`	`LL \| f(cx);`
`5`		- \| ^^ a field by this name exists in `Self::cx`
	`5`	+ \| ^^ a field by this name exists in `Self`
`6`	`6`
`7`	`7`	`error: aborting due to previous error`
`8`	`8`