diff options
| author | Rafael Ávila de Espíndola <[email protected]> | 2011-01-17 18:13:55 -0500 |
|---|---|---|
| committer | Rafael Ávila de Espíndola <[email protected]> | 2011-01-17 18:13:55 -0500 |
| commit | 9f3caed8a029eb3c17d40564da6859d61f1e624d (patch) | |
| tree | 04ccc488181de07db4ef6231a24f64128600f6b9 /src | |
| parent | Whitespace cleanup. (diff) | |
| download | rust-9f3caed8a029eb3c17d40564da6859d61f1e624d.tar.xz rust-9f3caed8a029eb3c17d40564da6859d61f1e624d.zip | |
Enable more tests.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/comp/middle/resolve.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/import4.rs | 2 |
3 files changed, 4 insertions, 2 deletions
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; |