---

yaml
---
r: 32409
b: refs/heads/dist-snap
c: 31af60b
h: refs/heads/master
i:
  32407: 9452b89
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: f7681f9236168cfad661b0ad73798a2d54a941f1
+refs/heads/dist-snap: 31af60b257983da1a77336ee033406350eb14ee9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/middle/resolve.rs

@@ -4159,11 +4159,6 @@ struct Resolver {
                                                         xray) {
             NoNameDefinition => {
                 // We failed to resolve the name. Report an error.
-                self.session.span_err(
-                    path.span,
-                    fmt!("unresolved name: %s::%s",
-                         self.atoms_to_str((*module_path_atoms).get()),
-                         self.session.str_of(name)));
                 return None;
             }
             ChildNameDefinition(def) | ImportNameDefinition(def) => {
@@ -4212,11 +4207,6 @@ struct Resolver {
                                                       xray) {
             NoNameDefinition => {
                 // We failed to resolve the name. Report an error.
-                self.session.span_err(
-                    path.span,
-                    fmt!("unresolved name: %s::%s", self.atoms_to_str(
-                        (*module_path_atoms).get()),
-                         self.session.str_of(name)));
                 return None;
             }
             ChildNameDefinition(def) | ImportNameDefinition(def) => {

branches/dist-snap/src/test/compile-fail/private-item-simple.rs

@@ -1,8 +1,3 @@
-// xfail-test
-// xfail-fast
-
-// This is xfail'd because two errors are reported instead of one.
-
 mod a {
     priv fn f() {}
 }