about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-12 20:22:40 -0700
committerbors <bors@rust-lang.org>2013-05-12 20:22:40 -0700
commit8291e36f184b2a72eaae8fa745759a09c17c8db8 (patch)
tree32f7e3ba92163836b14343a3daee4371dcec56e6
parent8d1a09c8109eec23c7e85feff26db75eca2dcfd6 (diff)
parente605536648c76b220b583b5525d1fed2750f9ae8 (diff)
downloadrust-8291e36f184b2a72eaae8fa745759a09c17c8db8.tar.gz
rust-8291e36f184b2a72eaae8fa745759a09c17c8db8.zip
auto merge of #6400 : cmr/rust/remove_useless_import_error, r=thestinger
Every unresolved import is reported. An additional error message isn't useful
and obscures (imo) the real errors: I need to take it into account when
looking at the error count.
-rw-r--r--src/librustc/middle/resolve.rs1
-rw-r--r--src/test/compile-fail/issue-2937.rs3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs
index 515ebc0e8db..426df805b58 100644
--- a/src/librustc/middle/resolve.rs
+++ b/src/librustc/middle/resolve.rs
@@ -1909,7 +1909,6 @@ pub impl Resolver {
             }
 
             if self.unresolved_imports == prev_unresolved_imports {
-                self.session.err(~"failed to resolve imports");
                 self.report_unresolved_imports(module_root);
                 break;
             }
diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs
index ba4e25ea952..56f0c5e3dd0 100644
--- a/src/test/compile-fail/issue-2937.rs
+++ b/src/test/compile-fail/issue-2937.rs
@@ -8,8 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:failed to resolve imports
-use x = m::f;
+use x = m::f; //~ ERROR failed to resolve import
 
 mod m {
 }