Convert 'use' to 'extern mod'. Remove old 'use' syntax

Author: brson

src/cargo/cargo.rc

@@ -21,10 +21,10 @@
 #[allow(vecs_implicitly_copyable,
         non_implicitly_copyable_typarams)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
-use rustc(vers = "0.4");
-use syntax(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
+extern mod rustc(vers = "0.4");
+extern mod syntax(vers = "0.4");
 
 use core::*;
 

src/compiletest/compiletest.rc

@@ -4,8 +4,8 @@
 
 #[allow(vecs_implicitly_copyable)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
 
 use core::*;
 

src/fuzzer/fuzzer.rc

@@ -6,9 +6,9 @@
 
 #[allow(vecs_implicitly_copyable)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
-use syntax(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
+extern mod syntax(vers = "0.4");
 
 use core::*;
 

src/libcore/core.rs

@@ -58,7 +58,7 @@ export Add, Sub, Mul, Div, Modulo, Neg, BitAnd, BitOr, BitXor;
 export Shl, Shr, Index;
 
 #[cfg(test)]
-use coreops(name = "core", vers = "0.4");
+extern mod coreops(name = "core", vers = "0.4");
 
 #[cfg(test)]
 use coreops::ops::{Const, Copy, Send, Owned};
@@ -96,7 +96,7 @@ mod core {
 // Similar to above. Some magic to make core testable.
 #[cfg(test)]
 mod std {
-    use std(vers = "0.4");
+    extern mod std(vers = "0.4");
     use std::test;
 }
 

src/libstd/std.rc

@@ -13,7 +13,7 @@
 #[allow(vecs_implicitly_copyable)];
 #[deny(non_camel_case_types)];
 
-use core(vers = "0.4");
+extern mod core(vers = "0.4");
 use core::*;
 
 export net, net_tcp, net_ip, net_url;

src/libsyntax/parse/parser.rs

@@ -3328,7 +3328,7 @@ impl parser {
                                           visibility,
                                           maybe_append(attrs, extra_attrs)));
         } else if self.eat_keyword(~"use") {
-            let view_item = self.parse_use(visibility);
+            let view_item = self.parse_use();
             self.expect(token::SEMI);
             return iovi_view_item(@{
                 node: view_item,
@@ -3379,15 +3379,7 @@ impl parser {
         }
     }
 
-    fn parse_use(vis: visibility) -> view_item_ {
-        if vis != public && (self.look_ahead(1) == token::SEMI ||
-                             self.look_ahead(1) == token::LPAREN) {
-            // Old-style "use"; i.e. what we now call "extern mod".
-            let ident = self.parse_ident();
-            let metadata = self.parse_optional_meta();
-            return view_item_use(ident, metadata, self.get_id());
-        }
-
+    fn parse_use() -> view_item_ {
         return view_item_import(self.parse_view_paths());
     }
 
@@ -3496,7 +3488,7 @@ impl parser {
     fn parse_view_item(+attrs: ~[attribute]) -> @view_item {
         let lo = self.span.lo, vis = self.parse_visibility();
         let node = if self.eat_keyword(~"use") {
-            self.parse_use(vis)
+            self.parse_use()
         } else if self.eat_keyword(~"export") {
             view_item_export(self.parse_view_paths())
         } else if self.eat_keyword(~"extern") {

src/libsyntax/print/pprust.rs

@@ -1747,7 +1747,7 @@ fn print_view_item(s: ps, item: @ast::view_item) {
     print_outer_attributes(s, item.attrs);
     match item.node {
       ast::view_item_use(id, mta, _) => {
-        head(s, ~"use");
+        head(s, ~"extern mod");
         print_ident(s, id);
         if vec::len(mta) > 0u {
             popen(s);

src/libsyntax/syntax.rc

@@ -10,8 +10,8 @@
 
 #[allow(vecs_implicitly_copyable)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
 
 use core::*;
 

src/rustc/driver/rustc.rs

@@ -1,10 +1,10 @@
 #[no_core];
 #[allow(vecs_implicitly_copyable)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
-use rustc(vers = "0.4");
-use syntax(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
+extern mod rustc(vers = "0.4");
+extern mod syntax(vers = "0.4");
 
 use core::*;
 

src/rustc/rustc.rc

@@ -14,9 +14,9 @@
 #[allow(vecs_implicitly_copyable)];
 // #[warn(deprecated_pattern)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
-use syntax(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
+extern mod syntax(vers = "0.4");
 
 use core::*;
 

src/rustdoc/rustdoc.rc

@@ -14,10 +14,10 @@
 #[allow(vecs_implicitly_copyable,
         non_implicitly_copyable_typarams)];
 
-use core(vers = "0.4");
-use std(vers = "0.4");
-use rustc(vers = "0.4");
-use syntax(vers = "0.4");
+extern mod core(vers = "0.4");
+extern mod std(vers = "0.4");
+extern mod rustc(vers = "0.4");
+extern mod syntax(vers = "0.4");
 
 use core::*;
 use std::par;

src/test/auxiliary/crateresolve4b-1.rs

@@ -3,6 +3,6 @@
 #[link(name = "crateresolve4b", vers = "0.1")];
 #[crate_type = "lib"];
 
-use crateresolve4a(vers="0.2");
+extern mod crateresolve4a(vers="0.2");
 
 fn f() -> int { crateresolve4a::g() }

src/test/auxiliary/crateresolve4b-2.rs

@@ -3,6 +3,6 @@
 #[link(name = "crateresolve4b", vers = "0.2")];
 #[crate_type = "lib"];
 
-use crateresolve4a(vers="0.1");
+extern mod crateresolve4a(vers="0.1");
 
 fn g() -> int { crateresolve4a::f() }

src/test/auxiliary/crateresolve7x.rs

@@ -4,11 +4,11 @@
 
 // These both have the same version but differ in other metadata
 mod a {
-    use cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
+    extern mod cr_1 (name = "crateresolve_calories", vers = "0.1", calories="100");
     fn f() -> int { cr_1::f() }
 }
 
 mod b {
-    use cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
+    extern mod cr_2 (name = "crateresolve_calories", vers = "0.1", calories="200");
     fn f() -> int { cr_2::f() }
 }

src/test/auxiliary/issue-2414-b.rs

@@ -3,5 +3,5 @@
 #[link(name = "b", vers = "0.1")];
 #[crate_type = "lib"];
 
-use a;
+extern mod a;
 

src/test/auxiliary/issue-2526.rs

@@ -3,7 +3,7 @@
        uuid = "54cc1bc9-02b8-447c-a227-75ebc923bc29")];
 #[crate_type = "lib"];
 
-use std;
+extern mod std;
 
 export context;
 

src/test/auxiliary/issue-2631-a.rs

@@ -1,7 +1,7 @@
 #[link(name = "req")];
 #[crate_type = "lib"];
 
-use std;
+extern mod std;
 
 use dvec::*;
 use dvec::DVec;

src/test/auxiliary/issue_2242_b.rs

@@ -1,7 +1,7 @@
 #[link(name = "b", vers = "0.1")];
 #[crate_type = "lib"];
 
-use a;
+extern mod a;
 use a::to_strz;
 
 impl int: to_strz {

src/test/auxiliary/issue_2242_c.rs

@@ -1,7 +1,7 @@
 #[link(name = "c", vers = "0.1")];
 #[crate_type = "lib"];
 
-use a;
+extern mod a;
 
 use a::to_strz;
 

src/test/auxiliary/issue_2316_b.rs

@@ -1,4 +1,4 @@
-use issue_2316_a;
+extern mod issue_2316_a;
 
 mod cloth {
 

src/test/bench/core-map.rs

@@ -4,7 +4,7 @@
 
 */
 
-use std;
+extern mod std;
 use std::map;
 use mutable::Mut;
 use send_map::linear::*;

src/test/bench/core-std.rs

@@ -1,6 +1,6 @@
 // Microbenchmarks for various functions in core and std
 
-use std;
+extern mod std;
 
 use std::time::precise_time_s;
 use std::map;

src/test/bench/core-vec-append.rs

@@ -1,6 +1,6 @@
 // A raw test of vector appending performance.
 
-use std;
+extern mod std;
 use dvec::DVec;
 use io::WriterUtil;
 

src/test/bench/graph500-bfs.rs

@@ -4,7 +4,7 @@ An implementation of the Graph500 Breadth First Search problem in Rust.
 
 */
 
-use std;
+extern mod std;
 use std::arc;
 use std::time;
 use std::map;

src/test/bench/msgsend-pipes-shared.rs

@@ -10,7 +10,7 @@
 
 // xfail-pretty
 
-use std;
+extern mod std;
 use io::Writer;
 use io::WriterUtil;
 

src/test/bench/msgsend-pipes.rs

@@ -6,7 +6,7 @@
 
 // xfail-pretty
 
-use std;
+extern mod std;
 use io::Writer;
 use io::WriterUtil;
 

src/test/bench/msgsend-ring-mutex-arcs.rs

@@ -9,7 +9,7 @@
 
 use future::future;
 
-use std;
+extern mod std;
 use std::time;
 use std::arc;
 

src/test/bench/msgsend-ring-pipes.rs

@@ -10,7 +10,7 @@
 
 use future::future;
 
-use std;
+extern mod std;
 use std::time;
 
 use pipes::recv;

src/test/bench/msgsend-ring-rw-arcs.rs

@@ -9,7 +9,7 @@
 
 use future::future;
 
-use std;
+extern mod std;
 use std::time;
 use std::arc;
 

src/test/bench/msgsend-ring.rs

@@ -7,7 +7,7 @@
 use comm::*;
 use future::future;
 
-use std;
+extern mod std;
 use std::time;
 
 fn thread_ring(i: uint,

src/test/bench/msgsend.rs

@@ -4,7 +4,7 @@
 //
 // I *think* it's the same, more or less.
 
-use std;
+extern mod std;
 use io::Writer;
 use io::WriterUtil;
 

src/test/bench/pingpong.rs

@@ -2,7 +2,7 @@
 
 // xfail-pretty
 
-use std;
+extern mod std;
 
 use pipes::{spawn_service, recv};
 use std::time::precise_time_s;

src/test/bench/shootout-ackermann.rs

@@ -1,4 +1,4 @@
-use std;
+extern mod std;
 
 fn ack(m: int, n: int) -> int {
     if m == 0 {

src/test/bench/shootout-binarytrees.rs

@@ -1,4 +1,4 @@
-use std;
+extern mod std;
 use std::arena;
 use methods = std::arena::Arena;
 

src/test/bench/shootout-chameneos-redux.rs

@@ -1,6 +1,6 @@
 // chameneos
 
-use std;
+extern mod std;
 use std::map;
 use std::map::HashMap;
 use std::sort;

src/test/bench/shootout-fannkuchredux.rs

@@ -1,5 +1,5 @@
 // Based on Isaac Gouy's fannkuchredux.csharp
-use std;
+extern mod std;
 
 fn fannkuch(n: int) -> int {
     fn perm1init(i: uint) -> int { return i as int; }

src/test/bench/shootout-fasta.rs

@@ -5,7 +5,7 @@
  * Computer Language Benchmarks Game
  * http://shootout.alioth.debian.org/
  */
-use std;
+extern mod std;
 use io::WriterUtil;
 
 fn LINE_LENGTH() -> uint { return 60u; }

src/test/bench/shootout-fibo.rs

@@ -1,4 +1,4 @@
-use std;
+extern mod std;
 
 fn fib(n: int) -> int {
     if n < 2 {

src/test/bench/shootout-k-nucleotide-pipes.rs

@@ -2,7 +2,7 @@
 
 // multi tasking k-nucleotide
 
-use std;
+extern mod std;
 use std::map;
 use std::map::HashMap;
 use std::sort;