From 9f3caed8a029eb3c17d40564da6859d61f1e624d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20=C3=81vila=20de=20Esp=C3=ADndola?=
 <respindola@mozilla.com>
Date: Mon, 17 Jan 2011 18:13:55 -0500
Subject: Enable more tests.

---
 src/Makefile                     | 2 ++
 src/comp/middle/resolve.rs       | 2 +-
 src/test/compile-fail/import4.rs | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/Makefile b/src/Makefile
index 45d6ce80..9da0590a 100644
--- a/src/Makefile
+++ b/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))
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 760f86d1..2ea3fa0a 100644
--- a/src/comp/middle/resolve.rs
+++ b/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);
diff --git a/src/test/compile-fail/import4.rs b/src/test/compile-fail/import4.rs
index f769d6d3..3e1208f5 100644
--- a/src/test/compile-fail/import4.rs
+++ b/src/test/compile-fail/import4.rs
@@ -1,4 +1,4 @@
-// error-pattern: recursive import
+// error-pattern: cyclic import
 
 import zed.bar;
 import bar.zed;
-- 
cgit v1.2.3