about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2012-09-05 16:21:13 -0700
committerPatrick Walton <pcwalton@mimiga.net>2012-09-05 16:21:53 -0700
commit31af60b257983da1a77336ee033406350eb14ee9 (patch)
tree000d16fceeff834ff40c312bbfb5ba57defbc269
parentf7681f9236168cfad661b0ad73798a2d54a941f1 (diff)
downloadrust-31af60b257983da1a77336ee033406350eb14ee9.tar.gz
rust-31af60b257983da1a77336ee033406350eb14ee9.zip
rustc: Fix double-reporting of private item errors. Un-XFAIL private-item-simple.rs.
-rw-r--r--src/rustc/middle/resolve.rs10
-rw-r--r--src/test/compile-fail/private-item-simple.rs5
2 files changed, 0 insertions, 15 deletions
diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs
index 079f4ad14d9..e52f8993d59 100644
--- a/src/rustc/middle/resolve.rs
+++ b/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) => {
diff --git a/src/test/compile-fail/private-item-simple.rs b/src/test/compile-fail/private-item-simple.rs
index 843c7f4aaa2..305899799fd 100644
--- a/src/test/compile-fail/private-item-simple.rs
+++ b/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() {}
 }