---

yaml
---
r: 235884
b: refs/heads/stable
c: 2537abf
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: 18f4e8ce5eabd77c872b5429b9a0172f0d446c9e
+refs/heads/stable: 2537abf503e1ac44a3b97fab6190ac4dff01a8ff
 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

@@ -476,7 +476,7 @@ struct Bar2; // ok!
 "##,
 
 E0430: r##"
-The `self` import appears more than once in the list.
+The `self` import appears more than once in the list. Erroneous code example:
 
 ```
 use something::{self, self}; // error: `self` import can only appear once in
@@ -487,6 +487,18 @@ Please verify you didn't misspell the import name or remove the duplicated
 `self` import.
 "##,
 
+E0431: r##"
+`self` import was made. Erroneous code example:
+
+```
+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.
+"##,
+
 E0433: r##"
 Invalid import. Example of erroneous code:
 
@@ -531,8 +543,6 @@ register_diagnostics! {
     E0426, // use of undeclared label
     E0427, // cannot use `ref` binding mode with ...
     E0429, // `self` imports are only allowed within a { } list
-    E0431, // `self` import can only appear in an import list with a non-empty
-           // prefix
     E0432, // unresolved import
     E0434, // can't capture dynamic environment in a fn item
     E0435, // attempt to use a non-constant value in a constant