Enable more tests.

src/Makefile

@@ -489,6 +489,8 @@ TEST_XFAILS_RUSTC := $(filter-out \
                         import2.rs \
                         import3.rs \
                         import4.rs \
+                        import-loop.rs \
+                        import-loop-2.rs \
                         while-type-error.rs \
                         ), \
                       $(wildcard test/*/*.rs test/*/*.rc))

src/comp/middle/resolve.rs

@@ -89,7 +89,7 @@ fn find_final_def(&env e, &span sp, vec[ident] idents) -> def_wrap {
                     case (ast.view_item_import(?new_idents, ?d)) {
                         if (pending.contains_key(d)) {
                             e.sess.span_err(sp,
-                                            "recursive import");
+                                            "cyclic import");
                             fail;
                         }
                         pending.insert(d, true);

src/test/compile-fail/import4.rs

@@ -1,4 +1,4 @@
-// error-pattern: recursive import
+// error-pattern: cyclic import
 
 import zed.bar;
 import bar.zed;