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

This commit is contained in:
Brian Anderson 2012-09-11 17:46:20 -07:00
parent fb851242b7
commit ea01ee2e9e
274 changed files with 308 additions and 316 deletions

View File

@ -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::*;

View File

@ -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::*;

View File

@ -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::*;

View File

@ -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;
}

View File

@ -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;

View File

@ -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") {

View File

@ -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);

View File

@ -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::*;

View File

@ -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::*;

View File

@ -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::*;

View File

@ -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;

View File

@ -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() }

View File

@ -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() }

View File

@ -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() }
}

View File

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

View File

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

View File

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

View File

@ -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 {

View File

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

View File

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

View File

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

View File

@ -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;

View File

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

View File

@ -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;

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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; }

View File

@ -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; }

View File

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

View File

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

View File

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

View File

@ -12,7 +12,7 @@
//
// writes pbm image to output path
use std;
extern mod std;
use io::WriterUtil;
use std::map::HashMap;

View File

@ -1,7 +1,7 @@
// based on:
// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
use std;
extern mod std;
// Using sqrt from the standard library is way slower than using libc
// directly even though std just calls libc, I guess it must be

View File

@ -10,7 +10,7 @@
*/
use std;
extern mod std;
use std::{time, getopts};
use io::WriterUtil;

View File

@ -1,6 +1,6 @@
// Based on spectalnorm.gcc by Sebastien Loisel
use std;
extern mod std;
fn eval_A(i: uint, j: uint) -> float {
1.0/(((i+j)*(i+j+1u)/2u+i+1u) as float)

View File

@ -1,5 +1,5 @@
// Based on threadring.erlang by Jira Isa
use std;
extern mod std;
const n_threads: int = 503;

View File

@ -1,6 +1,6 @@
// Microbenchmark for the smallintmap library
use std;
extern mod std;
use std::smallintmap;
use std::smallintmap::SmallIntMap;
use io::WriterUtil;

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
use std::bitv;
use io::{ReaderUtil, WriterUtil};

View File

@ -1,6 +1,6 @@
// xfail-win32
use std;
extern mod std;
use std::list::{List, Cons, Nil};
use std::time::precise_time_s;

View File

@ -10,7 +10,7 @@
// xfail-pretty
use std;
extern mod std;
use option = option;
use option::Some;

View File

@ -1,6 +1,6 @@
// xfail-fast aux-build
// aux-build:ambig_impl_2_lib.rs
use ambig_impl_2_lib;
extern mod ambig_impl_2_lib;
use ambig_impl_2_lib::me;
trait me {
fn me() -> uint;

View File

@ -1,6 +1,6 @@
// xfail-test
// error-pattern: instantiating a type parameter with an incompatible type
use std;
extern mod std;
use std::arc::rw_arc;
fn main() {

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::arc;
fn main() {
let x = ~arc::RWARC(1);

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
use std::arc;
fn main() {
let x = ~arc::RWARC(1);

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::arc;
fn main() {
let x = ~arc::RWARC(1);

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::arc;
fn main() {
let x = ~arc::RWARC(1);

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::arc;
fn main() {
let x = ~arc::RWARC(1);

View File

@ -1,5 +1,5 @@
//buggy.rs
use std;
extern mod std;
use std::map::HashMap;
use std::map;

View File

@ -3,7 +3,7 @@
// aux-build:crateresolve1-3.rs
// error-pattern:multiple matching crates for `crateresolve1`
use crateresolve1;
extern mod crateresolve1;
fn main() {
}

View File

@ -3,10 +3,10 @@
// aux-build:crateresolve2-3.rs
// error-pattern:using multiple versions of crate `crateresolve2`
use crateresolve2(vers = "0.1");
extern mod crateresolve2(vers = "0.1");
mod m {
use crateresolve2(vers = "0.2");
extern mod crateresolve2(vers = "0.2");
}
fn main() {

View File

@ -3,8 +3,8 @@
// aux-build:crateresolve5-2.rs
// error-pattern:mismatched types
use cr5_1 (name = "crateresolve5", vers = "0.1");
use cr5_2 (name = "crateresolve5", vers = "0.2");
extern mod cr5_1 (name = "crateresolve5", vers = "0.1");
extern mod cr5_2 (name = "crateresolve5", vers = "0.2");
fn main() {
// Nominal types from two multiple versions of a crate are different types

View File

@ -1,5 +1,5 @@
// error-pattern:not enough arguments
use std;
extern mod std;
fn main() { let s = fmt!("%s%s%s", "test", "test"); }

View File

@ -1,5 +1,5 @@
// error-pattern:too many arguments
use std;
extern mod std;
fn main() { let s = fmt!("%s", "test", "test"); }

View File

@ -1,5 +1,5 @@
// error-pattern: mismatched types
use std;
extern mod std;
use std::map::HashMap;
use std::bitv;

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
fn siphash(k0 : u64) {

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
fn siphash<T>() {

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
trait siphash {
fn result() -> u64;

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
trait siphash {
fn reset();

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
use cmp::Eq;
fn f<T:Eq>(&o: Option<T>) {

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
use std::map;
use std::map::HashMap;
use std::map::Map;

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
fn main() {
unsafe fn f(&&v: *const int) {

View File

@ -1,6 +1,6 @@
// error-pattern: mismatched types
use std;
extern mod std;
fn main() {
let a = ~[0];

View File

@ -1,6 +1,6 @@
// error-pattern: copying a noncopyable value
use std;
extern mod std;
use std::arc;
use comm::*;

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
use std::arc;
use comm::*;

View File

@ -1,6 +1,6 @@
// aux-build:noexporttypelib.rs
use noexporttypelib;
extern mod noexporttypelib;
fn main() {
// Here, the type returned by foo() is not exported.

View File

@ -1,6 +1,6 @@
// -*- rust -*-
use std;
extern mod std;
use option::Some;
// error-pattern: mismatched types

View File

@ -1,5 +1,5 @@
// -*- rust -*-
use std;
extern mod std;
use option::Some;
// error-pattern: mismatched types

View File

@ -1,6 +1,6 @@
// xfail-fast
// aux-build:cci_class.rs
use cci_class;
extern mod cci_class;
use cci_class::kitties::*;
fn main() {

View File

@ -1,7 +1,7 @@
// xfail-pretty
use std;
use syntax;
extern mod std;
extern mod syntax;
use io::*;

View File

@ -1,6 +1,6 @@
// xfail-pretty
use std;
extern mod std;
use syntax;
use std::io::*;

View File

@ -1,5 +1,5 @@
mod argparse {
use std;
extern mod std;
use either::{Either, Left, Right};

View File

@ -1,4 +1,4 @@
use std;
extern mod std;
fn main() {
trait seq { }

View File

@ -1,5 +1,5 @@
// error-pattern: mismatched types
use std;
extern mod std;
fn main() { task::spawn(fn~() -> int { 10 }); }

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::sync;
fn main() {

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::sync;
fn main() {
let x = ~sync::RWlock();

View File

@ -1,5 +1,5 @@
// error-pattern: cannot infer an appropriate lifetime
use std;
extern mod std;
use std::sync;
fn main() {
let x = ~sync::RWlock();

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::sync;
fn main() {
let x = ~sync::RWlock();

View File

@ -1,5 +1,5 @@
// error-pattern: reference is not valid outside of its lifetime
use std;
extern mod std;
use std::sync;
fn main() {
let x = ~sync::RWlock();

View File

@ -3,7 +3,7 @@
#[no_core];
use core;
extern mod core;
fn last<T: Copy>(v: ~[const T]) -> core::Option<T> {
fail;

View File

@ -1,5 +1,5 @@
// error-pattern:duplicate meta item `name`
use std(name = "std", name = "nonstd");
extern mod std(name = "std", name = "nonstd");
fn main() { }

View File

@ -1,5 +1,5 @@
// error-pattern:can't find crate for `std`
use std(complex(meta(item)));
extern mod std(complex(meta(item)));
fn main() { }

View File

@ -1,4 +1,4 @@
// error-pattern:can't find crate for `std`
use std (name = "std",
extern mod std (name = "std",
vers = "bogus");

View File

@ -1,6 +1,6 @@
// xfail-test
use std;
extern mod std;
fn f() {
}

View File

@ -1,3 +1,3 @@
// error-pattern:moop
use std;
extern mod std;
fn main() { fail ~"moop"; }

View File

@ -1,4 +1,4 @@
// error-pattern:meh
use std;
extern mod std;
fn main() { let str_var: ~str = ~"meh"; fail fmt!("%s", str_var); }

View File

@ -1,3 +1,3 @@
// error-pattern:moop
use std;
extern mod std;
fn main() { for uint::range(0u, 10u) |_i| { fail ~"moop"; } }

View File

@ -1,6 +1,6 @@
// error-pattern:explicit failure
// Don't double free the string
use std;
extern mod std;
use io::Reader;
fn main() {

View File

@ -1,6 +1,6 @@
// error-pattern:explicit failure
use std;
extern mod std;
use std::arc;
enum e<T: Const Send> { e(arc::ARC<T>) }

View File

@ -1,7 +1,7 @@
// -*- rust -*-
// error-pattern:1 == 2
use std;
extern mod std;
use comm::Port;
use comm::recv;

View File

@ -1,7 +1,7 @@
// -*- rust -*-
// error-pattern:fail
use std;
extern mod std;
use comm::Chan;
use comm::Port;
use comm::recv;

View File

@ -1,7 +1,7 @@
// -*- rust -*-
// error-pattern:fail
use std;
extern mod std;
use comm::Port;
use comm::recv;

Some files were not shown because too many files have changed in this diff Show More