diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2012-09-05 12:32:05 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2012-09-05 12:32:05 -0700 |
| commit | f686896f60d901fd7f97add72fbc047691027baa (patch) | |
| tree | 5cfb0f00f9d0eaef93839f33adf532bea5846c33 /src | |
| parent | 47dac47e96fb47f84ac2f75781e2819ce80791a4 (diff) | |
| download | rust-f686896f60d901fd7f97add72fbc047691027baa.tar.gz rust-f686896f60d901fd7f97add72fbc047691027baa.zip | |
test: "import" -> "use"
Diffstat (limited to 'src')
270 files changed, 409 insertions, 562 deletions
diff --git a/src/test/auxiliary/cci_capture_clause.rs b/src/test/auxiliary/cci_capture_clause.rs index a022ee63273..27400322e40 100644 --- a/src/test/auxiliary/cci_capture_clause.rs +++ b/src/test/auxiliary/cci_capture_clause.rs @@ -1,6 +1,6 @@ export foo; -import comm::*; +use comm::*; fn foo<T: send copy>(x: T) -> Port<T> { let p = Port(); diff --git a/src/test/auxiliary/cci_class_cast.rs b/src/test/auxiliary/cci_class_cast.rs index 3a914a703e1..830ca90628a 100644 --- a/src/test/auxiliary/cci_class_cast.rs +++ b/src/test/auxiliary/cci_class_cast.rs @@ -1,5 +1,5 @@ -import to_str::*; -import to_str::ToStr; +use to_str::*; +use to_str::ToStr; mod kitty { diff --git a/src/test/auxiliary/cci_nested_lib.rs b/src/test/auxiliary/cci_nested_lib.rs index ff468be9540..8a714740550 100644 --- a/src/test/auxiliary/cci_nested_lib.rs +++ b/src/test/auxiliary/cci_nested_lib.rs @@ -1,4 +1,4 @@ -import dvec::DVec; +use dvec::DVec; type entry<A,B> = {key: A, value: B}; type alist<A,B> = { eq_fn: fn@(A,A) -> bool, data: DVec<entry<A,B>> }; diff --git a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs index bd3f6303857..e9becef99b5 100644 --- a/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs +++ b/src/test/auxiliary/crate-method-reexport-grrrrrrr2.rs @@ -2,7 +2,7 @@ export rust; -import name_pool::add; +use name_pool::add; mod name_pool { diff --git a/src/test/auxiliary/issue-2196-c.rs b/src/test/auxiliary/issue-2196-c.rs index 684dc5f8d3e..f2f193cd0f3 100644 --- a/src/test/auxiliary/issue-2196-c.rs +++ b/src/test/auxiliary/issue-2196-c.rs @@ -1,4 +1,4 @@ -import b::d; +use b::d; type t = uint; diff --git a/src/test/auxiliary/issue-2631-a.rs b/src/test/auxiliary/issue-2631-a.rs index 9d69cf15562..35a35420636 100644 --- a/src/test/auxiliary/issue-2631-a.rs +++ b/src/test/auxiliary/issue-2631-a.rs @@ -3,9 +3,9 @@ use std; -import dvec::*; -import dvec::DVec; -import std::map::hashmap; +use dvec::*; +use dvec::DVec; +use std::map::hashmap; type header_map = hashmap<~str, @DVec<@~str>>; diff --git a/src/test/auxiliary/issue2378b.rs b/src/test/auxiliary/issue2378b.rs index 322ee2ed444..6cbb7edf763 100644 --- a/src/test/auxiliary/issue2378b.rs +++ b/src/test/auxiliary/issue2378b.rs @@ -1,7 +1,7 @@ use issue2378a; -import issue2378a::maybe; -import issue2378a::methods; +use issue2378a::maybe; +use issue2378a::methods; type two_maybes<T> = {a: maybe<T>, b: maybe<T>}; diff --git a/src/test/auxiliary/issue_2242_b.rs b/src/test/auxiliary/issue_2242_b.rs index ae6c2fb571a..55beefd2683 100644 --- a/src/test/auxiliary/issue_2242_b.rs +++ b/src/test/auxiliary/issue_2242_b.rs @@ -2,7 +2,7 @@ #[crate_type = "lib"]; use a; -import a::to_strz; +use a::to_strz; impl int: to_strz { fn to_strz() -> ~str { fmt!("%?", self) } diff --git a/src/test/auxiliary/issue_2242_c.rs b/src/test/auxiliary/issue_2242_c.rs index cd057a09e76..18dc2cd1c05 100644 --- a/src/test/auxiliary/issue_2242_c.rs +++ b/src/test/auxiliary/issue_2242_c.rs @@ -3,7 +3,7 @@ use a; -import a::to_strz; +use a::to_strz; impl bool: to_strz { fn to_strz() -> ~str { fmt!("%b", self) } diff --git a/src/test/auxiliary/issue_2316_b.rs b/src/test/auxiliary/issue_2316_b.rs index c1be44d19f9..81a7ed3db4c 100644 --- a/src/test/auxiliary/issue_2316_b.rs +++ b/src/test/auxiliary/issue_2316_b.rs @@ -2,7 +2,7 @@ use issue_2316_a; mod cloth { -import issue_2316_a::*; +use issue_2316_a::*; export calico, gingham, flannel; export fabric; diff --git a/src/test/auxiliary/test_comm.rs b/src/test/auxiliary/test_comm.rs index 8c89df79811..0fb66520479 100644 --- a/src/test/auxiliary/test_comm.rs +++ b/src/test/auxiliary/test_comm.rs @@ -4,7 +4,7 @@ Could probably be more minimal. */ -import libc::size_t; +use libc::size_t; export port::{}; export port; diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs index 63ce0958570..c7e70a8416f 100644 --- a/src/test/bench/core-map.rs +++ b/src/test/bench/core-map.rs @@ -5,11 +5,10 @@ */ use std; -import rand; -import std::map; -import managed::Managed; -import send_map::linear::*; -import io::WriterUtil; +use std::map; +use managed::Managed; +use send_map::linear::*; +use io::WriterUtil; struct Results { sequential_ints: float; diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index 2cea9d14cdd..c153df497c6 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -2,11 +2,11 @@ use std; -import std::time::precise_time_s; -import std::map; -import std::map::{map, hashmap}; +use std::time::precise_time_s; +use std::map; +use std::map::{map, hashmap}; -import io::{Reader, ReaderUtil}; +use io::{Reader, ReaderUtil}; fn main(argv: ~[~str]) { #macro[ diff --git a/src/test/bench/core-vec-append.rs b/src/test/bench/core-vec-append.rs index fe65bcaf623..8d6fc709d09 100644 --- a/src/test/bench/core-vec-append.rs +++ b/src/test/bench/core-vec-append.rs @@ -1,8 +1,8 @@ // A raw test of vector appending performance. use std; -import dvec::DVec; -import io::WriterUtil; +use dvec::DVec; +use io::WriterUtil; fn collect_raw(num: uint) -> ~[uint] { let mut result = ~[]; diff --git a/src/test/bench/graph500-bfs.rs b/src/test/bench/graph500-bfs.rs index cb94e43d8e7..1dd116b2b41 100644 --- a/src/test/bench/graph500-bfs.rs +++ b/src/test/bench/graph500-bfs.rs @@ -5,17 +5,17 @@ An implementation of the Graph500 Breadth First Search problem in Rust. */ use std; -import std::arc; -import std::time; -import std::map; -import std::map::map; -import std::map::hashmap; -import std::deque; -import std::deque::Deque; -import std::par; -import io::WriterUtil; -import comm::*; -import int::abs; +use std::arc; +use std::time; +use std::map; +use std::map::map; +use std::map::hashmap; +use std::deque; +use std::deque::Deque; +use std::par; +use io::WriterUtil; +use comm::*; +use int::abs; type node_id = i64; type graph = ~[~[node_id]]; diff --git a/src/test/bench/msgsend-pipes-shared.rs b/src/test/bench/msgsend-pipes-shared.rs index 867d4669456..428394e0f3d 100644 --- a/src/test/bench/msgsend-pipes-shared.rs +++ b/src/test/bench/msgsend-pipes-shared.rs @@ -11,10 +11,10 @@ // xfail-pretty use std; -import io::Writer; -import io::WriterUtil; +use io::Writer; +use io::WriterUtil; -import pipes::{Port, Chan, SharedChan}; +use pipes::{Port, Chan, SharedChan}; macro_rules! move_out ( { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } } diff --git a/src/test/bench/msgsend-pipes.rs b/src/test/bench/msgsend-pipes.rs index eb7e0edfb11..8753e9aa4e6 100644 --- a/src/test/bench/msgsend-pipes.rs +++ b/src/test/bench/msgsend-pipes.rs @@ -7,10 +7,10 @@ // xfail-pretty use std; -import io::Writer; -import io::WriterUtil; +use io::Writer; +use io::WriterUtil; -import pipes::{Port, PortSet, Chan}; +use pipes::{Port, PortSet, Chan}; macro_rules! move_out ( { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } } diff --git a/src/test/bench/msgsend-ring-mutex-arcs.rs b/src/test/bench/msgsend-ring-mutex-arcs.rs index 9145a586161..81babc00f09 100644 --- a/src/test/bench/msgsend-ring-mutex-arcs.rs +++ b/src/test/bench/msgsend-ring-mutex-arcs.rs @@ -7,11 +7,11 @@ // xfail-pretty -import future::future; +use future::future; use std; -import std::time; -import std::arc; +use std::time; +use std::arc; // A poor man's pipe. type pipe = arc::MutexARC<~[uint]>; diff --git a/src/test/bench/msgsend-ring-pipes.rs b/src/test/bench/msgsend-ring-pipes.rs index a96e31e7791..63ac80536af 100644 --- a/src/test/bench/msgsend-ring-pipes.rs +++ b/src/test/bench/msgsend-ring-pipes.rs @@ -8,12 +8,12 @@ // xfail-pretty -import future::future; +use future::future; use std; -import std::time; +use std::time; -import pipes::recv; +use pipes::recv; proto! ring ( num:send { diff --git a/src/test/bench/msgsend-ring-rw-arcs.rs b/src/test/bench/msgsend-ring-rw-arcs.rs index 7f7c42be274..745e1e4e758 100644 --- a/src/test/bench/msgsend-ring-rw-arcs.rs +++ b/src/test/bench/msgsend-ring-rw-arcs.rs @@ -7,11 +7,11 @@ // xfail-pretty -import future::future; +use future::future; use std; -import std::time; -import std::arc; +use std::time; +use std::arc; // A poor man's pipe. type pipe = arc::RWARC<~[uint]>; diff --git a/src/test/bench/msgsend-ring.rs b/src/test/bench/msgsend-ring.rs index 05590037f0b..d972dde4c4a 100644 --- a/src/test/bench/msgsend-ring.rs +++ b/src/test/bench/msgsend-ring.rs @@ -4,11 +4,11 @@ // that things will look really good once we get that lock out of the // message path. -import comm::*; -import future::future; +use comm::*; +use future::future; use std; -import std::time; +use std::time; fn thread_ring(i: uint, count: uint, diff --git a/src/test/bench/msgsend.rs b/src/test/bench/msgsend.rs index d7c8e8436cd..7db202e30b1 100644 --- a/src/test/bench/msgsend.rs +++ b/src/test/bench/msgsend.rs @@ -5,8 +5,8 @@ // I *think* it's the same, more or less. use std; -import io::Writer; -import io::WriterUtil; +use io::Writer; +use io::WriterUtil; enum request { get_count, diff --git a/src/test/bench/pingpong.rs b/src/test/bench/pingpong.rs index 262bc2e4813..53132293de9 100644 --- a/src/test/bench/pingpong.rs +++ b/src/test/bench/pingpong.rs @@ -4,8 +4,8 @@ use std; -import pipes::{spawn_service, recv}; -import std::time::precise_time_s; +use pipes::{spawn_service, recv}; +use std::time::precise_time_s; proto! pingpong ( ping: send { diff --git a/src/test/bench/shootout-binarytrees.rs b/src/test/bench/shootout-binarytrees.rs index 0630d9e5c8a..f365c900522 100644 --- a/src/test/bench/shootout-binarytrees.rs +++ b/src/test/bench/shootout-binarytrees.rs @@ -1,6 +1,6 @@ use std; -import std::arena; -import methods = std::arena::Arena; +use std::arena; +use methods = std::arena::Arena; enum tree/& { nil, node(&tree, &tree, int), } diff --git a/src/test/bench/shootout-chameneos-redux.rs b/src/test/bench/shootout-chameneos-redux.rs index a4ac4794bd3..91f77a77ffb 100644 --- a/src/test/bench/shootout-chameneos-redux.rs +++ b/src/test/bench/shootout-chameneos-redux.rs @@ -1,9 +1,9 @@ // chameneos use std; -import std::map; -import std::map::hashmap; -import std::sort; +use std::map; +use std::map::hashmap; +use std::sort; fn print_complements() { let all = ~[Blue, Red, Yellow]; diff --git a/src/test/bench/shootout-fannkuchredux.rs b/src/test/bench/shootout-fannkuchredux.rs index 330397ddc92..8534e7ed668 100644 --- a/src/test/bench/shootout-fannkuchredux.rs +++ b/src/test/bench/shootout-fannkuchredux.rs @@ -1,7 +1,5 @@ // Based on Isaac Gouy's fannkuchredux.csharp use std; -import int; -import vec; fn fannkuch(n: int) -> int { fn perm1init(i: uint) -> int { return i as int; } diff --git a/src/test/bench/shootout-fasta.rs b/src/test/bench/shootout-fasta.rs index 896ec6729b0..2587920143b 100644 --- a/src/test/bench/shootout-fasta.rs +++ b/src/test/bench/shootout-fasta.rs @@ -6,11 +6,7 @@ * http://shootout.alioth.debian.org/ */ use std; -import vec; -import uint; -import int; -import str; -import io::WriterUtil; +use io::WriterUtil; fn LINE_LENGTH() -> uint { return 60u; } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 4b29f76cc8a..ac70bf3aa9d 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -3,11 +3,11 @@ // multi tasking k-nucleotide use std; -import std::map; -import std::map::hashmap; -import std::sort; -import io::ReaderUtil; -import pipes::{stream, Port, Chan}; +use std::map; +use std::map::hashmap; +use std::sort; +use io::ReaderUtil; +use pipes::{stream, Port, Chan}; // given a map, print a sorted version of it fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index 206c91da7de..4322c19e3dc 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -3,10 +3,10 @@ // multi tasking k-nucleotide use std; -import std::map; -import std::map::hashmap; -import std::sort; -import io::ReaderUtil; +use std::map; +use std::map::hashmap; +use std::sort; +use io::ReaderUtil; // given a map, print a sorted version of it fn sort_and_fmt(mm: hashmap<~[u8], uint>, total: uint) -> ~str { diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index d203e7578b8..161c893fab7 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -13,8 +13,8 @@ // writes pbm image to output path use std; -import io::WriterUtil; -import std::map::hashmap; +use io::WriterUtil; +use std::map::hashmap; struct cmplx { re: f64; diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs index 66b2b07f1a9..5e7648b5f85 100644 --- a/src/test/bench/shootout-pfib.rs +++ b/src/test/bench/shootout-pfib.rs @@ -12,16 +12,16 @@ use std; -import std::{time, getopts}; -import io::WriterUtil; -import int::range; -import pipes::Port; -import pipes::Chan; -import pipes::send; -import pipes::recv; - -import core::result; -import result::{Ok, Err}; +use std::{time, getopts}; +use io::WriterUtil; +use int::range; +use pipes::Port; +use pipes::Chan; +use pipes::send; +use pipes::recv; + +use core::result; +use result::{Ok, Err}; fn fib(n: int) -> int { fn pfib(c: Chan<int>, n: int) { diff --git a/src/test/bench/std-smallintmap.rs b/src/test/bench/std-smallintmap.rs index 5fc36afceb5..7ee43f31f82 100644 --- a/src/test/bench/std-smallintmap.rs +++ b/src/test/bench/std-smallintmap.rs @@ -1,9 +1,9 @@ // Microbenchmark for the smallintmap library use std; -import std::smallintmap; -import std::smallintmap::SmallIntMap; -import io::WriterUtil; +use std::smallintmap; +use std::smallintmap::SmallIntMap; +use io::WriterUtil; fn append_sequential(min: uint, max: uint, map: SmallIntMap<uint>) { for uint::range(min, max) |i| { diff --git a/src/test/bench/sudoku.rs b/src/test/bench/sudoku.rs index 8f9878a6d11..eac8279270f 100644 --- a/src/test/bench/sudoku.rs +++ b/src/test/bench/sudoku.rs @@ -1,7 +1,7 @@ use std; -import std::bitv; -import io::{ReaderUtil, WriterUtil}; +use std::bitv; +use io::{ReaderUtil, WriterUtil}; // Computes a single solution to a given 9x9 sudoku // diff --git a/src/test/bench/task-perf-alloc-unwind.rs b/src/test/bench/task-perf-alloc-unwind.rs index c64fd4bc89c..51267986e6c 100644 --- a/src/test/bench/task-perf-alloc-unwind.rs +++ b/src/test/bench/task-perf-alloc-unwind.rs @@ -2,8 +2,8 @@ use std; -import std::list::{List, Cons, Nil}; -import std::time::precise_time_s; +use std::list::{List, Cons, Nil}; +use std::time::precise_time_s; fn main() { let (repeat, depth) = if os::getenv(~"RUST_BENCH").is_some() { diff --git a/src/test/bench/task-perf-word-count-generic.rs b/src/test/bench/task-perf-word-count-generic.rs index 0c175ab4e2c..c414c85781d 100644 --- a/src/test/bench/task-perf-word-count-generic.rs +++ b/src/test/bench/task-perf-word-count-generic.rs @@ -12,25 +12,19 @@ use std; -import option = option; -import option::Some; -import option::None; -import str; -import std::map; -import std::map::hashmap; -import vec; -import io; -import io::WriterUtil; - -import std::time; -import u64; - -import task; -import comm; -import comm::Chan; -import comm::Port; -import comm::recv; -import comm::send; +use option = option; +use option::Some; +use option::None; +use std::map; +use std::map::hashmap; +use io::WriterUtil; + +use std::time; + +use comm::Chan; +use comm::Port; +use comm::recv; +use comm::send; macro_rules! move_out ( { $x:expr } => { unsafe { let y <- *ptr::addr_of($x); y } } diff --git a/src/test/compile-fail/ambig_impl_2_exe.rs b/src/test/compile-fail/ambig_impl_2_exe.rs index 51c19db4a94..d53c924bdce 100644 --- a/src/test/compile-fail/ambig_impl_2_exe.rs +++ b/src/test/compile-fail/ambig_impl_2_exe.rs @@ -1,7 +1,7 @@ // xfail-fast aux-build // aux-build:ambig_impl_2_lib.rs use ambig_impl_2_lib; -import ambig_impl_2_lib::me; +use ambig_impl_2_lib::me; trait me { fn me() -> uint; } diff --git a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs index 2a2e5049bad..028f5ed626c 100644 --- a/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs +++ b/src/test/compile-fail/arc-cant-nest-rw-arc-3177.rs @@ -1,7 +1,7 @@ // xfail-test // error-pattern: instantiating a type parameter with an incompatible type use std; -import std::arc::rw_arc; +use std::arc::rw_arc; fn main() { let arc1 = ~rw_arc(true); diff --git a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs index 52ea25257ad..371523bc028 100644 --- a/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs index 104e4f103d3..781060d0bb7 100644 --- a/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs @@ -1,5 +1,5 @@ use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs index 1639f9a86b4..622e01c2586 100644 --- a/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-state-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs index 2b28172e3fd..2bb5f7d59d9 100644 --- a/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-write-mode-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs index 7aa97d7d1ee..fe270ea437e 100644 --- a/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/arc-rw-write-mode-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::arc; +use std::arc; fn main() { let x = ~arc::RWARC(1); let mut y = None; diff --git a/src/test/compile-fail/bad-module.rs b/src/test/compile-fail/bad-module.rs index cda91b7f904..79f12293616 100644 --- a/src/test/compile-fail/bad-module.rs +++ b/src/test/compile-fail/bad-module.rs @@ -1,4 +1,3 @@ // error-pattern: unresolved import -import thing; fn main() { let foo = thing::len(~[]); } diff --git a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs index f163a677582..785929fe002 100644 --- a/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs +++ b/src/test/compile-fail/borrowck-borrowed-uniq-rvalue.rs @@ -1,7 +1,7 @@ //buggy.rs use std; -import std::map::hashmap; -import std::map; +use std::map::hashmap; +use std::map; fn main() { let buggy_map :hashmap<uint, &uint> = diff --git a/src/test/compile-fail/export-import.rs b/src/test/compile-fail/export-import.rs index f010abd6a16..6c9f8d15698 100644 --- a/src/test/compile-fail/export-import.rs +++ b/src/test/compile-fail/export-import.rs @@ -1,6 +1,6 @@ // error-pattern: import -import m::unexported; +use m::unexported; mod m { export exported; diff --git a/src/test/compile-fail/for-loop-decl.rs b/src/test/compile-fail/for-loop-decl.rs index c2fdd5a8fdb..e14e1fdc7ef 100644 --- a/src/test/compile-fail/for-loop-decl.rs +++ b/src/test/compile-fail/for-loop-decl.rs @@ -1,7 +1,7 @@ // error-pattern: mismatched types use std; -import std::map::hashmap; -import std::bitv; +use std::map::hashmap; +use std::bitv; type fn_info = {vars: hashmap<uint, var_info>}; type var_info = {a: uint, b: uint}; diff --git a/src/test/compile-fail/fully-qualified-type-name4.rs b/src/test/compile-fail/fully-qualified-type-name4.rs index 5ef4cc9fe73..891be7cfbfc 100644 --- a/src/test/compile-fail/fully-qualified-type-name4.rs +++ b/src/test/compile-fail/fully-qualified-type-name4.rs @@ -1,6 +1,6 @@ // Test that we use fully-qualified type names in error messages. -import core::task::Task; +use core::task::Task; fn bar(x: uint) -> Task { return x; diff --git a/src/test/compile-fail/import-from-missing.rs b/src/test/compile-fail/import-from-missing.rs index 89d859edda3..bd3a35ad280 100644 --- a/src/test/compile-fail/import-from-missing.rs +++ b/src/test/compile-fail/import-from-missing.rs @@ -1,6 +1,6 @@ // error-pattern:unresolved // xfail-test -import spam::{ham, eggs}; +use spam::{ham, eggs}; mod spam { fn ham() { } diff --git a/src/test/compile-fail/import-from-path.rs b/src/test/compile-fail/import-from-path.rs index 0372d35ce8d..690bedeaac1 100644 --- a/src/test/compile-fail/import-from-path.rs +++ b/src/test/compile-fail/import-from-path.rs @@ -1,2 +1,2 @@ // error-pattern:expected -import foo::{bar}::baz \ No newline at end of file +use foo::{bar}::baz \ No newline at end of file diff --git a/src/test/compile-fail/import-from-rename.rs b/src/test/compile-fail/import-from-rename.rs index 6874a672e74..c72d9fda4e5 100644 --- a/src/test/compile-fail/import-from-rename.rs +++ b/src/test/compile-fail/import-from-rename.rs @@ -1,6 +1,6 @@ // error-pattern:expected -import baz = foo::{bar}; +use baz = foo::{bar}; mod foo { fn bar() {} diff --git a/src/test/compile-fail/import-glob-0.rs b/src/test/compile-fail/import-glob-0.rs index 93ad7dcf975..e9b485e4c6c 100644 --- a/src/test/compile-fail/import-glob-0.rs +++ b/src/test/compile-fail/import-glob-0.rs @@ -1,6 +1,6 @@ // error-pattern: unresolved name -import module_of_many_things::*; +use module_of_many_things::*; mod module_of_many_things { export f1; diff --git a/src/test/compile-fail/import-glob-export.rs b/src/test/compile-fail/import-glob-export.rs index 3965ad5fc4d..067caab3542 100644 --- a/src/test/compile-fail/import-glob-export.rs +++ b/src/test/compile-fail/import-glob-export.rs @@ -1,7 +1,7 @@ // error-pattern:unresolved name -import m1::*; +use m1::*; mod m1 { export f1; diff --git a/src/test/compile-fail/import-glob-path.rs b/src/test/compile-fail/import-glob-path.rs index e8cfa388574..9072fe0a659 100644 --- a/src/test/compile-fail/import-glob-path.rs +++ b/src/test/compile-fail/import-glob-path.rs @@ -1,2 +1,2 @@ // error-pattern:expected -import foo::*::bar \ No newline at end of file +use foo::*::bar \ No newline at end of file diff --git a/src/test/compile-fail/import-glob-rename.rs b/src/test/compile-fail/import-glob-rename.rs index 7ca92bad62d..3fd927d7e64 100644 --- a/src/test/compile-fail/import-glob-rename.rs +++ b/src/test/compile-fail/import-glob-rename.rs @@ -1,6 +1,6 @@ // error-pattern:expected -import baz = foo::*; +use baz = foo::*; mod foo { fn bar() {} diff --git a/src/test/compile-fail/import-loop.rs b/src/test/compile-fail/import-loop.rs index ae1f1a7f36e..0b263f23087 100644 --- a/src/test/compile-fail/import-loop.rs +++ b/src/test/compile-fail/import-loop.rs @@ -1,6 +1,6 @@ // error-pattern:import -import y::x; +use y::x; mod y { import x; diff --git a/src/test/compile-fail/import.rs b/src/test/compile-fail/import.rs index f06ff498fcc..14f23dec5f3 100644 --- a/src/test/compile-fail/import.rs +++ b/src/test/compile-fail/import.rs @@ -1,7 +1,7 @@ // xfail-test // error-pattern: unresolved -import zed::bar; -import zed::baz; +use zed::bar; +use zed::baz; mod zed { fn bar() { debug!("bar"); } } diff --git a/src/test/compile-fail/import2.rs b/src/test/compile-fail/import2.rs index 75493f2a037..ab9ea6b26df 100644 --- a/src/test/compile-fail/import2.rs +++ b/src/test/compile-fail/import2.rs @@ -1,5 +1,5 @@ // error-pattern: unresolved -import baz::zed::bar; +use baz::zed::bar; mod baz { } mod zed { fn bar() { debug!("bar3"); } diff --git a/src/test/compile-fail/import3.rs b/src/test/compile-fail/import3.rs index b825901f4a6..ad31d356665 100644 --- a/src/test/compile-fail/import3.rs +++ b/src/test/compile-fail/import3.rs @@ -1,4 +1,4 @@ // error-pattern: unresolved -import main::bar; +use main::bar; fn main(args: ~[str]) { debug!("foo"); } diff --git a/src/test/compile-fail/issue-1697.rs b/src/test/compile-fail/issue-1697.rs index 4ceaa35fca2..0f228519a38 100644 --- a/src/test/compile-fail/issue-1697.rs +++ b/src/test/compile-fail/issue-1697.rs @@ -1,7 +1,7 @@ // xfail-test // Testing that we don't fail abnormally after hitting the errors -import unresolved::*; //~ ERROR unresolved modulename +use unresolved::*; //~ ERROR unresolved modulename //~^ ERROR unresolved does not name a module fn main() { diff --git a/src/test/compile-fail/issue-2123.rs b/src/test/compile-fail/issue-2123.rs index ac23e684af5..843fd2b14eb 100644 --- a/src/test/compile-fail/issue-2123.rs +++ b/src/test/compile-fail/issue-2123.rs @@ -1,6 +1,6 @@ // xfail-test // error-pattern:unresolved import: m::f -import x = m::f; +use x = m::f; mod m { } diff --git a/src/test/compile-fail/issue-2590.rs b/src/test/compile-fail/issue-2590.rs index ffbc7a3018b..635fa059999 100644 --- a/src/test/compile-fail/issue-2590.rs +++ b/src/test/compile-fail/issue-2590.rs @@ -1,4 +1,4 @@ -import dvec::DVec; +use dvec::DVec; type parser = { tokens: DVec<int>, diff --git a/src/test/compile-fail/issue-2937.rs b/src/test/compile-fail/issue-2937.rs index b4e188d9740..c923d1d2dbe 100644 --- a/src/test/compile-fail/issue-2937.rs +++ b/src/test/compile-fail/issue-2937.rs @@ -1,5 +1,5 @@ // error-pattern:failed to resolve imports -import x = m::f; +use x = m::f; mod m { } diff --git a/src/test/compile-fail/issue-511.rs b/src/test/compile-fail/issue-511.rs index c7e49c42b51..b6dc425cf40 100644 --- a/src/test/compile-fail/issue-511.rs +++ b/src/test/compile-fail/issue-511.rs @@ -1,6 +1,5 @@ use std; -import option; -import cmp::Eq; +use cmp::Eq; fn f<T:Eq>(&o: Option<T>) { assert o == option::None; diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs index 7a9472f49b4..0a714b12847 100644 --- a/src/test/compile-fail/map-types.rs +++ b/src/test/compile-fail/map-types.rs @@ -1,7 +1,7 @@ use std; -import std::map; -import std::map::hashmap; -import std::map::map; +use std::map; +use std::map::hashmap; +use std::map::map; // Test that trait types printed in error msgs include the type arguments. diff --git a/src/test/compile-fail/name-clash-nullary.rs b/src/test/compile-fail/name-clash-nullary.rs index 3dad39eb1f8..8a437246f10 100644 --- a/src/test/compile-fail/name-clash-nullary.rs +++ b/src/test/compile-fail/name-clash-nullary.rs @@ -1,5 +1,5 @@ // error-pattern:declaration of `None` shadows -import option::*; +use option::*; fn main() { let None: int = 42; diff --git a/src/test/compile-fail/no-capture-arc.rs b/src/test/compile-fail/no-capture-arc.rs index 606d6e19950..cc8340cd2c3 100644 --- a/src/test/compile-fail/no-capture-arc.rs +++ b/src/test/compile-fail/no-capture-arc.rs @@ -1,8 +1,8 @@ // error-pattern: copying a noncopyable value use std; -import std::arc; -import comm::*; +use std::arc; +use comm::*; fn main() { let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/src/test/compile-fail/no-reuse-move-arc.rs b/src/test/compile-fail/no-reuse-move-arc.rs index dcdd57c898b..688bb65c5cf 100644 --- a/src/test/compile-fail/no-reuse-move-arc.rs +++ b/src/test/compile-fail/no-reuse-move-arc.rs @@ -1,6 +1,6 @@ use std; -import std::arc; -import comm::*; +use std::arc; +use comm::*; fn main() { let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]; diff --git a/src/test/compile-fail/pattern-tyvar-2.rs b/src/test/compile-fail/pattern-tyvar-2.rs index 6bf0f16cc33..9de827c7687 100644 --- a/src/test/compile-fail/pattern-tyvar-2.rs +++ b/src/test/compile-fail/pattern-tyvar-2.rs @@ -1,8 +1,7 @@ // -*- rust -*- use std; -import option; -import option::Some; +use option::Some; // error-pattern: mismatched types diff --git a/src/test/compile-fail/pattern-tyvar.rs b/src/test/compile-fail/pattern-tyvar.rs index 3bf006a5840..709ed70e11c 100644 --- a/src/test/compile-fail/pattern-tyvar.rs +++ b/src/test/compile-fail/pattern-tyvar.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import option; -import option::Some; +use option::Some; // error-pattern: mismatched types diff --git a/src/test/compile-fail/private-method-cross-crate.rs b/src/test/compile-fail/private-method-cross-crate.rs index f54a0ffc068..3cf5e5da75a 100644 --- a/src/test/compile-fail/private-method-cross-crate.rs +++ b/src/test/compile-fail/private-method-cross-crate.rs @@ -2,7 +2,7 @@ // xfail-fast // aux-build:cci_class_5.rs use cci_class_5; -import cci_class_5::kitties::*; +use cci_class_5::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/compile-fail/private-struct-field-cross-crate.rs b/src/test/compile-fail/private-struct-field-cross-crate.rs index c40b04004b4..077043462b1 100644 --- a/src/test/compile-fail/private-struct-field-cross-crate.rs +++ b/src/test/compile-fail/private-struct-field-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class.rs use cci_class; -import cci_class::kitties::*; +use cci_class::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs index eb6a52ce64c..8f2fc3cf7b1 100644 --- a/src/test/compile-fail/qquote-1.rs +++ b/src/test/compile-fail/qquote-1.rs @@ -3,13 +3,13 @@ use std; use syntax; -import io::*; +use io::*; -import syntax::diagnostic; -import syntax::ast; -import syntax::codemap; -import syntax::parse; -import syntax::print::*; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::parse; +use syntax::print::*; fn new_parse_sess() -> parse::parse_sess { fail; diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs index 8e9edb54613..8a12b86045c 100644 --- a/src/test/compile-fail/qquote-2.rs +++ b/src/test/compile-fail/qquote-2.rs @@ -3,13 +3,13 @@ use std; use syntax; -import std::io::*; +use std::io::*; -import syntax::diagnostic; -import syntax::ast; -import syntax::codemap; -import syntax::parse::parser; -import syntax::print::*; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::parse::parser; +use syntax::print::*; fn new_parse_sess() -> parser::parse_sess { fail; diff --git a/src/test/compile-fail/spawn-non-nil-fn.rs b/src/test/compile-fail/spawn-non-nil-fn.rs index 5394fca6b3b..0784c5d7f6e 100644 --- a/src/test/compile-fail/spawn-non-nil-fn.rs +++ b/src/test/compile-fail/spawn-non-nil-fn.rs @@ -1,6 +1,5 @@ // error-pattern: mismatched types use std; -import task; fn main() { task::spawn(fn~() -> int { 10 }); } diff --git a/src/test/compile-fail/sync-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-cond-shouldnt-escape.rs index 704d1a2e443..7c916000e78 100644 --- a/src/test/compile-fail/sync-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let m = ~sync::Mutex(); diff --git a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs index c64c75f8040..2bebf03bf2e 100644 --- a/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; diff --git a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs index 373c2f80efa..3729ab29194 100644 --- a/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-read-mode-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: cannot infer an appropriate lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; diff --git a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs index 79aff5f3a55..7adf9862bc2 100644 --- a/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-write-mode-cond-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; diff --git a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs index fde9656ca81..7e218e58c5a 100644 --- a/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs +++ b/src/test/compile-fail/sync-rwlock-write-mode-shouldnt-escape.rs @@ -1,6 +1,6 @@ // error-pattern: reference is not valid outside of its lifetime use std; -import std::sync; +use std::sync; fn main() { let x = ~sync::RWlock(); let mut y = None; diff --git a/src/test/compile-fail/unused-imports-warn.rs b/src/test/compile-fail/unused-imports-warn.rs index be716bf8804..6130bf38d7c 100644 --- a/src/test/compile-fail/unused-imports-warn.rs +++ b/src/test/compile-fail/unused-imports-warn.rs @@ -1,6 +1,6 @@ // error-pattern:unused import // compile-flags:-W unused-imports -import cal = bar::c::cc; +use cal = bar::c::cc; mod foo { type point = {x: int, y: int}; diff --git a/src/test/compile-fail/view-items-at-top.rs b/src/test/compile-fail/view-items-at-top.rs index e22c71af267..2baa3c2e210 100644 --- a/src/test/compile-fail/view-items-at-top.rs +++ b/src/test/compile-fail/view-items-at-top.rs @@ -5,7 +5,7 @@ use std; fn f() { } -import std::net; //~ ERROR view items must be declared at the top +use std::net; //~ ERROR view items must be declared at the top fn main() { } diff --git a/src/test/run-fail/fail-main.rs b/src/test/run-fail/fail-main.rs index 77918112209..d7d9f1284a5 100644 --- a/src/test/run-fail/fail-main.rs +++ b/src/test/run-fail/fail-main.rs @@ -1,4 +1,3 @@ // error-pattern:moop use std; -import uint; fn main() { fail ~"moop"; } diff --git a/src/test/run-fail/for-each-loop-fail.rs b/src/test/run-fail/for-each-loop-fail.rs index 847be695222..72d7dbc6b3c 100644 --- a/src/test/run-fail/for-each-loop-fail.rs +++ b/src/test/run-fail/for-each-loop-fail.rs @@ -1,4 +1,3 @@ // error-pattern:moop use std; -import uint; fn main() { for uint::range(0u, 10u) |_i| { fail ~"moop"; } } diff --git a/src/test/run-fail/issue-2156.rs b/src/test/run-fail/issue-2156.rs index 8084558ab69..b363d3a41b9 100644 --- a/src/test/run-fail/issue-2156.rs +++ b/src/test/run-fail/issue-2156.rs @@ -1,7 +1,7 @@ // error-pattern:explicit failure // Don't double free the string use std; -import io::Reader; +use io::Reader; fn main() { do io::with_str_reader(~"") |rdr| { diff --git a/src/test/run-fail/issue-2444.rs b/src/test/run-fail/issue-2444.rs index 9ac90696818..ed8bd9173b5 100644 --- a/src/test/run-fail/issue-2444.rs +++ b/src/test/run-fail/issue-2444.rs @@ -1,7 +1,7 @@ // error-pattern:explicit failure use std; -import std::arc; +use std::arc; enum e<T: const send> { e(arc::ARC<T>) } diff --git a/src/test/run-fail/linked-failure.rs b/src/test/run-fail/linked-failure.rs index 8b1f2588274..48870ef6931 100644 --- a/src/test/run-fail/linked-failure.rs +++ b/src/test/run-fail/linked-failure.rs @@ -2,9 +2,8 @@ // error-pattern:1 == 2 use std; -import task; -import comm::Port; -import comm::recv; +use comm::Port; +use comm::recv; fn child() { assert (1 == 2); } diff --git a/src/test/run-fail/linked-failure2.rs b/src/test/run-fail/linked-failure2.rs index cdb4dd446a1..d3ba7dbacc0 100644 --- a/src/test/run-fail/linked-failure2.rs +++ b/src/test/run-fail/linked-failure2.rs @@ -2,10 +2,9 @@ // error-pattern:fail use std; -import task; -import comm::Chan; -import comm::Port; -import comm::recv; +use comm::Chan; +use comm::Port; +use comm::recv; fn child() { fail; } diff --git a/src/test/run-fail/linked-failure3.rs b/src/test/run-fail/linked-failure3.rs index 2acb1494078..626b9857c90 100644 --- a/src/test/run-fail/linked-failure3.rs +++ b/src/test/run-fail/linked-failure3.rs @@ -2,9 +2,8 @@ // error-pattern:fail use std; -import task; -import comm::Port; -import comm::recv; +use comm::Port; +use comm::recv; fn grandchild() { fail ~"grandchild dies"; } diff --git a/src/test/run-fail/linked-failure4.rs b/src/test/run-fail/linked-failure4.rs index 4808ab70976..5366975adc8 100644 --- a/src/test/run-fail/linked-failure4.rs +++ b/src/test/run-fail/linked-failure4.rs @@ -1,10 +1,9 @@ // -*- rust -*- // error-pattern:1 == 2 use std; -import task; -import comm::Chan; -import comm::Port; -import comm::recv; +use comm::Chan; +use comm::Port; +use comm::recv; fn child() { assert (1 == 2); } diff --git a/src/test/run-fail/port-type.rs b/src/test/run-fail/port-type.rs index 17b03ed53cf..40d3067d4df 100644 --- a/src/test/run-fail/port-type.rs +++ b/src/test/run-fail/port-type.rs @@ -1,9 +1,9 @@ // error-pattern:meep use std; -import comm::Chan; -import comm::Port; -import comm::send; -import comm::recv; +use comm::Chan; +use comm::Port; +use comm::send; +use comm::recv; fn echo<T: send>(c: Chan<T>, oc: Chan<Chan<T>>) { // Tests that the type argument in port gets diff --git a/src/test/run-fail/spawnfail.rs b/src/test/run-fail/spawnfail.rs index 5d780f1f5f1..4d35e44f326 100644 --- a/src/test/run-fail/spawnfail.rs +++ b/src/test/run-fail/spawnfail.rs @@ -1,7 +1,6 @@ // xfail-win32 // error-pattern:explicit use std; -import task; // We don't want to see any invalid reads fn main() { diff --git a/src/test/run-fail/task-comm-recv-block.rs b/src/test/run-fail/task-comm-recv-block.rs index 1dc0561fc54..1d292b34ad0 100644 --- a/src/test/run-fail/task-comm-recv-block.rs +++ b/src/test/run-fail/task-comm-recv-block.rs @@ -1,8 +1,6 @@ // error-pattern:goodfail use std; -import task; -import comm; fn goodfail() { task::yield(); diff --git a/src/test/run-fail/unwind-misc-1.rs b/src/test/run-fail/unwind-misc-1.rs index a1f8010082a..a29aad2b7b0 100644 --- a/src/test/run-fail/unwind-misc-1.rs +++ b/src/test/run-fail/unwind-misc-1.rs @@ -1,9 +1,8 @@ // error-pattern:fail use std; -import std::map; -import std::map::hashmap; -import uint; +use std::map; +use std::map::hashmap; fn main() { let count = @mut 0u; diff --git a/src/test/run-fail/zip-different-lengths.rs b/src/test/run-fail/zip-different-lengths.rs index 6cff0afec08..1e03ea4ab2c 100644 --- a/src/test/run-fail/zip-different-lengths.rs +++ b/src/test/run-fail/zip-different-lengths.rs @@ -2,9 +2,7 @@ // the assert should fail at runtime // error-pattern:Assertion same_length(chars, ints) failed use std; -import uint; -import u8; -import vec::{same_length, zip}; +use vec::{same_length, zip}; fn enum_chars(start: u8, end: u8) -> ~[char] { assert start < end; diff --git a/src/test/run-pass-fulldeps/issue-1926.rs b/src/test/run-pass-fulldeps/issue-1926.rs index 5d7a11ca0d8..f2945a52a53 100644 --- a/src/test/run-pass-fulldeps/issue-1926.rs +++ b/src/test/run-pass-fulldeps/issue-1926.rs @@ -1,12 +1,11 @@ // xfail-test // fails pretty printing for some reason use syntax; -import syntax::diagnostic; -import syntax; -import syntax::ast; -import syntax::codemap; -import syntax::print::pprust; -import syntax::parse::parser; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::print::pprust; +use syntax::parse::parser; fn new_parse_sess() -> parser::parse_sess { let cm = codemap::new_codemap(); diff --git a/src/test/run-pass-fulldeps/qquote.rs b/src/test/run-pass-fulldeps/qquote.rs index ba7fb3c93a4..e51dfe706a3 100644 --- a/src/test/run-pass-fulldeps/qquote.rs +++ b/src/test/run-pass-fulldeps/qquote.rs @@ -3,13 +3,13 @@ use std; use syntax; -import io::*; +use io::*; -import syntax::diagnostic; -import syntax::ast; -import syntax::codemap; -import syntax::parse; -import syntax::print::*; +use syntax::diagnostic; +use syntax::ast; +use syntax::codemap; +use syntax::parse; +use syntax::print::*; trait fake_ext_ctxt { fn cfg() -> ast::crate_cfg; diff --git a/src/test/run-pass/acyclic-unwind.rs b/src/test/run-pass/acyclic-unwind.rs index 4def6d7601c..ebeab59098b 100644 --- a/src/test/run-pass/acyclic-unwind.rs +++ b/src/test/run-pass/acyclic-unwind.rs @@ -2,8 +2,6 @@ // -*- rust -*- use std; -import comm; -import task; fn f(c: comm::_chan<int>) { type t = {_0: int, _1: int, _2: int}; diff --git a/src/test/run-pass/alias-uninit-value.rs b/src/test/run-pass/alias-uninit-value.rs index b9260d6d530..b68789f76ba 100644 --- a/src/test/run-pass/alias-uninit-value.rs +++ b/src/test/run-pass/alias-uninit-value.rs @@ -2,8 +2,7 @@ // Regression test for issue #374 use std; -import option; -import option::None; +use option::None; enum sty { ty_nil, } diff --git a/src/test/run-pass/alt-join.rs b/src/test/run-pass/alt-join.rs index 7a994985d2d..8185c1f80d1 100644 --- a/src/test/run-pass/alt-join.rs +++ b/src/test/run-pass/alt-join.rs @@ -1,6 +1,5 @@ use std; -import option; fn foo<T>(y: Option<T>) { let mut x: int; diff --git a/src/test/run-pass/alt-pattern-drop.rs b/src/test/run-pass/alt-pattern-drop.rs index 0e276acb8c3..1f9532a7137 100644 --- a/src/test/run-pass/alt-pattern-drop.rs +++ b/src/test/run-pass/alt-pattern-drop.rs @@ -1,7 +1,7 @@ // -*- rust -*- -import core::sys; +use core::sys; enum t { make_t(@int), clam, } diff --git a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs index 3c45244b48a..3df0f117b17 100644 --- a/src/test/run-pass/anon-extern-mod-cross-crate-2.rs +++ b/src/test/run-pass/anon-extern-mod-cross-crate-2.rs @@ -2,7 +2,7 @@ // aux-build:anon-extern-mod-cross-crate-1.rs use anonexternmod; -import anonexternmod::*; +use anonexternmod::*; fn main() { last_os_error(); diff --git a/src/test/run-pass/auto_serialize.rs b/src/test/run-pass/auto_serialize.rs index e417b3a290e..112579b808f 100644 --- a/src/test/run-pass/auto_serialize.rs +++ b/src/test/run-pass/auto_serialize.rs @@ -3,10 +3,10 @@ use std; // These tests used to be separate files, but I wanted to refactor all // the common code. -import cmp::Eq; -import std::ebml; -import io::Writer; -import std::serialization::{serialize_uint, deserialize_uint}; +use cmp::Eq; +use std::ebml; +use io::Writer; +use std::serialization::{serialize_uint, deserialize_uint}; fn test_ser_and_deser<A:Eq>(a1: A, expected: ~str, diff --git a/src/test/run-pass/basic-1.rs b/src/test/run-pass/basic-1.rs index d1447f3bc60..0a9c786634e 100644 --- a/src/test/run-pass/basic-1.rs +++ b/src/test/run-pass/basic-1.rs @@ -1,11 +1,10 @@ // -*- rust -*- use std; -import comm::Chan; -import comm::Port; -import comm::send; -import comm::recv; -import task; +use comm::Chan; +use comm::Port; +use comm::send; +use comm::recv; fn a(c: Chan<int>) { send(c, 10); } diff --git a/src/test/run-pass/basic-2.rs b/src/test/run-pass/basic-2.rs index c4719299b07..6d8d542a747 100644 --- a/src/test/run-pass/basic-2.rs +++ b/src/test/run-pass/basic-2.rs @@ -1,12 +1,10 @@ // -*- rust -*- use std; -import comm; -import comm::Port; -import comm::send; -import comm::Chan; -import comm::recv; -import task; +use comm::Port; +use comm::send; +use comm::Chan; +use comm::recv; fn a(c: Chan<int>) { debug!("task a0"); debug!("task a1"); send(c, 10); } diff --git a/src/test/run-pass/basic.rs b/src/test/run-pass/basic.rs index 5e436208897..f593e23c706 100644 --- a/src/test/run-pass/basic.rs +++ b/src/test/run-pass/basic.rs @@ -1,11 +1,9 @@ // -*- rust -*- use std; -import comm; -import comm::send; -import comm::Chan; -import comm::recv; -import task; +use comm::send; +use comm::Chan; +use comm::recv; fn a(c: Chan<int>) { if true { diff --git a/src/test/run-pass/bind-by-move.rs b/src/test/run-pass/bind-by-move.rs index 767df743cea..f946539bad5 100644 --- a/src/test/run-pass/bind-by-move.rs +++ b/src/test/run-pass/bind-by-move.rs @@ -1,6 +1,6 @@ // xfail-test use std; -import std::arc; +use std::arc; fn dispose(+_x: arc::ARC<bool>) unsafe { } fn main() { diff --git a/src/test/run-pass/binops.rs b/src/test/run-pass/binops.rs index 2f62b410dd3..3d647175ef6 100644 --- a/src/test/run-pass/binops.rs +++ b/src/test/run-pass/binops.rs @@ -1,9 +1,7 @@ // Binop corner cases use std; -import unsafe::reinterpret_cast; -import task; -import comm; +use unsafe::reinterpret_cast; fn test_nil() { assert (() == ()); diff --git a/src/test/run-pass/bitv-perf-test.rs b/src/test/run-pass/bitv-perf-test.rs index 57820491091..6dc4cdf5d7a 100644 --- a/src/test/run-pass/bitv-perf-test.rs +++ b/src/test/run-pass/bitv-perf-test.rs @@ -1,5 +1,5 @@ use std; -import std::bitv::*; +use std::bitv::*; fn bitv_test() -> bool { let v1 = ~Bitv(31, false); diff --git a/src/test/run-pass/block-vec-map2.rs b/src/test/run-pass/block-vec-map2.rs index 4c98bb840b4..2cfaca91731 100644 --- a/src/test/run-pass/block-vec-map2.rs +++ b/src/test/run-pass/block-vec-map2.rs @@ -1,5 +1,4 @@ use std; -import vec; fn main() { let v = diff --git a/src/test/run-pass/borrowck-borrow-from-expr-block.rs b/src/test/run-pass/borrowck-borrow-from-expr-block.rs index dd545f29e4b..ec31225f46b 100644 --- a/src/test/run-pass/borrowck-borrow-from-expr-block.rs +++ b/src/test/run-pass/borrowck-borrow-from-expr-block.rs @@ -1,4 +1,4 @@ -import ptr::to_uint; +use ptr::to_uint; fn borrow(x: &int, f: fn(x: &int)) { f(x) diff --git a/src/test/run-pass/c-stack-returning-int64.rs b/src/test/run-pass/c-stack-returning-int64.rs index dc640d9dda8..559ab78ace9 100644 --- a/src/test/run-pass/c-stack-returning-int64.rs +++ b/src/test/run-pass/c-stack-returning-int64.rs @@ -1,5 +1,4 @@ use std; -import str; #[abi = "cdecl"] #[nolink] diff --git a/src/test/run-pass/cci_borrow.rs b/src/test/run-pass/cci_borrow.rs index aeeb80f10cc..434ce13d5d4 100644 --- a/src/test/run-pass/cci_borrow.rs +++ b/src/test/run-pass/cci_borrow.rs @@ -2,7 +2,7 @@ // aux-build:cci_borrow_lib.rs use cci_borrow_lib; -import cci_borrow_lib::foo; +use cci_borrow_lib::foo; fn main() { let p = @22u; diff --git a/src/test/run-pass/cci_capture_clause.rs b/src/test/run-pass/cci_capture_clause.rs index 1abde0084c2..f9caca92abb 100644 --- a/src/test/run-pass/cci_capture_clause.rs +++ b/src/test/run-pass/cci_capture_clause.rs @@ -6,7 +6,7 @@ use cci_capture_clause; -import comm::recv; +use comm::recv; fn main() { cci_capture_clause::foo(()).recv() diff --git a/src/test/run-pass/cci_impl_exe.rs b/src/test/run-pass/cci_impl_exe.rs index 764208a6608..aa2428d715f 100644 --- a/src/test/run-pass/cci_impl_exe.rs +++ b/src/test/run-pass/cci_impl_exe.rs @@ -2,7 +2,7 @@ // aux-build:cci_impl_lib.rs use cci_impl_lib; -import cci_impl_lib::uint_helpers; +use cci_impl_lib::uint_helpers; fn main() { //let bt0 = sys::frame_address(); diff --git a/src/test/run-pass/cci_nested_exe.rs b/src/test/run-pass/cci_nested_exe.rs index de1d6e69fcb..4e0c7e04770 100644 --- a/src/test/run-pass/cci_nested_exe.rs +++ b/src/test/run-pass/cci_nested_exe.rs @@ -2,7 +2,7 @@ // aux-build:cci_nested_lib.rs use cci_nested_lib; -import cci_nested_lib::*; +use cci_nested_lib::*; fn main() { let lst = new_int_alist(); diff --git a/src/test/run-pass/cci_no_inline_exe.rs b/src/test/run-pass/cci_no_inline_exe.rs index a29710eff85..4edc89d1f6c 100644 --- a/src/test/run-pass/cci_no_inline_exe.rs +++ b/src/test/run-pass/cci_no_inline_exe.rs @@ -2,7 +2,7 @@ // aux-build:cci_no_inline_lib.rs use cci_no_inline_lib; -import cci_no_inline_lib::iter; +use cci_no_inline_lib::iter; fn main() { // Check that a cross-crate call function not marked as inline diff --git a/src/test/run-pass/chan-leak.rs b/src/test/run-pass/chan-leak.rs index 8b887c28ccc..e4ed8c93b93 100644 --- a/src/test/run-pass/chan-leak.rs +++ b/src/test/run-pass/chan-leak.rs @@ -1,12 +1,10 @@ // Issue #763 use std; -import task; -import comm::Chan; -import comm::send; -import comm; -import comm::Port; -import comm::recv; +use comm::Chan; +use comm::send; +use comm::Port; +use comm::recv; enum request { quit, close(Chan<bool>), } diff --git a/src/test/run-pass/child-outlives-parent.rs b/src/test/run-pass/child-outlives-parent.rs index 4342d40262c..d6c65f8338f 100644 --- a/src/test/run-pass/child-outlives-parent.rs +++ b/src/test/run-pass/child-outlives-parent.rs @@ -1,7 +1,6 @@ // Reported as issue #126, child leaks the string. use std; -import task; fn child2(&&s: ~str) { } diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs index 9206d89394d..cb15f859a01 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate-2.rs @@ -1,8 +1,8 @@ // xfail-fast // aux-build:cci_class_cast.rs use cci_class_cast; -import to_str::ToStr; -import cci_class_cast::kitty::*; +use to_str::ToStr; +use cci_class_cast::kitty::*; fn print_out<T: ToStr>(thing: T, expected: ~str) { let actual = thing.to_str(); diff --git a/src/test/run-pass/class-cast-to-trait-cross-crate.rs b/src/test/run-pass/class-cast-to-trait-cross-crate.rs index a10733c79d9..b7752bf4bfb 100644 --- a/src/test/run-pass/class-cast-to-trait-cross-crate.rs +++ b/src/test/run-pass/class-cast-to-trait-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-test -import to_str::*; -import to_str::to_str; +use to_str::*; +use to_str::to_str; class cat : to_str { priv { diff --git a/src/test/run-pass/class-exports.rs b/src/test/run-pass/class-exports.rs index d5a2c4da1da..e5c5b4ecf21 100644 --- a/src/test/run-pass/class-exports.rs +++ b/src/test/run-pass/class-exports.rs @@ -1,7 +1,7 @@ /* Test that exporting a class also exports its public fields and methods */ -import kitty::*; +use kitty::*; mod kitty { export cat; diff --git a/src/test/run-pass/class-impl-parameterized-trait.rs b/src/test/run-pass/class-impl-parameterized-trait.rs index 91b5886265a..9540391ec6e 100644 --- a/src/test/run-pass/class-impl-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-parameterized-trait.rs @@ -2,7 +2,7 @@ // xfail-fast use std; -import std::map::*; +use std::map::*; class cat : map<int, bool> { priv { diff --git a/src/test/run-pass/class-impl-very-parameterized-trait.rs b/src/test/run-pass/class-impl-very-parameterized-trait.rs index e01c1ba1b0b..9241f92250d 100644 --- a/src/test/run-pass/class-impl-very-parameterized-trait.rs +++ b/src/test/run-pass/class-impl-very-parameterized-trait.rs @@ -1,5 +1,5 @@ use std; -import std::map::*; +use std::map::*; enum cat_type { tuxedo, tabby, tortoiseshell } diff --git a/src/test/run-pass/class-implement-trait-cross-crate.rs b/src/test/run-pass/class-implement-trait-cross-crate.rs index c1eb20c9d30..1ba1646dcf0 100644 --- a/src/test/run-pass/class-implement-trait-cross-crate.rs +++ b/src/test/run-pass/class-implement-trait-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class_trait.rs use cci_class_trait; -import cci_class_trait::animals::*; +use cci_class_trait::animals::*; struct cat : noisy { priv { diff --git a/src/test/run-pass/class-implements-multiple-traits.rs b/src/test/run-pass/class-implements-multiple-traits.rs index 3af94a40948..00209431bbf 100644 --- a/src/test/run-pass/class-implements-multiple-traits.rs +++ b/src/test/run-pass/class-implements-multiple-traits.rs @@ -1,9 +1,9 @@ // xfail-test use std; -import std::map::*; -import vec::*; -import dvec::{dvec, extensions}; +use std::map::*; +use vec::*; +use dvec::{dvec, extensions}; enum furniture { chair, couch, bed } enum body_part { finger, toe, nose, ear } diff --git a/src/test/run-pass/class-method-cross-crate.rs b/src/test/run-pass/class-method-cross-crate.rs index c114cad85d2..bd4ff6e1d1d 100644 --- a/src/test/run-pass/class-method-cross-crate.rs +++ b/src/test/run-pass/class-method-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class_2.rs use cci_class_2; -import cci_class_2::kitties::*; +use cci_class_2::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/run-pass/class-methods-cross-crate.rs b/src/test/run-pass/class-methods-cross-crate.rs index d6fb30dc7b2..144d728713a 100644 --- a/src/test/run-pass/class-methods-cross-crate.rs +++ b/src/test/run-pass/class-methods-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class_3.rs use cci_class_3; -import cci_class_3::kitties::*; +use cci_class_3::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/run-pass/class-poly-methods-cross-crate.rs b/src/test/run-pass/class-poly-methods-cross-crate.rs index 8789489336d..ef128566c5e 100644 --- a/src/test/run-pass/class-poly-methods-cross-crate.rs +++ b/src/test/run-pass/class-poly-methods-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class_6.rs use cci_class_6; -import cci_class_6::kitties::*; +use cci_class_6::kitties::*; fn main() { let nyan : cat<char> = cat::<char>(52u, 99, ~['p']); diff --git a/src/test/run-pass/class-separate-impl.rs b/src/test/run-pass/class-separate-impl.rs index b70b55cc103..957855736ea 100644 --- a/src/test/run-pass/class-separate-impl.rs +++ b/src/test/run-pass/class-separate-impl.rs @@ -1,6 +1,6 @@ // xfail-fast -import to_str::*; -import to_str::ToStr; +use to_str::*; +use to_str::ToStr; struct cat { priv { diff --git a/src/test/run-pass/class-trait-bounded-param.rs b/src/test/run-pass/class-trait-bounded-param.rs index b6dad43b556..91b3f68d5b2 100644 --- a/src/test/run-pass/class-trait-bounded-param.rs +++ b/src/test/run-pass/class-trait-bounded-param.rs @@ -1,7 +1,7 @@ // xfail-test use std; -import std::map::{map, hashmap, int_hash}; +use std::map::{map, hashmap, int_hash}; class keys<K: copy, V: copy, M: copy map<K,V>> : iter::base_iter<K> { diff --git a/src/test/run-pass/classes-cross-crate.rs b/src/test/run-pass/classes-cross-crate.rs index 1f71c240590..1835eed3ef1 100644 --- a/src/test/run-pass/classes-cross-crate.rs +++ b/src/test/run-pass/classes-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class_4.rs use cci_class_4; -import cci_class_4::kitties::*; +use cci_class_4::kitties::*; fn main() { let nyan = cat(0u, 2, ~"nyan"); diff --git a/src/test/run-pass/classes-simple-cross-crate.rs b/src/test/run-pass/classes-simple-cross-crate.rs index a6ccdd92205..15b56c74bc7 100644 --- a/src/test/run-pass/classes-simple-cross-crate.rs +++ b/src/test/run-pass/classes-simple-cross-crate.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:cci_class.rs use cci_class; -import cci_class::kitties::*; +use cci_class::kitties::*; fn main() { let nyan : cat = cat(52u, 99); diff --git a/src/test/run-pass/clone-with-exterior.rs b/src/test/run-pass/clone-with-exterior.rs index 7278e4ac994..3ca0b9cf6b8 100644 --- a/src/test/run-pass/clone-with-exterior.rs +++ b/src/test/run-pass/clone-with-exterior.rs @@ -1,7 +1,6 @@ //xfail-test use std; -import task; fn f(x : @{a:int, b:int}) { assert (x.a == 10); diff --git a/src/test/run-pass/comm.rs b/src/test/run-pass/comm.rs index 83109235433..4c77973b556 100644 --- a/src/test/run-pass/comm.rs +++ b/src/test/run-pass/comm.rs @@ -1,11 +1,9 @@ // -*- rust -*- use std; -import comm; -import comm::Chan; -import comm::send; -import comm::recv; -import task; +use comm::Chan; +use comm::send; +use comm::recv; fn main() { let p = comm::Port(); diff --git a/src/test/run-pass/companionmod-src/b.rs b/src/test/run-pass/companionmod-src/b.rs index e867ff713cd..e4350ab4ee7 100644 --- a/src/test/run-pass/companionmod-src/b.rs +++ b/src/test/run-pass/companionmod-src/b.rs @@ -1,2 +1,2 @@ -import g = x::f; +use g = x::f; export g; \ No newline at end of file diff --git a/src/test/run-pass/companionmod-src/d.rs b/src/test/run-pass/companionmod-src/d.rs index e867ff713cd..e4350ab4ee7 100644 --- a/src/test/run-pass/companionmod-src/d.rs +++ b/src/test/run-pass/companionmod-src/d.rs @@ -1,2 +1,2 @@ -import g = x::f; +use g = x::f; export g; \ No newline at end of file diff --git a/src/test/run-pass/core-export-f64-sqrt.rs b/src/test/run-pass/core-export-f64-sqrt.rs index 29d7fab9b9a..f1c506ad6b6 100644 --- a/src/test/run-pass/core-export-f64-sqrt.rs +++ b/src/test/run-pass/core-export-f64-sqrt.rs @@ -1,6 +1,6 @@ // Regression test that f64 exports things properly -import io::println; +use io::println; fn main() { diff --git a/src/test/run-pass/decl-with-recv.rs b/src/test/run-pass/decl-with-recv.rs index 2d1ce1b2565..8835b770c22 100644 --- a/src/test/run-pass/decl-with-recv.rs +++ b/src/test/run-pass/decl-with-recv.rs @@ -1,10 +1,10 @@ // -*- rust -*- use std; -import comm::Port; -import comm::Chan; -import comm::send; -import comm::recv; +use comm::Port; +use comm::Chan; +use comm::send; +use comm::recv; fn main() { let po = Port(); diff --git a/src/test/run-pass/dvec-test.rs b/src/test/run-pass/dvec-test.rs index b1a8ff9e175..2ab13607add 100644 --- a/src/test/run-pass/dvec-test.rs +++ b/src/test/run-pass/dvec-test.rs @@ -1,4 +1,4 @@ -import dvec::DVec; +use dvec::DVec; fn main() { let d = DVec(); diff --git a/src/test/run-pass/export-multi.rs b/src/test/run-pass/export-multi.rs index 6229e60532e..70af1a3bcaa 100644 --- a/src/test/run-pass/export-multi.rs +++ b/src/test/run-pass/export-multi.rs @@ -1,5 +1,5 @@ -import m::f; -import m::g; +use m::f; +use m::g; mod m { export f, g; diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs index 540beec1f7d..ae2b1f0ad4d 100644 --- a/src/test/run-pass/float-nan.rs +++ b/src/test/run-pass/float-nan.rs @@ -1,5 +1,4 @@ use std; -import float; fn main() { let nan = float::NaN; diff --git a/src/test/run-pass/foreign-fn-linkname.rs b/src/test/run-pass/foreign-fn-linkname.rs index 72c4056757e..cb8d05ee828 100644 --- a/src/test/run-pass/foreign-fn-linkname.rs +++ b/src/test/run-pass/foreign-fn-linkname.rs @@ -1,7 +1,5 @@ use std; -import vec; -import str; #[nolink] #[abi = "cdecl"] diff --git a/src/test/run-pass/hashmap-memory.rs b/src/test/run-pass/hashmap-memory.rs index f1450a5c02d..6ae9cd430b4 100644 --- a/src/test/run-pass/hashmap-memory.rs +++ b/src/test/run-pass/hashmap-memory.rs @@ -6,19 +6,15 @@ use std; -import option = option; -import option::Some; -import option::None; -import str; -import vec; -import std::map; -import std::map::hashmap; -import task; -import comm::Chan; -import comm::Port; -import comm::send; -import comm::recv; -import comm; +use option = option; +use option::Some; +use option::None; +use std::map; +use std::map::hashmap; +use comm::Chan; +use comm::Port; +use comm::send; +use comm::recv; fn map(filename: ~str, emit: map_reduce::putter) { emit(filename, ~"1"); } diff --git a/src/test/run-pass/import-from.rs b/src/test/run-pass/import-from.rs index d8314e6b0b8..5892a729c68 100644 --- a/src/test/run-pass/import-from.rs +++ b/src/test/run-pass/import-from.rs @@ -1,4 +1,4 @@ -import spam::{ham, eggs}; +use spam::{ham, eggs}; mod spam { fn ham() { } diff --git a/src/test/run-pass/import-glob-0.rs b/src/test/run-pass/import-glob-0.rs index 39abe0c8082..d9f0cd4181c 100644 --- a/src/test/run-pass/import-glob-0.rs +++ b/src/test/run-pass/import-glob-0.rs @@ -1,5 +1,5 @@ -import module_of_many_things::*; -import dug::too::greedily::and::too::deep::*; +use module_of_many_things::*; +use dug::too::greedily::and::too::deep::*; mod module_of_many_things { export f1; diff --git a/src/test/run-pass/import-glob-1.rs b/src/test/run-pass/import-glob-1.rs index 09e84cf7216..29435b88f4a 100644 --- a/src/test/run-pass/import-glob-1.rs +++ b/src/test/run-pass/import-glob-1.rs @@ -1,4 +1,4 @@ -import a1::b1::word_traveler; +use a1::b1::word_traveler; mod a1 { // diff --git a/src/test/run-pass/import-glob-crate.rs b/src/test/run-pass/import-glob-crate.rs index 4f0afc50952..7c92c73819b 100644 --- a/src/test/run-pass/import-glob-crate.rs +++ b/src/test/run-pass/import-glob-crate.rs @@ -1,6 +1,6 @@ use std; -import vec::*; +use vec::*; fn main() { let mut v = from_elem(0u, 0); diff --git a/src/test/run-pass/import-trailing-comma.rs b/src/test/run-pass/import-trailing-comma.rs index a6a56e9009d..0a27ccc24a2 100644 --- a/src/test/run-pass/import-trailing-comma.rs +++ b/src/test/run-pass/import-trailing-comma.rs @@ -1,4 +1,4 @@ -import foo::bar::{baz, quux,}; +use foo::bar::{baz, quux,}; mod foo { mod bar { diff --git a/src/test/run-pass/import2.rs b/src/test/run-pass/import2.rs index 6b4596e2b44..ab9d5222734 100644 --- a/src/test/run-pass/import2.rs +++ b/src/test/run-pass/import2.rs @@ -1,5 +1,5 @@ -import zed::bar; +use zed::bar; mod zed { fn bar() { debug!("bar"); } diff --git a/src/test/run-pass/import3.rs b/src/test/run-pass/import3.rs index 6b6402cd2dc..2c208593d1e 100644 --- a/src/test/run-pass/import3.rs +++ b/src/test/run-pass/import3.rs @@ -1,6 +1,6 @@ -import baz::zed; -import zed::bar; +use baz::zed; +use zed::bar; mod baz { mod zed { diff --git a/src/test/run-pass/import4.rs b/src/test/run-pass/import4.rs index 21912cf3abd..49ec8babe24 100644 --- a/src/test/run-pass/import4.rs +++ b/src/test/run-pass/import4.rs @@ -1,5 +1,5 @@ -import zed::bar; +use zed::bar; mod zed { fn bar() { debug!("bar"); } diff --git a/src/test/run-pass/import5.rs b/src/test/run-pass/import5.rs index e4a6b7fb4e2..8f6f8cebe72 100644 --- a/src/test/run-pass/import5.rs +++ b/src/test/run-pass/import5.rs @@ -1,4 +1,4 @@ -import foo::bar; +use foo::bar; mod foo { import zed::bar; export bar; diff --git a/src/test/run-pass/import6.rs b/src/test/run-pass/import6.rs index 83fb4d921dc..4c5cfeb7367 100644 --- a/src/test/run-pass/import6.rs +++ b/src/test/run-pass/import6.rs @@ -1,5 +1,5 @@ -import foo::zed; -import bar::baz; +use foo::zed; +use bar::baz; mod foo { mod zed { fn baz() { debug!("baz"); } diff --git a/src/test/run-pass/import7.rs b/src/test/run-pass/import7.rs index 2edd71a5efb..eb98f625fb1 100644 --- a/src/test/run-pass/import7.rs +++ b/src/test/run-pass/import7.rs @@ -1,5 +1,5 @@ -import foo::zed; -import bar::baz; +use foo::zed; +use bar::baz; mod foo { mod zed { fn baz() { debug!("baz"); } diff --git a/src/test/run-pass/import8.rs b/src/test/run-pass/import8.rs index f7d9c761af7..8e51fb8c1b1 100644 --- a/src/test/run-pass/import8.rs +++ b/src/test/run-pass/import8.rs @@ -1,6 +1,6 @@ -import foo::x; -import z = foo::x; +use foo::x; +use z = foo::x; mod foo { fn x(y: int) { log(debug, y); } diff --git a/src/test/run-pass/infinite-loops.rs b/src/test/run-pass/infinite-loops.rs index 82b751b3b0b..0427905de3d 100644 --- a/src/test/run-pass/infinite-loops.rs +++ b/src/test/run-pass/infinite-loops.rs @@ -5,7 +5,7 @@ // xfail-test use std; -import task::join; +use task::join; fn loop(n: int) { let t1: task; diff --git a/src/test/run-pass/intrinsic-atomics-cc.rs b/src/test/run-pass/intrinsic-atomics-cc.rs index b2ec6b3c8e7..cfddde6acb4 100644 --- a/src/test/run-pass/intrinsic-atomics-cc.rs +++ b/src/test/run-pass/intrinsic-atomics-cc.rs @@ -2,7 +2,7 @@ // aux-build:cci_intrinsic.rs use cci_intrinsic; -import cci_intrinsic::atomic_xchg; +use cci_intrinsic::atomic_xchg; fn main() { let mut x = 1; diff --git a/src/test/run-pass/issue-1112.rs b/src/test/run-pass/issue-1112.rs index eb75139b4a3..97e2ece9072 100644 --- a/src/test/run-pass/issue-1112.rs +++ b/src/test/run-pass/issue-1112.rs @@ -2,7 +2,7 @@ // Alignment of interior pointers to dynamic-size types use std; -import ptr::addr_of; +use ptr::addr_of; type x<T> = { a: T, diff --git a/src/test/run-pass/issue-1696.rs b/src/test/run-pass/issue-1696.rs index 6aa6df94b91..de0a1f23b52 100644 --- a/src/test/run-pass/issue-1696.rs +++ b/src/test/run-pass/issue-1696.rs @@ -1,6 +1,6 @@ use std; -import std::map; -import std::map::hashmap; +use std::map; +use std::map::hashmap; fn main() { let m = map::bytes_hash(); diff --git a/src/test/run-pass/issue-2101.rs b/src/test/run-pass/issue-2101.rs index f97e4539a83..ed3c0f38353 100644 --- a/src/test/run-pass/issue-2101.rs +++ b/src/test/run-pass/issue-2101.rs @@ -1,7 +1,7 @@ // xfail-test use std; -import std::arena; -import std::arena::Arena; +use std::arena; +use std::arena::Arena; enum hold { s(str) } diff --git a/src/test/run-pass/issue-2196.rs b/src/test/run-pass/issue-2196.rs index 7a193c36bc9..2165367304b 100644 --- a/src/test/run-pass/issue-2196.rs +++ b/src/test/run-pass/issue-2196.rs @@ -4,6 +4,6 @@ // aux-build:issue-2196-c.rc use c(name = "issue2196c"); -import c::t; +use c::t; fn main() { } diff --git a/src/test/run-pass/issue-2214.rs b/src/test/run-pass/issue-2214.rs index 886739fc154..cb08e52e21e 100644 --- a/src/test/run-pass/issue-2214.rs +++ b/src/test/run-pass/issue-2214.rs @@ -1,5 +1,5 @@ -import libc::{c_double, c_int}; -import f64::*; +use libc::{c_double, c_int}; +use f64::*; fn to_c_int(v: &mut int) -> &mut c_int unsafe { unsafe::reinterpret_cast(&v) diff --git a/src/test/run-pass/issue-2242-d.rs b/src/test/run-pass/issue-2242-d.rs index 625bbf13ecb..11b86e5e6dd 100644 --- a/src/test/run-pass/issue-2242-d.rs +++ b/src/test/run-pass/issue-2242-d.rs @@ -7,7 +7,7 @@ use a; use b; use c; -import a::to_strz; +use a::to_strz; fn main() { io::println((~"foo").to_strz()); diff --git a/src/test/run-pass/issue-2316-c.rs b/src/test/run-pass/issue-2316-c.rs index 27f4d89a93b..113732cacbe 100644 --- a/src/test/run-pass/issue-2316-c.rs +++ b/src/test/run-pass/issue-2316-c.rs @@ -3,7 +3,7 @@ // aux-build:issue_2316_b.rs use issue_2316_b; -import issue_2316_b::cloth; +use issue_2316_b::cloth; fn main() { let _c: cloth::fabric = cloth::calico; diff --git a/src/test/run-pass/issue-2383.rs b/src/test/run-pass/issue-2383.rs index 81c61dd1e64..5c991ebac49 100644 --- a/src/test/run-pass/issue-2383.rs +++ b/src/test/run-pass/issue-2383.rs @@ -1,6 +1,6 @@ use std; -import std::deque; -import std::deque::Deque; +use std::deque; +use std::deque::Deque; fn main() { let Q = deque::create(); diff --git a/src/test/run-pass/issue-2445.rs b/src/test/run-pass/issue-2445.rs index 5b9dc82edd5..d0da8310938 100644 --- a/src/test/run-pass/issue-2445.rs +++ b/src/test/run-pass/issue-2445.rs @@ -1,4 +1,4 @@ -import dvec::DVec; +use dvec::DVec; struct c1<T: copy> { let x: T; diff --git a/src/test/run-pass/issue-2472.rs b/src/test/run-pass/issue-2472.rs index 776a52e383c..9a9246baa82 100644 --- a/src/test/run-pass/issue-2472.rs +++ b/src/test/run-pass/issue-2472.rs @@ -3,7 +3,7 @@ use issue_2472_b; -import issue_2472_b::{S, T}; +use issue_2472_b::{S, T}; fn main() { let s = S(()); diff --git a/src/test/run-pass/issue-2526-a.rs b/src/test/run-pass/issue-2526-a.rs index f364439740e..a86808832b5 100644 --- a/src/test/run-pass/issue-2526-a.rs +++ b/src/test/run-pass/issue-2526-a.rs @@ -2,7 +2,7 @@ // aux-build:issue-2526.rs use issue_2526; -import issue_2526::*; +use issue_2526::*; fn main() {} diff --git a/src/test/run-pass/issue-2611.rs b/src/test/run-pass/issue-2611.rs index a6603876131..9f1ef849830 100644 --- a/src/test/run-pass/issue-2611.rs +++ b/src/test/run-pass/issue-2611.rs @@ -1,6 +1,5 @@ // xfail-test -import iter; -import iter::base_iter; +use iter::base_iter; impl Q<A> for base_iter<A> { fn flat_map_to_vec<B:copy, IB:base_iter<B>>(op: fn(B) -> IB) -> ~[B] { diff --git a/src/test/run-pass/issue-2631-b.rs b/src/test/run-pass/issue-2631-b.rs index 41006ba3d65..eb500e340d8 100644 --- a/src/test/run-pass/issue-2631-b.rs +++ b/src/test/run-pass/issue-2631-b.rs @@ -4,10 +4,9 @@ use req; use std; -import req::*; -import std::map::*; -import std::map::str_hash; -import dvec; +use req::*; +use std::map::*; +use std::map::str_hash; fn main() { let v = ~[mut @~"hi"]; diff --git a/src/test/run-pass/issue-2723-b.rs b/src/test/run-pass/issue-2723-b.rs index 4c5c9ca1d20..193d4db724b 100644 --- a/src/test/run-pass/issue-2723-b.rs +++ b/src/test/run-pass/issue-2723-b.rs @@ -2,7 +2,7 @@ // aux-build:issue_2723_a.rs use issue_2723_a; -import issue_2723_a::*; +use issue_2723_a::*; fn main() unsafe { f(~[2]); diff --git a/src/test/run-pass/issue-2804-2.rs b/src/test/run-pass/issue-2804-2.rs index 2db1ba7f759..4b0637c586d 100644 --- a/src/test/run-pass/issue-2804-2.rs +++ b/src/test/run-pass/issue-2804-2.rs @@ -1,7 +1,7 @@ // Minimized version of issue-2804.rs. Both check that callee IDs don't // clobber the previous node ID in a macro expr use std; -import std::map::hashmap; +use std::map::hashmap; fn add_interfaces(managed_ip: ~str, device: std::map::hashmap<~str, int>) { error!("%s, %?", managed_ip, device[~"interfaces"]); diff --git a/src/test/run-pass/issue-2804.rs b/src/test/run-pass/issue-2804.rs index b0547d66e96..5ed46fc3df0 100644 --- a/src/test/run-pass/issue-2804.rs +++ b/src/test/run-pass/issue-2804.rs @@ -1,7 +1,6 @@ use std; -import io; -import io::WriterUtil; -import std::map::hashmap; +use io::WriterUtil; +use std::map::hashmap; enum object { diff --git a/src/test/run-pass/issue-3012-2.rs b/src/test/run-pass/issue-3012-2.rs index 5721a0729ba..b3786561b14 100644 --- a/src/test/run-pass/issue-3012-2.rs +++ b/src/test/run-pass/issue-3012-2.rs @@ -1,7 +1,7 @@ // xfail-fast // aux-build:issue-3012-1.rs use socketlib; -import socketlib::socket; +use socketlib::socket; fn main() { let fd: libc::c_int = 1 as libc::c_int; diff --git a/src/test/run-pass/issue-3176.rs b/src/test/run-pass/issue-3176.rs index 89b51b8fa73..002c7d4c518 100644 --- a/src/test/run-pass/issue-3176.rs +++ b/src/test/run-pass/issue-3176.rs @@ -1,6 +1,6 @@ // xfail-fast -import pipes::{Select2, Selectable}; +use pipes::{Select2, Selectable}; fn main() { let (c,p) = pipes::stream(); diff --git a/src/test/run-pass/issue-506.rs b/src/test/run-pass/issue-506.rs index 45a8ef26794..7ace5cb4d02 100644 --- a/src/test/run-pass/issue-506.rs +++ b/src/test/run-pass/issue-506.rs @@ -5,7 +5,6 @@ */ use std; -import task; #[abi = "cdecl"] extern mod rustrt { diff --git a/src/test/run-pass/issue-507.rs b/src/test/run-pass/issue-507.rs index 4459b97ff5b..67cebc4c34c 100644 --- a/src/test/run-pass/issue-507.rs +++ b/src/test/run-pass/issue-507.rs @@ -7,12 +7,10 @@ use std; -import task; -import comm; -import comm::Chan; -import comm::send; -import comm::Port; -import comm::recv; +use comm::Chan; +use comm::send; +use comm::Port; +use comm::recv; fn grandchild(c: Chan<int>) { send(c, 42); } diff --git a/src/test/run-pass/issue-687.rs b/src/test/run-pass/issue-687.rs index ed50e6e5143..715918ffcce 100644 --- a/src/test/run-pass/issue-687.rs +++ b/src/test/run-pass/issue-687.rs @@ -1,11 +1,8 @@ use std; -import vec; -import task; -import comm; -import comm::Chan; -import comm::Port; -import comm::recv; -import comm::send; +use comm::Chan; +use comm::Port; +use comm::recv; +use comm::send; enum msg { closed, received(~[u8]), } diff --git a/src/test/run-pass/issue-783.rs b/src/test/run-pass/issue-783.rs index 9f908625a33..36863488ade 100644 --- a/src/test/run-pass/issue-783.rs +++ b/src/test/run-pass/issue-783.rs @@ -1,6 +1,6 @@ use std; -import comm::*; -import task::*; +use comm::*; +use task::*; fn a() { fn doit() { diff --git a/src/test/run-pass/issue2378c.rs b/src/test/run-pass/issue2378c.rs index c72be0e0d42..c4ab39f9a7b 100644 --- a/src/test/run-pass/issue2378c.rs +++ b/src/test/run-pass/issue2378c.rs @@ -5,8 +5,8 @@ use issue2378a; use issue2378b; -import issue2378a::{just, methods}; -import issue2378b::{methods}; +use issue2378a::{just, methods}; +use issue2378b::{methods}; fn main() { let x = {a: just(3), b: just(5)}; diff --git a/src/test/run-pass/ivec-tag.rs b/src/test/run-pass/ivec-tag.rs index d6a72422507..94925be7205 100644 --- a/src/test/run-pass/ivec-tag.rs +++ b/src/test/run-pass/ivec-tag.rs @@ -1,11 +1,9 @@ use std; -import task; -import comm; -import comm::Chan; -import comm::Port; -import comm::send; -import comm::recv; +use comm::Chan; +use comm::Port; +use comm::send; +use comm::recv; fn producer(c: Chan<~[u8]>) { send(c, diff --git a/src/test/run-pass/lazychan.rs b/src/test/run-pass/lazychan.rs index ebb7507789e..fc9239dd22a 100644 --- a/src/test/run-pass/lazychan.rs +++ b/src/test/run-pass/lazychan.rs @@ -1,8 +1,7 @@ // -*- rust -*- use std; -import task; -import comm::*; +use comm::*; fn main() { let p = Port(); diff --git a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs index de9541a3c06..126dfcd2d5b 100644 --- a/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs +++ b/src/test/run-pass/log-knows-the-names-of-variants-in-std.rs @@ -1,5 +1,5 @@ use std; -import std::list; +use std::list; enum foo { a(uint), diff --git a/src/test/run-pass/lots-a-fail.rs b/src/test/run-pass/lots-a-fail.rs index b9c33a5f1a9..2de7a39ceab 100644 --- a/src/test/run-pass/lots-a-fail.rs +++ b/src/test/run-pass/lots-a-fail.rs @@ -1,8 +1,5 @@ // xfail-win32 leaks use std; -import task; -import comm; -import uint; fn die() { fail; diff --git a/src/test/run-pass/many.rs b/src/test/run-pass/many.rs index 78339d8c0c6..e63b3541294 100644 --- a/src/test/run-pass/many.rs +++ b/src/test/run-pass/many.rs @@ -1,8 +1,6 @@ // -*- rust -*- use std; -import task; -import comm; fn sub(parent: comm::Chan<int>, id: int) { if id == 0 { diff --git a/src/test/run-pass/morestack5.rs b/src/test/run-pass/morestack5.rs index cafd2fbc491..c56549548b0 100644 --- a/src/test/run-pass/morestack5.rs +++ b/src/test/run-pass/morestack5.rs @@ -1,7 +1,6 @@ // This test will call __morestack with various minimum stack sizes use std; -import task; fn getbig(&&i: int) { if i != 0 { diff --git a/src/test/run-pass/move-3-unique.rs b/src/test/run-pass/move-3-unique.rs index 02dd0ca999f..fab6f5386ee 100644 --- a/src/test/run-pass/move-3-unique.rs +++ b/src/test/run-pass/move-3-unique.rs @@ -1,5 +1,4 @@ use std; -import uint; fn test(x: bool, foo: ~{x: int, y: int, z: int}) -> int { let bar = foo; diff --git a/src/test/run-pass/move-3.rs b/src/test/run-pass/move-3.rs index 467865f8b80..572d6132854 100644 --- a/src/test/run-pass/move-3.rs +++ b/src/test/run-pass/move-3.rs @@ -1,5 +1,4 @@ use std; -import uint; fn test(x: bool, foo: @{x: int, y: int, z: int}) -> int { let bar = foo; diff --git a/src/test/run-pass/move-4-unique.rs b/src/test/run-pass/move-4-unique.rs index c2049efdfcb..f56fdb5d08b 100644 --- a/src/test/run-pass/move-4-unique.rs +++ b/src/test/run-pass/move-4-unique.rs @@ -1,5 +1,4 @@ use std; -import uint; fn test(foo: ~{a: int, b: int, c: int}) -> ~{a: int, b: int, c: int} { let foo = foo; diff --git a/src/test/run-pass/move-4.rs b/src/test/run-pass/move-4.rs index 2d6e71ae346..454e0ac0687 100644 --- a/src/test/run-pass/move-4.rs +++ b/src/test/run-pass/move-4.rs @@ -1,6 +1,5 @@ use std; -import uint; fn test(foo: @{a: int, b: int, c: int}) -> @{a: int, b: int, c: int} { let foo = foo; diff --git a/src/test/run-pass/nested-pattern.rs b/src/test/run-pass/nested-pattern.rs index 3090cd59a63..98d70b5b5d2 100644 --- a/src/test/run-pass/nested-pattern.rs +++ b/src/test/run-pass/nested-pattern.rs @@ -2,9 +2,8 @@ // a bug was causing this to complain about leaked memory on exit use std; -import option; -import option::Some; -import option::None; +use option::Some; +use option::None; enum t { foo(int, uint), bar(int, Option<int>), } diff --git a/src/test/run-pass/non-boolean-pure-fns.rs b/src/test/run-pass/non-boolean-pure-fns.rs index 2e2f74e68d4..600afd97a69 100644 --- a/src/test/run-pass/non-boolean-pure-fns.rs +++ b/src/test/run-pass/non-boolean-pure-fns.rs @@ -1,6 +1,6 @@ use std; -import std::list::*; +use std::list::*; pure fn pure_length_go<T: copy>(ls: @List<T>, acc: uint) -> uint { match *ls { Nil => { acc } Cons(_, tl) => { pure_length_go(tl, acc + 1u) } } diff --git a/src/test/run-pass/pipe-bank-proto.rs b/src/test/run-pass/pipe-bank-proto.rs index acd1ed5b93e..fc76487b436 100644 --- a/src/test/run-pass/pipe-bank-proto.rs +++ b/src/test/run-pass/pipe-bank-proto.rs @@ -4,7 +4,7 @@ // // http://theincredibleholk.wordpress.com/2012/07/06/rusty-pipes/ -import pipes::try_recv; +use pipes::try_recv; type username = ~str; type password = ~str; diff --git a/src/test/run-pass/pipe-detect-term.rs b/src/test/run-pass/pipe-detect-term.rs index f33a62725a6..e574a66aa98 100644 --- a/src/test/run-pass/pipe-detect-term.rs +++ b/src/test/run-pass/pipe-detect-term.rs @@ -4,10 +4,10 @@ // xfail-win32 use std; -import std::timer::sleep; -import std::uv; +use std::timer::sleep; +use std::uv; -import pipes::{try_recv, recv}; +use pipes::{try_recv, recv}; proto! oneshot ( waiting:send { diff --git a/src/test/run-pass/pipe-peek.rs b/src/test/run-pass/pipe-peek.rs index ed0a2a3d75b..eec54ea2da8 100644 --- a/src/test/run-pass/pipe-peek.rs +++ b/src/test/run-pass/pipe-peek.rs @@ -1,8 +1,8 @@ // xfail-pretty use std; -import std::timer::sleep; -import std::uv; +use std::timer::sleep; +use std::uv; proto! oneshot ( waiting:send { diff --git a/src/test/run-pass/pipe-presentation-examples.rs b/src/test/run-pass/pipe-presentation-examples.rs index 15e5e7752c0..34e384e3121 100644 --- a/src/test/run-pass/pipe-presentation-examples.rs +++ b/src/test/run-pass/pipe-presentation-examples.rs @@ -5,8 +5,8 @@ // xfail-pretty -import double_buffer::client::*; -import double_buffer::give_buffer; +use double_buffer::client::*; +use double_buffer::give_buffer; macro_rules! select_if ( { diff --git a/src/test/run-pass/pipe-select.rs b/src/test/run-pass/pipe-select.rs index 69619136397..7f36dbe546c 100644 --- a/src/test/run-pass/pipe-select.rs +++ b/src/test/run-pass/pipe-select.rs @@ -2,10 +2,10 @@ // xfail-win32 use std; -import std::timer::sleep; -import std::uv; +use std::timer::sleep; +use std::uv; -import pipes::{recv, select}; +use pipes::{recv, select}; proto! oneshot ( waiting:send { diff --git a/src/test/run-pass/pipe-sleep.rs b/src/test/run-pass/pipe-sleep.rs index 65aa3b2f228..468e39c40cd 100644 --- a/src/test/run-pass/pipe-sleep.rs +++ b/src/test/run-pass/pipe-sleep.rs @@ -1,9 +1,9 @@ // xfail-pretty use std; -import std::timer::sleep; -import std::uv; -import pipes::recv; +use std::timer::sleep; +use std::uv; +use pipes::recv; proto! oneshot ( waiting:send { diff --git a/src/test/run-pass/placement-new-arena.rs b/src/test/run-pass/placement-new-arena.rs index eb3aad2c2c9..3284c720655 100644 --- a/src/test/run-pass/placement-new-arena.rs +++ b/src/test/run-pass/placement-new-arena.rs @@ -1,5 +1,5 @@ use std; -import std::arena; +use std::arena; fn main() { let p = &arena::Arena(); diff --git a/src/test/run-pass/reflect-visit-data.rs b/src/test/run-pass/reflect-visit-data.rs index d43adc74bd9..7ead5028956 100644 --- a/src/test/run-pass/reflect-visit-data.rs +++ b/src/test/run-pass/reflect-visit-data.rs @@ -1,6 +1,6 @@ -import intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor}; -import libc::c_void; +use intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor}; +use libc::c_void; // FIXME: this is a near-duplicate of code in core::vec. type unboxed_vec_repr = { diff --git a/src/test/run-pass/reflect-visit-type.rs b/src/test/run-pass/reflect-visit-type.rs index 1d9b782ecd0..f7eb2c01315 100644 --- a/src/test/run-pass/reflect-visit-type.rs +++ b/src/test/run-pass/reflect-visit-type.rs @@ -1,7 +1,7 @@ // FIXME: un-xfail after snapshot // xfail-test -import intrinsic::{tydesc, get_tydesc, visit_tydesc, ty_visitor}; +use intrinsic::{tydesc, get_tydesc, visit_tydesc, ty_visitor}; enum my_visitor = @{ mut types: ~[str] }; impl of ty_visitor for my_visitor { diff --git a/src/test/run-pass/regions-mock-trans-impls.rs b/src/test/run-pass/regions-mock-trans-impls.rs index 9a800eb0d25..7884c31f4a9 100644 --- a/src/test/run-pass/regions-mock-trans-impls.rs +++ b/src/test/run-pass/regions-mock-trans-impls.rs @@ -1,6 +1,6 @@ use std; -import libc, sys, unsafe; -import std::arena::Arena; +use libc, sys, unsafe; +use std::arena::Arena; type bcx = { fcx: &fcx diff --git a/src/test/run-pass/regions-mock-trans.rs b/src/test/run-pass/regions-mock-trans.rs index 42b7b935c73..879845d2feb 100644 --- a/src/test/run-pass/regions-mock-trans.rs +++ b/src/test/run-pass/regions-mock-trans.rs @@ -1,4 +1,4 @@ -import libc, sys, unsafe; +use libc, sys, unsafe; enum arena = (); diff --git a/src/test/run-pass/ret-break-cont-in-block.rs b/src/test/run-pass/ret-break-cont-in-block.rs index 09ca7df781e..8be2dc24f23 100644 --- a/src/test/run-pass/ret-break-cont-in-block.rs +++ b/src/test/run-pass/ret-break-cont-in-block.rs @@ -1,4 +1,4 @@ -import cmp::Eq; +use cmp::Eq; fn iter<T>(v: ~[T], it: fn(T) -> bool) { let mut i = 0u, l = v.len(); diff --git a/src/test/run-pass/rt-circular-buffer.rs b/src/test/run-pass/rt-circular-buffer.rs index aaaa34453e0..ac9b99b955f 100644 --- a/src/test/run-pass/rt-circular-buffer.rs +++ b/src/test/run-pass/rt-circular-buffer.rs @@ -3,13 +3,10 @@ // Regression tests for circular_buffer when using a unit // that has a size that is not a power of two use std; -import option; -import uint; -import comm; -import comm::Port; -import comm::Chan; -import comm::send; -import comm::recv; +use comm::Port; +use comm::Chan; +use comm::send; +use comm::recv; // A 12-byte unit to send over the channel type record = {val1: u32, val2: u32, val3: u32}; diff --git a/src/test/run-pass/rt-sched-1.rs b/src/test/run-pass/rt-sched-1.rs index 0cba7faa74c..824ac74307c 100644 --- a/src/test/run-pass/rt-sched-1.rs +++ b/src/test/run-pass/rt-sched-1.rs @@ -1,6 +1,6 @@ // Tests of the runtime's scheduler interface -import ptr::is_null; +use ptr::is_null; type sched_id = int; type task_id = *libc::c_void; diff --git a/src/test/run-pass/send-iloop.rs b/src/test/run-pass/send-iloop.rs index 6f423291cb4..2765e3b4264 100644 --- a/src/test/run-pass/send-iloop.rs +++ b/src/test/run-pass/send-iloop.rs @@ -1,8 +1,5 @@ // xfail-win32 use std; -import task; -import comm; -import uint; fn die() { fail; diff --git a/src/test/run-pass/send-resource.rs b/src/test/run-pass/send-resource.rs index ce91d22ec75..40da915e6cd 100644 --- a/src/test/run-pass/send-resource.rs +++ b/src/test/run-pass/send-resource.rs @@ -1,5 +1,5 @@ -import task::*; -import comm::*; +use task::*; +use comm::*; struct test { let f: int; diff --git a/src/test/run-pass/send-type-inference.rs b/src/test/run-pass/send-type-inference.rs index cf975c54133..67a1b618413 100644 --- a/src/test/run-pass/send-type-inference.rs +++ b/src/test/run-pass/send-type-inference.rs @@ -1,7 +1,7 @@ use std; -import comm::Chan; -import comm::send; -import comm::Port; +use comm::Chan; +use comm::send; +use comm::Port; // tests that ctrl's type gets inferred properly type command<K: send, V: send> = {key: K, val: V}; diff --git a/src/test/run-pass/sendfn-deep-copy.rs b/src/test/run-pass/sendfn-deep-copy.rs index f9eaae7a354..d5ee2f1aaec 100644 --- a/src/test/run-pass/sendfn-deep-copy.rs +++ b/src/test/run-pass/sendfn-deep-copy.rs @@ -1,7 +1,7 @@ use std; -import comm::Chan; -import comm::send; +use comm::Chan; +use comm::send; fn main() { test05(); } diff --git a/src/test/run-pass/sendfn-generic-fn.rs b/src/test/run-pass/sendfn-generic-fn.rs index 486a6e0eacf..eece50e7570 100644 --- a/src/test/run-pass/sendfn-generic-fn.rs +++ b/src/test/run-pass/sendfn-generic-fn.rs @@ -1,7 +1,7 @@ use std; -import comm::Chan; -import comm::send; +use comm::Chan; +use comm::send; fn main() { test05(); } diff --git a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs index 3e268e6a4a9..c53dc3d7ed6 100644 --- a/src/test/run-pass/sendfn-spawn-with-fn-arg.rs +++ b/src/test/run-pass/sendfn-spawn-with-fn-arg.rs @@ -1,7 +1,7 @@ use std; -import comm::Chan; -import comm::send; +use comm::Chan; +use comm::send; fn main() { test05(); } diff --git a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs index 6e050704e1f..67d5e4571a0 100644 --- a/src/test/run-pass/shape_intrinsic_tag_then_rec.rs +++ b/src/test/run-pass/shape_intrinsic_tag_then_rec.rs @@ -3,9 +3,8 @@ // interior record which is then itself interior to // something else, shape calculations were off. use std; -import std::list; -import std::list::list; -import option; +use std::list; +use std::list::list; enum opt_span { diff --git a/src/test/run-pass/shebang.rs b/src/test/run-pass/shebang.rs index 462546e24b8..462286af178 100644 --- a/src/test/run-pass/shebang.rs +++ b/src/test/run-pass/shebang.rs @@ -1,6 +1,6 @@ #!/usr/bin/env rustx // pp-exact -import io::println; +use io::println; fn main() { io::println(~"Hello World"); } diff --git a/src/test/run-pass/spawn-fn.rs b/src/test/run-pass/spawn-fn.rs index b05b73d2160..7534245e62e 100644 --- a/src/test/run-pass/spawn-fn.rs +++ b/src/test/run-pass/spawn-fn.rs @@ -1,8 +1,7 @@ // -*- rust -*- use std; -import task::yield; -import task; +use task::yield; fn x(s: ~str, n: int) { log(debug, s); diff --git a/src/test/run-pass/spawn-types.rs b/src/test/run-pass/spawn-types.rs index 7151da4563a..93123cd7433 100644 --- a/src/test/run-pass/spawn-types.rs +++ b/src/test/run-pass/spawn-types.rs @@ -6,9 +6,6 @@ use std; -import str; -import comm; -import task; type ctx = comm::Chan<int>; diff --git a/src/test/run-pass/spawn.rs b/src/test/run-pass/spawn.rs index 04404294d92..70fbad0f1ae 100644 --- a/src/test/run-pass/spawn.rs +++ b/src/test/run-pass/spawn.rs @@ -2,7 +2,6 @@ use std; -import task; fn main() { task::spawn(|| child(10) ); diff --git a/src/test/run-pass/spawn2.rs b/src/test/run-pass/spawn2.rs index 13fb94b656c..63dab45a701 100644 --- a/src/test/run-pass/spawn2.rs +++ b/src/test/run-pass/spawn2.rs @@ -1,7 +1,7 @@ // -*- rust -*- use std; -import task::spawn; +use task::spawn; fn main() { spawn(|| child((10, 20, 30, 40, 50, 60, 70, 80, 90)) ); } diff --git a/src/test/run-pass/static-impl.rs b/src/test/run-pass/static-impl.rs index 388c000daf0..853243d3ea8 100644 --- a/src/test/run-pass/static-impl.rs +++ b/src/test/run-pass/static-impl.rs @@ -1,4 +1,4 @@ -import a::*; +use a::*; trait plus { fn plus() -> int; diff --git a/src/test/run-pass/static-method-xcrate.rs b/src/test/run-pass/static-method-xcrate.rs index 85fdea37405..ff7fb8a0d23 100644 --- a/src/test/run-pass/static-method-xcrate.rs +++ b/src/test/run-pass/static-method-xcrate.rs @@ -2,8 +2,8 @@ // aux-build:static-methods-crate.rs use static_methods_crate; -import static_methods_crate::read; -import readMaybeRenamed = static_methods_crate::readMaybe; +use static_methods_crate::read; +use readMaybeRenamed = static_methods_crate::readMaybe; fn main() { let result: int = read(~"5"); diff --git a/src/test/run-pass/str-append.rs b/src/test/run-pass/str-append.rs index bf16c8c7988..106ea6f3afd 100644 --- a/src/test/run-pass/str-append.rs +++ b/src/test/run-pass/str-append.rs @@ -2,7 +2,6 @@ // -*- rust -*- use std; -import str; fn test1() { let mut s: ~str = ~"hello"; diff --git a/src/test/run-pass/str-multiline.rs b/src/test/run-pass/str-multiline.rs index 210fb9b275b..6e72ce20184 100644 --- a/src/test/run-pass/str-multiline.rs +++ b/src/test/run-pass/str-multiline.rs @@ -2,7 +2,6 @@ // -*- rust -*- use std; -import str; fn main() { let a: ~str = ~"this \ diff --git a/src/test/run-pass/string-self-append.rs b/src/test/run-pass/string-self-append.rs index 1c360bea3da..1312e9a3c06 100644 --- a/src/test/run-pass/string-self-append.rs +++ b/src/test/run-pass/string-self-append.rs @@ -1,5 +1,4 @@ use std; -import str; fn main() { // Make sure we properly handle repeated self-appends. diff --git a/src/test/run-pass/syntax-extension-fmt.rs b/src/test/run-pass/syntax-extension-fmt.rs index 48f5aeb2a3f..20336cd561c 100644 --- a/src/test/run-pass/syntax-extension-fmt.rs +++ b/src/test/run-pass/syntax-extension-fmt.rs @@ -1,5 +1,4 @@ use std; -import str; fn test(actual: ~str, expected: ~str) { log(debug, actual); diff --git a/src/test/run-pass/tag-exports.rs b/src/test/run-pass/tag-exports.rs index 57937855ca4..3c4d05b675f 100644 --- a/src/test/run-pass/tag-exports.rs +++ b/src/test/run-pass/tag-exports.rs @@ -1,4 +1,4 @@ -import alder::*; +use alder::*; mod alder { export burnside; diff --git a/src/test/run-pass/task-comm-0.rs b/src/test/run-pass/task-comm-0.rs index 575d3232e1c..341e24f2e63 100644 --- a/src/test/run-pass/task-comm-0.rs +++ b/src/test/run-pass/task-comm-0.rs @@ -1,9 +1,7 @@ use std; -import pipes; -import pipes::Chan; -import pipes::Port; -import task; +use pipes::Chan; +use pipes::Port; fn main() { test05(); } diff --git a/src/test/run-pass/task-comm-10.rs b/src/test/run-pass/task-comm-10.rs index 03d7a7a9645..cae75f97fd7 100644 --- a/src/test/run-pass/task-comm-10.rs +++ b/src/test/run-pass/task-comm-10.rs @@ -1,6 +1,4 @@ use std; -import task; -import pipes; fn start(c: pipes::Chan<pipes::Chan<~str>>) { let (ch, p) = pipes::stream(); diff --git a/src/test/run-pass/task-comm-11.rs b/src/test/run-pass/task-comm-11.rs index b87ba47d7d1..f0e026f4efe 100644 --- a/src/test/run-pass/task-comm-11.rs +++ b/src/test/run-pass/task-comm-11.rs @@ -1,6 +1,4 @@ use std; -import pipes; -import task; fn start(c: pipes::Chan<pipes::Chan<int>>) { let (ch, p) = pipes::stream(); diff --git a/src/test/run-pass/task-comm-12.rs b/src/test/run-pass/task-comm-12.rs index e48ee83a38b..d4dc389c00a 100644 --- a/src/test/run-pass/task-comm-12.rs +++ b/src/test/run-pass/task-comm-12.rs @@ -1,5 +1,4 @@ use std; -import task; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-13.rs b/src/test/run-pass/task-comm-13.rs index 261fcc40967..c0613b84a98 100644 --- a/src/test/run-pass/task-comm-13.rs +++ b/src/test/run-pass/task-comm-13.rs @@ -1,7 +1,5 @@ use std; -import task; -import pipes; -import pipes::send; +use pipes::send; fn start(c: pipes::Chan<int>, start: int, number_of_messages: int) { let mut i: int = 0; diff --git a/src/test/run-pass/task-comm-14.rs b/src/test/run-pass/task-comm-14.rs index e2ad5057513..9f4aac349d3 100644 --- a/src/test/run-pass/task-comm-14.rs +++ b/src/test/run-pass/task-comm-14.rs @@ -1,4 +1,3 @@ -import task; fn main() { let po = pipes::PortSet(); diff --git a/src/test/run-pass/task-comm-15.rs b/src/test/run-pass/task-comm-15.rs index 2fdfc582ce5..415a7c21536 100644 --- a/src/test/run-pass/task-comm-15.rs +++ b/src/test/run-pass/task-comm-15.rs @@ -1,6 +1,5 @@ // xfail-win32 use std; -import task; fn start(c: pipes::Chan<int>, i0: int) { let mut i = i0; diff --git a/src/test/run-pass/task-comm-16.rs b/src/test/run-pass/task-comm-16.rs index 4c98e68e370..247d5f4bd40 100644 --- a/src/test/run-pass/task-comm-16.rs +++ b/src/test/run-pass/task-comm-16.rs @@ -1,11 +1,10 @@ // -*- rust -*- use std; -import pipes; -import pipes::send; -import pipes::Port; -import pipes::recv; -import pipes::Chan; +use pipes::send; +use pipes::Port; +use pipes::recv; +use pipes::Chan; // Tests of ports and channels on various types fn test_rec() { diff --git a/src/test/run-pass/task-comm-17.rs b/src/test/run-pass/task-comm-17.rs index 307dde20825..ca3e7036230 100644 --- a/src/test/run-pass/task-comm-17.rs +++ b/src/test/run-pass/task-comm-17.rs @@ -3,7 +3,6 @@ // This test is specifically about spawning temporary closures. use std; -import task; fn f() { } diff --git a/src/test/run-pass/task-comm-3.rs b/src/test/run-pass/task-comm-3.rs index 7289b75c712..2dc33fa52bd 100644 --- a/src/test/run-pass/task-comm-3.rs +++ b/src/test/run-pass/task-comm-3.rs @@ -1,9 +1,7 @@ use std; -import task; -import pipes; -import pipes::Chan; -import pipes::send; -import pipes::recv; +use pipes::Chan; +use pipes::send; +use pipes::recv; fn main() { debug!("===== WITHOUT THREADS ====="); test00(); } diff --git a/src/test/run-pass/task-comm-4.rs b/src/test/run-pass/task-comm-4.rs index 9b99c1cb799..4ac914742a6 100644 --- a/src/test/run-pass/task-comm-4.rs +++ b/src/test/run-pass/task-comm-4.rs @@ -1,6 +1,5 @@ use std; -import pipes; -import pipes::send; +use pipes::send; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-5.rs b/src/test/run-pass/task-comm-5.rs index 249bdaf1c9a..3b5d30cad84 100644 --- a/src/test/run-pass/task-comm-5.rs +++ b/src/test/run-pass/task-comm-5.rs @@ -1,5 +1,4 @@ use std; -import pipes; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-6.rs b/src/test/run-pass/task-comm-6.rs index 1be9fc34833..8927254886a 100644 --- a/src/test/run-pass/task-comm-6.rs +++ b/src/test/run-pass/task-comm-6.rs @@ -1,8 +1,7 @@ use std; -import pipes; -import pipes::send; -import pipes::chan; -import pipes::recv; +use pipes::send; +use pipes::chan; +use pipes::recv; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-7.rs b/src/test/run-pass/task-comm-7.rs index 39a8735423b..8a0b9cbcef8 100644 --- a/src/test/run-pass/task-comm-7.rs +++ b/src/test/run-pass/task-comm-7.rs @@ -1,5 +1,4 @@ use std; -import task; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-9.rs b/src/test/run-pass/task-comm-9.rs index d5f19f16698..afb3e9245e8 100644 --- a/src/test/run-pass/task-comm-9.rs +++ b/src/test/run-pass/task-comm-9.rs @@ -1,5 +1,4 @@ use std; -import task; fn main() { test00(); } diff --git a/src/test/run-pass/task-comm-chan-cleanup.rs b/src/test/run-pass/task-comm-chan-cleanup.rs index 26506dc4bc8..770fcc43c20 100644 --- a/src/test/run-pass/task-comm-chan-cleanup.rs +++ b/src/test/run-pass/task-comm-chan-cleanup.rs @@ -1,5 +1,4 @@ use std; -import comm; fn main() { let p = comm::Port(); diff --git a/src/test/run-pass/task-comm-chan-cleanup2.rs b/src/test/run-pass/task-comm-chan-cleanup2.rs index 26506dc4bc8..770fcc43c20 100644 --- a/src/test/run-pass/task-comm-chan-cleanup2.rs +++ b/src/test/run-pass/task-comm-chan-cleanup2.rs @@ -1,5 +1,4 @@ use std; -import comm; fn main() { let p = comm::Port(); diff --git a/src/test/run-pass/task-comm-chan-cleanup3.rs b/src/test/run-pass/task-comm-chan-cleanup3.rs index f01282f0f6c..486b4ad9fdc 100644 --- a/src/test/run-pass/task-comm-chan-cleanup3.rs +++ b/src/test/run-pass/task-comm-chan-cleanup3.rs @@ -1,5 +1,4 @@ use std; -import comm; fn main() { let c = { diff --git a/src/test/run-pass/task-comm-chan-cleanup4.rs b/src/test/run-pass/task-comm-chan-cleanup4.rs index b839a9ae30f..6b11a99bc2f 100644 --- a/src/test/run-pass/task-comm-chan-cleanup4.rs +++ b/src/test/run-pass/task-comm-chan-cleanup4.rs @@ -1,7 +1,4 @@ use std; -import int; -import comm; -import task; // We're trying to trigger a race between send and port destruction that // results in the string not being freed diff --git a/src/test/run-pass/task-comm-chan-nil.rs b/src/test/run-pass/task-comm-chan-nil.rs index 25b64bc074e..b4bb73b9d3c 100644 --- a/src/test/run-pass/task-comm-chan-nil.rs +++ b/src/test/run-pass/task-comm-chan-nil.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import comm; // rustboot can't transmit nils across channels because they don't have // any size, but rustc currently can because they do have size. Whether diff --git a/src/test/run-pass/task-comm.rs b/src/test/run-pass/task-comm.rs index 6be6729b7c2..5320ced981d 100644 --- a/src/test/run-pass/task-comm.rs +++ b/src/test/run-pass/task-comm.rs @@ -1,12 +1,10 @@ use std; -import task; -import task::task; -import comm; -import comm::Chan; -import comm::Port; -import comm::send; -import comm::recv; +use task::task; +use comm::Chan; +use comm::Port; +use comm::send; +use comm::recv; fn main() { test00(); diff --git a/src/test/run-pass/task-compare.rs b/src/test/run-pass/task-compare.rs index 9a8b5661e87..f4a9d8c2d84 100644 --- a/src/test/run-pass/task-compare.rs +++ b/src/test/run-pass/task-compare.rs @@ -6,9 +6,7 @@ // xfail-test use std; -import task; -import task::join; -import comm; +use task::join; fn child() { } diff --git a/src/test/run-pass/task-killjoin-rsrc.rs b/src/test/run-pass/task-killjoin-rsrc.rs index ce631196fbe..3067e6f48ac 100644 --- a/src/test/run-pass/task-killjoin-rsrc.rs +++ b/src/test/run-pass/task-killjoin-rsrc.rs @@ -4,7 +4,6 @@ // the join. use std; -import task; struct notify { let ch: comm::Chan<bool>; let v: @mut bool; diff --git a/src/test/run-pass/task-killjoin.rs b/src/test/run-pass/task-killjoin.rs index a13fc097dcd..d5f5e0593b3 100644 --- a/src/test/run-pass/task-killjoin.rs +++ b/src/test/run-pass/task-killjoin.rs @@ -6,7 +6,6 @@ // longer needs to be wakened when the supervised task exits. use std; -import task; fn supervised() { // Yield to make sure the supervisor joins before we fail. This is diff --git a/src/test/run-pass/task-life-0.rs b/src/test/run-pass/task-life-0.rs index 12fddc294dc..310e6fa6016 100644 --- a/src/test/run-pass/task-life-0.rs +++ b/src/test/run-pass/task-life-0.rs @@ -1,5 +1,4 @@ use std; -import task; fn main() { task::spawn(|| child(~"Hello") ); } diff --git a/src/test/run-pass/test-ignore-cfg.rs b/src/test/run-pass/test-ignore-cfg.rs index c983a442f7a..5345c9ab8bc 100644 --- a/src/test/run-pass/test-ignore-cfg.rs +++ b/src/test/run-pass/test-ignore-cfg.rs @@ -3,8 +3,6 @@ // xfail-pretty use std; -import option; -import vec; #[test] #[ignore(cfg(ignorecfg))] diff --git a/src/test/run-pass/threads.rs b/src/test/run-pass/threads.rs index 284a4dfffe7..1e06000827b 100644 --- a/src/test/run-pass/threads.rs +++ b/src/test/run-pass/threads.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import task; fn main() { let mut i = 10; diff --git a/src/test/run-pass/trait-to-str.rs b/src/test/run-pass/trait-to-str.rs index bd21ed345aa..2e08857f1b0 100644 --- a/src/test/run-pass/trait-to-str.rs +++ b/src/test/run-pass/trait-to-str.rs @@ -4,7 +4,7 @@ use core; -import core::{str, int, vec}; +use core::{str, int, vec}; trait to_str { fn to_str() -> ~str; diff --git a/src/test/run-pass/trait_mix/trait-mix.rs b/src/test/run-pass/trait_mix/trait-mix.rs index 2f6eb93a2bb..800fb4f9006 100644 --- a/src/test/run-pass/trait_mix/trait-mix.rs +++ b/src/test/run-pass/trait_mix/trait-mix.rs @@ -1,4 +1,3 @@ -import u_trait_mix; impl f32: u_trait_mix::num { pure fn add(&&other: f32) -> f32 { return self + other; } diff --git a/src/test/run-pass/trivial-message.rs b/src/test/run-pass/trivial-message.rs index 5b4352a8345..f6a03d3939e 100644 --- a/src/test/run-pass/trivial-message.rs +++ b/src/test/run-pass/trivial-message.rs @@ -1,4 +1,4 @@ -import pipes::{Port, Chan}; +use pipes::{Port, Chan}; /* This is about the simplest program that can successfully send a diff --git a/src/test/run-pass/type-sizes.rs b/src/test/run-pass/type-sizes.rs index ea6c95fc363..dbf7d718912 100644 --- a/src/test/run-pass/type-sizes.rs +++ b/src/test/run-pass/type-sizes.rs @@ -1,5 +1,5 @@ // xfail-test -import sys::rustrt::size_of; +use sys::rustrt::size_of; use std; fn main() { diff --git a/src/test/run-pass/unify-return-ty.rs b/src/test/run-pass/unify-return-ty.rs index 07d55229fb7..07c546ad09e 100644 --- a/src/test/run-pass/unify-return-ty.rs +++ b/src/test/run-pass/unify-return-ty.rs @@ -2,7 +2,6 @@ // unified with the type *T, and so the type variable // in that type gets resolved. use std; -import unsafe; fn null<T>() -> *T unsafe { unsafe::reinterpret_cast(&0) } diff --git a/src/test/run-pass/unique-copy-box.rs b/src/test/run-pass/unique-copy-box.rs index 7a40e11642e..6e33c3e19a2 100644 --- a/src/test/run-pass/unique-copy-box.rs +++ b/src/test/run-pass/unique-copy-box.rs @@ -1,5 +1,5 @@ use std; -import sys::refcount; +use sys::refcount; fn main() unsafe { let i = ~@1; diff --git a/src/test/run-pass/unique-send-2.rs b/src/test/run-pass/unique-send-2.rs index fa98f886a5c..47616e5b731 100644 --- a/src/test/run-pass/unique-send-2.rs +++ b/src/test/run-pass/unique-send-2.rs @@ -1,7 +1,4 @@ use std; -import comm; -import task; -import uint; fn child(c: comm::Chan<~uint>, i: uint) { comm::send(c, ~i); diff --git a/src/test/run-pass/unique-send.rs b/src/test/run-pass/unique-send.rs index eabfc1e859f..2f505c2f07f 100644 --- a/src/test/run-pass/unique-send.rs +++ b/src/test/run-pass/unique-send.rs @@ -1,6 +1,4 @@ use std; -import comm; -import task; fn main() { let p = comm::Port(); diff --git a/src/test/run-pass/unwind-box.rs b/src/test/run-pass/unwind-box.rs index d5e977e4d2a..f71acbf8ca3 100644 --- a/src/test/run-pass/unwind-box.rs +++ b/src/test/run-pass/unwind-box.rs @@ -1,6 +1,5 @@ // xfail-win32 use std; -import task; fn f() { let a = @0; diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index c8b2be18e15..da7d63e9126 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -1,7 +1,5 @@ // xfail-win32 use std; -import task; -import comm; struct complainer { let c: comm::Chan<bool>; diff --git a/src/test/run-pass/unwind-resource2.rs b/src/test/run-pass/unwind-resource2.rs index 4b3ae5b76b2..c070bbb1ca2 100644 --- a/src/test/run-pass/unwind-resource2.rs +++ b/src/test/run-pass/unwind-resource2.rs @@ -1,7 +1,5 @@ // xfail-win32 use std; -import task; -import comm; struct complainer { let c: @int; diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs index fb2805f2b0b..81c0878704a 100644 --- a/src/test/run-pass/unwind-unique.rs +++ b/src/test/run-pass/unwind-unique.rs @@ -1,6 +1,5 @@ // xfail-win32 use std; -import task; fn f() { let a = ~0; diff --git a/src/test/run-pass/use.rs b/src/test/run-pass/use.rs index 93cdbf9e865..4fba3ca24be 100644 --- a/src/test/run-pass/use.rs +++ b/src/test/run-pass/use.rs @@ -4,8 +4,8 @@ use zed(name = "core"); use bar(name = "core", vers = "0.4"); -import core::str; -import x = zed::str; +use core::str; +use x = zed::str; mod baz { import bar::str; import x = core::str; diff --git a/src/test/run-pass/utf8_chars.rs b/src/test/run-pass/utf8_chars.rs index 63be9a5e352..589afdba636 100644 --- a/src/test/run-pass/utf8_chars.rs +++ b/src/test/run-pass/utf8_chars.rs @@ -1,6 +1,4 @@ use std; -import str; -import vec; fn main() { // Chars of 1, 2, 3, and 4 bytes diff --git a/src/test/run-pass/vec-self-append.rs b/src/test/run-pass/vec-self-append.rs index aecf51ec210..c4d0c5b4662 100644 --- a/src/test/run-pass/vec-self-append.rs +++ b/src/test/run-pass/vec-self-append.rs @@ -1,5 +1,4 @@ use std; -import vec; fn test_heap_to_heap() { // a spills onto the heap diff --git a/src/test/run-pass/yield.rs b/src/test/run-pass/yield.rs index 340a770f91b..e3db1aa35b0 100644 --- a/src/test/run-pass/yield.rs +++ b/src/test/run-pass/yield.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import task; -import task::*; +use task::*; fn main() { let mut result = None; diff --git a/src/test/run-pass/yield1.rs b/src/test/run-pass/yield1.rs index 77bd880d717..c60645494c2 100644 --- a/src/test/run-pass/yield1.rs +++ b/src/test/run-pass/yield1.rs @@ -1,7 +1,6 @@ // -*- rust -*- use std; -import task; -import task::*; +use task::*; fn main() { let mut result = None; diff --git a/src/test/run-pass/zip-same-length.rs b/src/test/run-pass/zip-same-length.rs index 8e05abe75f3..43c5d704b1a 100644 --- a/src/test/run-pass/zip-same-length.rs +++ b/src/test/run-pass/zip-same-length.rs @@ -1,9 +1,7 @@ // In this case, the code should compile and should // succeed at runtime use std; -import uint; -import u8; -import vec::{head, is_not_empty, last, same_length, zip}; +use vec::{head, is_not_empty, last, same_length, zip}; fn enum_chars(start: u8, end: u8) -> ~[char] { assert start < end; |