---

yaml
---
r: 224895
b: refs/heads/tmp
c: 086a5c7
h: refs/heads/master
i:
  224893: 64ce5c0
  224891: 47c425b
  224887: 8c8f069
  224879: 897317e
  224863: 8fb2d30
  224831: b17eb81
  224767: be033ce
v: v3

Author: GuillaumeGomez

[refs]

@@ -25,7 +25,7 @@ refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
 refs/heads/beta: 83dee3dfbb452a7558193f3ce171b3c60bf4a499
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 5429c9be78a0d55424a65244b956ea50e79c1f1e
+refs/heads/tmp: 086a5c74febf31650dff3ffbd7c2806056f02933
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: e58601ab085591c71a27ae82137fc313222c2270
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828

branches/tmp/src/librustc_resolve/diagnostics.rs

@@ -397,6 +397,39 @@ impl Bar {
 ```
 "##,
 
+E0413: r##"
+A declaration shadows an enum variant or unit-like struct in scope.
+Example of erroneous code:
+
+```
+struct Foo;
+
+let Foo = 12i32; // error: declaration of `Foo` shadows an enum variant or
+                 //        unit-like struct in scope
+```
+
+
+To fix this error, you have to change the name of the declaration of the
+shadowed object. Please also verify that neither name was misspelled.
+Example:
+
+```
+struct Foo;
+
+let foo = 12i32; // ok!
+```
+
+Or:
+
+```
+struct FooStruct;
+
+let Foo = 12i32; // ok!
+```
+
+The goal here is to avoid a conflict of names.
+"##,
+
 E0417: r##"
 A static variable was referenced in a pattern. Example of erroneous code:
 
@@ -425,7 +458,7 @@ match 0 {
 ```
 "##,
 
-E0424: r##"
+E0423: r##"
 A `struct` variant name was used like a function name. Example of
 erroneous code:
 
@@ -673,8 +706,6 @@ register_diagnostics! {
     E0410, // variable from pattern is not bound in pattern 1
     E0411, // use of `Self` outside of an impl or trait
     E0412, // use of undeclared
-    E0413, // declaration of shadows an enum variant or unit-like struct in
-           // scope
     E0414, // only irrefutable patterns allowed here
     E0415, // identifier is bound more than once in this parameter list
     E0416, // identifier is bound more than once in the same pattern