From 7d4bb90e76207f3715126562fd50193fda97ff49 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Fri, 10 May 2013 16:23:12 -0400 Subject: [PATCH 1/3] Remove redundant import error --- src/librustc/middle/resolve.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/librustc/middle/resolve.rs b/src/librustc/middle/resolve.rs index 9802e1172afbf..1118469dc541f 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; } From 258abf1424ea421c6986aa972122fb666bb06bee Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Sun, 12 May 2013 09:38:39 -0400 Subject: [PATCH 2/3] Fix failing test --- src/test/compile-fail/issue-2937.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs index ba4e25ea952a9..76ab31b4101da 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 imports mod m { } From e605536648c76b220b583b5525d1fed2750f9ae8 Mon Sep 17 00:00:00 2001 From: Corey Richardson Date: Sun, 12 May 2013 22:52:38 -0400 Subject: [PATCH 3/3] actually fix failing test --- src/test/compile-fail/issue-2937.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs index 76ab31b4101da..56f0c5e3dd066 100644 --- a/src/test/compile-fail/issue-2937.rs +++ b/src/test/compile-fail/issue-2937.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use x = m::f; //~ ERROR failed to resolve imports +use x = m::f; //~ ERROR failed to resolve import mod m { }