---

yaml
---
r: 226206
b: refs/heads/snap-stage3
c: 40617b6
h: refs/heads/master
v: v3

Author: GuillaumeGomez

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: e5d90d98402475b6e154ce216f9efcb80da1a747
-refs/heads/snap-stage3: c8b9e8363a15c0476040869d2e6749018ae4a6b3
+refs/heads/snap-stage3: 40617b60cbbf78bb20ba662b192957b58d07dbba
 refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/snap-stage3/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