diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs index d5c70b35cef6..94d76e46d6cd 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]; } } diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs index 0fb5df69edbe..6f346f176ef7 100644 --- a/src/comp/syntax/print/pprust.rs +++ b/src/comp/syntax/print/pprust.rs @@ -562,6 +562,7 @@ fn print_possibly_embedded_block(s: ps, blk: ast::blk, embedded: embed_type, block_normal. { bopen(s); } } + for vi in blk.node.view_items { print_view_item(s, vi); } for st: @ast::stmt in blk.node.stmts { print_stmt(s, *st); }