auto merge of #5004 : luqmana/rust/rename-use-import, r=catamorphism

Seems like my previous pull request got lost along the way somehow. So here it is updated.

6 files changed, 14 insertions, 14 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 5fcc53a407b..bf64402d237 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -1121,8 +1121,8 @@ pub struct view_item {
 #[auto_decode]
 #[deriving_eq]
 pub enum view_item_ {
-    view_item_use(ident, ~[@meta_item], node_id),
-    view_item_import(~[@view_path]),
+    view_item_extern_mod(ident, ~[@meta_item], node_id),
+    view_item_use(~[@view_path]),
 }
 
 // Meta-data associated with an item
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index f7ae2058095..9f7b28c36f5 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -395,8 +395,8 @@ pub fn id_visitor(vfn: fn@(node_id)) -> visit::vt<()> {
 
         visit_view_item: fn@(vi: @view_item) {
             match vi.node {
-              view_item_use(_, _, id) => vfn(id),
-              view_item_import(vps) => {
+              view_item_extern_mod(_, _, id) => vfn(id),
+              view_item_use(vps) => {
                   for vec::each(vps) |vp| {
                       match vp.node {
                           view_path_simple(_, _, _, id) => vfn(id),
diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
index 963ea5bfe33..0a6840ceea0 100644
--- a/src/libsyntax/ext/build.rs
+++ b/src/libsyntax/ext/build.rs
@@ -192,7 +192,7 @@ pub fn mk_glob_use(cx: ext_ctxt,
         node: ast::view_path_glob(mk_raw_path(sp, path), cx.next_id()),
         span: sp,
     };
-    @ast::view_item { node: ast::view_item_import(~[glob]),
+    @ast::view_item { node: ast::view_item_use(~[glob]),
                       attrs: ~[],
                       vis: ast::private,
                       span: sp }
diff --git a/src/libsyntax/ext/pipes/ast_builder.rs b/src/libsyntax/ext/pipes/ast_builder.rs
index 6638a47ebf8..6c461738798 100644
--- a/src/libsyntax/ext/pipes/ast_builder.rs
+++ b/src/libsyntax/ext/pipes/ast_builder.rs
@@ -319,7 +319,7 @@ pub impl ext_ctxt_ast_builder for ext_ctxt {
 
         // XXX: Total hack: import `core::kinds::Owned` to work around a
         // parser bug whereby `fn f<T: ::kinds::Owned>` doesn't parse.
-        let vi = ast::view_item_import(~[
+        let vi = ast::view_item_use(~[
             @codemap::spanned {
                 node: ast::view_path_simple(
                     self.ident_of(~"Owned"),
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 799f0d40a46..fa51d4c29d2 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -54,7 +54,7 @@ use ast::{ty_infer, ty_mac, ty_method};
 use ast::{ty_nil, ty_param, ty_param_bound, ty_path, ty_ptr, ty_rec, ty_rptr};
 use ast::{ty_tup, ty_u32, ty_uniq, ty_vec, type_value_ns, uniq};
 use ast::{unnamed_field, unsafe_blk, unsafe_fn, variant, view_item};
-use ast::{view_item_, view_item_import, view_item_use};
+use ast::{view_item_, view_item_extern_mod, view_item_use};
 use ast::{view_path, view_path_glob, view_path_list, view_path_simple};
 use ast::{visibility, vstore, vstore_box, vstore_fixed, vstore_slice};
 use ast::{vstore_uniq};
@@ -3503,7 +3503,7 @@ pub impl Parser {
         let metadata = self.parse_optional_meta();
         self.expect(token::SEMI);
         iovi_view_item(@ast::view_item {
-            node: view_item_use(ident, metadata, self.get_id()),
+            node: view_item_extern_mod(ident, metadata, self.get_id()),
             attrs: attrs,
             vis: visibility,
             span: mk_sp(lo, self.last_span.hi)
@@ -3884,7 +3884,7 @@ pub impl Parser {
     }
 
     fn parse_use() -> view_item_ {
-        return view_item_import(self.parse_view_paths());
+        return view_item_use(self.parse_view_paths());
     }
 
     fn parse_view_path() -> @view_path {
@@ -4006,7 +4006,7 @@ pub impl Parser {
             self.expect_keyword(~"mod");
             let ident = self.parse_ident();
             let metadata = self.parse_optional_meta();
-            view_item_use(ident, metadata, self.get_id())
+            view_item_extern_mod(ident, metadata, self.get_id())
         } else {
             fail!();
         };
@@ -4053,8 +4053,8 @@ pub impl Parser {
                 iovi_view_item(view_item) => {
                     if restricted_to_imports {
                             match view_item.node {
-                                view_item_import(_) => {}
-                                view_item_use(*) =>
+                                view_item_use(*) => {}
+                                view_item_extern_mod(*) =>
                                     self.fatal(~"\"extern mod\" \
                                                  declarations are not \
                                                  allowed here")
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index b05461aa8d9..d5cba4312b7 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -1859,7 +1859,7 @@ pub fn print_view_item(s: @ps, item: @ast::view_item) {
     print_outer_attributes(s, item.attrs);
     print_visibility(s, item.vis);
     match item.node {
-        ast::view_item_use(id, mta, _) => {
+        ast::view_item_extern_mod(id, mta, _) => {
             head(s, ~"extern mod");
             print_ident(s, id);
             if !mta.is_empty() {
@@ -1869,7 +1869,7 @@ pub fn print_view_item(s: @ps, item: @ast::view_item) {
             }
         }
 
-        ast::view_item_import(vps) => {
+        ast::view_item_use(vps) => {
             head(s, ~"use");
             print_view_paths(s, vps);
         }