Skip to content

Commit faecedc

Browse files
committed
---
yaml --- r: 2350 b: refs/heads/master c: bd34770 h: refs/heads/master v: v3
1 parent 9b34cbe commit faecedc

File tree

8 files changed

+5
-13
lines changed

8 files changed

+5
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: ce9468761c8381e8ebaa451e8bd0730ec9b087a5
2+
refs/heads/master: bd34770a92fc4ce6c1ee9a00fad295f440bdc62b

trunk/src/comp/middle/resolve.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,8 @@ fn lookup_name_wrapped(&env e, ast.ident i, namespace ns, direction dir)
382382
case (ast.mie_item(?item)) {
383383
if (visible(i, m, dir)) {
384384
ret some(found_def_item(item, ns));
385+
} else {
386+
ret none[def_wrap];
385387
}
386388
}
387389
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)
391393
auto vid = variants.(variant_idx).node.id;
392394
auto t = ast.def_variant(tid, vid);
393395
ret some[def_wrap](def_wrap_other(t));
396+
} else {
397+
ret none[def_wrap];
394398
}
395399
}
396400
case (_) {

trunk/src/test/compile-fail/export-fully-qualified.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64

75
// In this test baz isn't resolved when called as foo.baz even though

trunk/src/test/compile-fail/export-import.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64

75
import m.unexported;

trunk/src/test/compile-fail/export-no-tag-variants.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64

75
// Tag variants are not exported with their tags. This allows for a

trunk/src/test/compile-fail/export-tag-variant.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64

75
mod foo {

trunk/src/test/compile-fail/export.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64
mod foo {
75
export x;

trunk/src/test/compile-fail/export2.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// xfail-boot
22
// xfail-stage0
3-
// xfail-stage1
4-
// xfail-stage2
53
// error-pattern: unresolved name
64

75
mod foo {

0 commit comments

Comments
 (0)