Rename use_or_import to view_item.

2 files changed, 8 insertions, 8 deletions

diff --git a/src/comp/front/ast.rs b/src/comp/front/ast.rs
index 9a4a5b24b83..1e229b349e6 100644
--- a/src/comp/front/ast.rs
+++ b/src/comp/front/ast.rs
@@ -46,9 +46,9 @@ type use_node_ = rec(ident name, vec[@meta_item] metadata);
 type import_node = spanned[import_node_];
 type import_node_ = rec(vec[ident] identifiers);
 
-tag use_or_import {
-    use_or_import_use(@use_node);
-    use_or_import_import(@import_node);
+tag view_item {
+    view_item_use(@use_node);
+    view_item_import(@import_node);
 }
 
 type meta_item = spanned[meta_item_];
diff --git a/src/comp/front/parser.rs b/src/comp/front/parser.rs
index dd5a6b50d75..b167bae460a 100644
--- a/src/comp/front/parser.rs
+++ b/src/comp/front/parser.rs
@@ -1405,7 +1405,7 @@ impure fn parse_item_obj(parser p, ast.layer lyr) -> @ast.item {
 }
 
 impure fn parse_mod_items(parser p, token.token term) -> ast._mod {
-    parse_use_and_imports(p);
+    parse_view(p);
 
     let vec[@ast.item] items = vec();
     auto index = new_str_hash[ast.mod_index_entry]();
@@ -1721,15 +1721,15 @@ impure fn parse_import(parser p) -> @ast.import_node {
     fail;
 }
 
-impure fn parse_use_and_imports(parser p) -> vec[ast.use_or_import] {
-    let vec[ast.use_or_import] items = vec();
+impure fn parse_view(parser p) -> vec[ast.view_item] {
+    let vec[ast.view_item] items = vec();
     while (true) {
         alt (p.peek()) {
             case (token.USE) {
-                items += vec(ast.use_or_import_use(parse_use(p)));
+                items += vec(ast.view_item_use(parse_use(p)));
             }
             case (token.IMPORT) {
-                items += vec(ast.use_or_import_import(parse_import(p)));
+                items += vec(ast.view_item_import(parse_import(p)));
             }
             case (_) {
                 ret items;