Stop showing a 'cyclic import' message for unresolved imports

This only happened for single-length import paths, because the import
was being looked up in its own scope.

2 files changed, 8 insertions, 5 deletions

diff --git a/src/test/compile-fail/bad-module.rs b/src/test/compile-fail/bad-module.rs
index d9d35f327f5..76ba22dcbf9 100644
--- a/src/test/compile-fail/bad-module.rs
+++ b/src/test/compile-fail/bad-module.rs
@@ -1,7 +1,7 @@
 // xfail-stage0
-// error-pattern: nonexistent module
+// error-pattern: unresolved import: vec
 import vec;
 
 fn main() {
-  auto foo = vec.len([]);
+    auto foo = vec::len([]);
 }
\ No newline at end of file
diff --git a/src/test/compile-fail/import-loop.rs b/src/test/compile-fail/import-loop.rs
index 649e2d5d3bc..7867c00f00e 100644
--- a/src/test/compile-fail/import-loop.rs
+++ b/src/test/compile-fail/import-loop.rs
@@ -1,7 +1,10 @@
-// error-pattern:cyclic import
+// error-pattern: cyclic import
 
-import x;
+import y::x;
+
+mod y {
+    import x;
+}
 
 fn main() {
-  auto y = x;
 }