---

yaml
---
r: 224305
b: refs/heads/beta
c: fc65f55
h: refs/heads/master
i:
  224303: f445f97
v: v3

Author: GuillaumeGomez

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 40617b60cbbf78bb20ba662b192957b58d07dbba
+refs/heads/beta: fc65f5551d00b4a83192cc054b6294cf855ba748
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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##"