---

yaml
---
r: 235888
b: refs/heads/stable
c: fc65f55
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: afae2ff723393b3ab4ccffef6ac7c6d1809e2da0
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: f859507de8c410b648d934d8f5ec1c52daac971d
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: 40617b60cbbf78bb20ba662b192957b58d07dbba
+refs/heads/stable: fc65f5551d00b4a83192cc054b6294cf855ba748
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/librustc_resolve/diagnostics.rs

@@ -440,9 +440,9 @@ impl Foo {
 }
 ```
 
-Please check if the method's argument list should have contained self,
-&self, or &mut self (in case you didn't want to create a static method),
-and add it if so. Example:
+Please check if the method's argument list should have contained `self`,
+`&self`, or `&mut self` (in case you didn't want to create a static
+method), and add it if so. Example:
 
 ```
 struct Foo;
@@ -458,10 +458,18 @@ impl Foo {
 "##,
 
 E0425: r##"
-An unresolved name was used. Example of erroneous code:
+An unresolved name was used. Example of erroneous codes:
 
 ```
-something_that_doesnt_exist::foo; // error: unresolved name `f::foo`
+something_that_doesnt_exist::foo;
+// error: unresolved name `something_that_doesnt_exist::foo`
+
+// or:
+trait Foo {
+    fn bar() {
+        Self; // error: unresolved name `Self`
+    }
+}
 ```
 
 Please verify you didn't misspell the name or that you're not using an
@@ -489,8 +497,7 @@ loop {
 }
 ```
 
-Please verify you didn't misspell the label name or you did declare
-it. Example:
+Please verify you spelt or declare the label correctly. Example:
 
 ```
 'a: loop {
@@ -541,8 +548,8 @@ use {self}; // error: `self` import can only appear in an import list with a
             //        non-empty prefix
 ```
 
-You can't import the current module in itself, please remove this import or
-verify you didn't misspell it.
+You cannot import the current module into itself, please remove this import
+or verify you didn't misspell it.
 "##,
 
 E0432: r##"