---

yaml
---
r: 235887
b: refs/heads/stable
c: 40617b6
h: refs/heads/master
i:
  235885: c114997
  235883: ed196e6
  235879: ce85169
  235871: 936459e
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: c8b9e8363a15c0476040869d2e6749018ae4a6b3
+refs/heads/stable: 40617b60cbbf78bb20ba662b192957b58d07dbba
 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

@@ -457,6 +457,29 @@ impl Foo {
 ```
 "##,
 
+E0425: r##"
+An unresolved name was used. Example of erroneous code:
+
+```
+something_that_doesnt_exist::foo; // error: unresolved name `f::foo`
+```
+
+Please verify you didn't misspell the name or that you're not using an
+invalid object. Example:
+
+```
+enum something_that_does_exist {
+    foo
+}
+// or:
+mod something_that_does_exist {
+    pub static foo : i32 = 0i32;
+}
+
+something_that_does_exist::foo; // ok!
+```
+"##,
+
 E0426: r##"
 An undeclared label was used. Example of erroneous code:
 
@@ -581,7 +604,6 @@ register_diagnostics! {
     E0422, // does not name a structure
     E0423, // is a struct variant name, but this expression uses it like a
            // function name
-    E0425, // unresolved name
     E0427, // cannot use `ref` binding mode with ...
     E0429, // `self` imports are only allowed within a { } list
     E0434, // can't capture dynamic environment in a fn item