diff options
| author | Brian Anderson <[email protected]> | 2011-05-04 19:29:27 -0400 |
|---|---|---|
| committer | Brian Anderson <[email protected]> | 2011-05-04 19:29:27 -0400 |
| commit | bd34770a92fc4ce6c1ee9a00fad295f440bdc62b (patch) | |
| tree | a0b55ed01f8aeddad255d4dad86059093cc86e5b | |
| parent | Support new -g flag, only mangle glue names by type when it's passed. (diff) | |
| download | rust-bd34770a92fc4ce6c1ee9a00fad295f440bdc62b.tar.xz rust-bd34770a92fc4ce6c1ee9a00fad295f440bdc62b.zip | |
Add missing ret statements to check_mod
Un-XFAIL compile-fail export tests
| -rw-r--r-- | src/comp/middle/resolve.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/export-fully-qualified.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/export-import.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/export-no-tag-variants.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/export-tag-variant.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/export.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/export2.rs | 2 |
7 files changed, 4 insertions, 12 deletions
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 5320389d..8b92cabd 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -382,6 +382,8 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns, direction dir) case (ast.mie_item(?item)) { if (visible(i, m, dir)) { ret some(found_def_item(item, ns)); + } else { + ret none[def_wrap]; } } case (ast.mie_tag_variant(?item, ?variant_idx)) { @@ -391,6 +393,8 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns, direction dir) auto vid = variants.(variant_idx).node.id; auto t = ast.def_variant(tid, vid); ret some[def_wrap](def_wrap_other(t)); + } else { + ret none[def_wrap]; } } case (_) { diff --git a/src/test/compile-fail/export-fully-qualified.rs b/src/test/compile-fail/export-fully-qualified.rs index 005f17f2..28225754 100644 --- a/src/test/compile-fail/export-fully-qualified.rs +++ b/src/test/compile-fail/export-fully-qualified.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name // In this test baz isn't resolved when called as foo.baz even though diff --git a/src/test/compile-fail/export-import.rs b/src/test/compile-fail/export-import.rs index def6af8e..6cc053d1 100644 --- a/src/test/compile-fail/export-import.rs +++ b/src/test/compile-fail/export-import.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name import m.unexported; diff --git a/src/test/compile-fail/export-no-tag-variants.rs b/src/test/compile-fail/export-no-tag-variants.rs index 11100b98..b812859c 100644 --- a/src/test/compile-fail/export-no-tag-variants.rs +++ b/src/test/compile-fail/export-no-tag-variants.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name // Tag variants are not exported with their tags. This allows for a diff --git a/src/test/compile-fail/export-tag-variant.rs b/src/test/compile-fail/export-tag-variant.rs index dee8a483..1de937e2 100644 --- a/src/test/compile-fail/export-tag-variant.rs +++ b/src/test/compile-fail/export-tag-variant.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name mod foo { diff --git a/src/test/compile-fail/export.rs b/src/test/compile-fail/export.rs index 337dcaec..8b491542 100644 --- a/src/test/compile-fail/export.rs +++ b/src/test/compile-fail/export.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name mod foo { export x; diff --git a/src/test/compile-fail/export2.rs b/src/test/compile-fail/export2.rs index 5ccdc90f..435ffb90 100644 --- a/src/test/compile-fail/export2.rs +++ b/src/test/compile-fail/export2.rs @@ -1,7 +1,5 @@ // xfail-boot // xfail-stage0 -// xfail-stage1 -// xfail-stage2 // error-pattern: unresolved name mod foo { |