diff options
| author | Graydon Hoare <[email protected]> | 2011-01-04 15:07:38 -0800 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2011-01-04 15:07:38 -0800 |
| commit | 2ec0b724c46073d57973e076e222b047e36fee9d (patch) | |
| tree | c59e8d97328e8b19885ef9db232cc57efd3a2de5 /src/comp/middle | |
| parent | rustc: Add an item type accessor (diff) | |
| parent | Add names from imports to the namespace. (diff) | |
| download | rust-2ec0b724c46073d57973e076e222b047e36fee9d.tar.xz rust-2ec0b724c46073d57973e076e222b047e36fee9d.zip | |
Merge remote branch 'espindola/import'
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/resolve.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index 551993dd..e1f58b5d 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -73,7 +73,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] { ret some[def](ast.def_use(id)); } case (ast.view_item_import(_,?id)) { - fail; + ret some[def](ast.def_import(id)); } } } @@ -82,7 +82,7 @@ fn lookup_name(&env e, ast.ident i) -> option.t[def] { alt (m.index.find(i)) { case (some[ast.mod_index_entry](?ent)) { alt (ent) { - case (ast.mie_use(?ix)) { + case (ast.mie_view_item(?ix)) { ret found_def_view(m.view_items.(ix)); } case (ast.mie_item(?ix)) { |