---

yaml
---
r: 24549
b: refs/heads/try2
c: cc3b6bf
h: refs/heads/master
i:
  24547: 96b2c4e
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 139d843dced44973742c794678b3404423f60ec4
+refs/heads/try2: cc3b6bf2f07aee96ab51ac4c147fbeabed3aa4ec
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/rustc/middle/resolve3.rs

@@ -3647,8 +3647,7 @@ class Resolver {
             NoNameDefinition {
                 // We failed to resolve the name. Report an error.
                 self.session.span_err(path.span,
-                                      #fmt("use of undeclared identifier: \
-                                            %s::%s",
+                                      #fmt("unresolved name: %s::%s",
                                            *(*self.atom_table).atoms_to_str
                                                ((*module_path_atoms).get()),
                                            *(*self.atom_table).atom_to_str
@@ -3700,8 +3699,7 @@ class Resolver {
             NoNameDefinition {
                 // We failed to resolve the name. Report an error.
                 self.session.span_err(path.span,
-                                      #fmt("use of undeclared identifier: \
-                                            %s::%s",
+                                      #fmt("unresolved name: %s::%s",
                                            *(*self.atom_table).atoms_to_str
                                                ((*module_path_atoms).get()),
                                            *(*self.atom_table).atom_to_str
@@ -3806,8 +3804,7 @@ class Resolver {
                     }
                     none {
                         self.session.span_err(expr.span,
-                                              #fmt("use of undeclared \
-                                                    identifier '%s'",
+                                              #fmt("unresolved name: %s",
                                               connect(path.idents.map(|x| *x),
                                                       "::")));
                     }