diff options
| author | Marijn Haverbeke <marijnh@gmail.com> | 2011-11-23 21:22:44 +0100 |
|---|---|---|
| committer | Marijn Haverbeke <marijnh@gmail.com> | 2011-11-23 21:22:56 +0100 |
| commit | 8746ebe2e61f736306793ab24a0370af6eff2785 (patch) | |
| tree | 9a81e5e4a1f19bcb3d7cece4a00e8127a46ac532 /src/comp/middle | |
| parent | 2ac63801d2d5b7b681041cac28f6f7571b39f95e (diff) | |
| download | rust-8746ebe2e61f736306793ab24a0370af6eff2785.tar.gz rust-8746ebe2e61f736306793ab24a0370af6eff2785.zip | |
Add some changes that *should* have been in e98286b594
Forgot to amend the commit after fixing the failure.
Diffstat (limited to 'src/comp/middle')
| -rw-r--r-- | src/comp/middle/resolve.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index d5c70b35cef..94d76e46d6c 100644 --- a/src/comp/middle/resolve.rs +++ b/src/comp/middle/resolve.rs @@ -217,17 +217,17 @@ fn map_crate(e: @env, c: @ast::crate) { let imp = follow_import(*e, sc, path, vi.span); if option::is_some(imp) { let glob = {def: option::get(imp), item: vi};; - alt sc { - cons(scope_item(i), _) { + alt list::head(sc) { + scope_item(i) { e.mod_map.get(i.id).glob_imports += [glob]; } - cons(scope_block(b, _, _), _) { + scope_block(b, _, _) { let globs = alt e.block_map.find(b.node.id) { some(globs) { globs + [glob] } none. { [glob] } }; e.block_map.insert(b.node.id, globs); } - nil. { + scope_crate. { e.mod_map.get(-1).glob_imports += [glob]; } } |
