diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs index 63d15f8f76ec..e91d09fc0cc2 100644 --- a/src/libstd/arc.rs +++ b/src/libstd/arc.rs @@ -469,7 +469,13 @@ impl &RWReadMode { #[cfg(test)] mod tests { #[legacy_exports]; - use comm::*; + + use core::oldcomm::*; + use core::option::{Some, None}; + use core::option; + use core::pipes; + use core::task; + use core::vec; #[test] fn manually_share_arc() { diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs index 9359a707d4c3..e817e6e160f7 100644 --- a/src/libstd/arena.rs +++ b/src/libstd/arena.rs @@ -34,6 +34,7 @@ #[forbid(deprecated_mode)]; +use arena; use list; use list::{List, Cons, Nil}; diff --git a/src/libstd/base64.rs b/src/libstd/base64.rs index 4cad9d1675de..db3991a1d3be 100644 --- a/src/libstd/base64.rs +++ b/src/libstd/base64.rs @@ -153,6 +153,9 @@ impl ~str: FromBase64 { #[cfg(test)] mod tests { #[legacy_exports]; + + use core::str; + #[test] fn test_to_base64() { assert (~"").to_base64() == ~""; diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs index 828de1eb546b..990ccb3a1631 100644 --- a/src/libstd/bitv.rs +++ b/src/libstd/bitv.rs @@ -577,6 +577,11 @@ impl Bitv: ops::Index { #[cfg(test)] mod tests { #[legacy_exports]; + + use bitv; + + use core::uint; + #[test] fn test_to_str() { let zerolen = Bitv(0u, false); diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs index 42facbc20d08..aa9e864adfdc 100644 --- a/src/libstd/c_vec.rs +++ b/src/libstd/c_vec.rs @@ -152,7 +152,8 @@ pub unsafe fn ptr(t: CVec) -> *mut T { #[cfg(test)] mod tests { - use libc::*; + use core::libc::*; + use core::libc; fn malloc(n: size_t) -> CVec { let mem = libc::malloc(n); diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs index ff4fab0e1dfe..e7042ffa89f0 100644 --- a/src/libstd/deque.rs +++ b/src/libstd/deque.rs @@ -131,6 +131,8 @@ pub fn create() -> Deque { #[cfg(test)] mod tests { + use deque; + #[test] fn test_simple() { let d: deque::Deque = deque::create::(); diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs index 86cc15d068be..0f49507cea4d 100644 --- a/src/libstd/ebml.rs +++ b/src/libstd/ebml.rs @@ -663,6 +663,12 @@ pub mod writer { #[cfg(test)] mod tests { + use ebml::reader; + use ebml::writer; + use serialize; + + use core::io; + #[test] fn test_option_int() { fn test_v(v: Option) { diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs index c1515a8b5e23..3c1dec844ea8 100644 --- a/src/libstd/flatpipes.rs +++ b/src/libstd/flatpipes.rs @@ -685,11 +685,18 @@ mod test { use flatpipes::flatteners::*; use flatpipes::bytepipes::*; + use flatpipes::pod; + use flatpipes::serial; + use flatpipes::util::BufReader; + use net::ip; + use net::tcp::TcpSocketBuf; use core::dvec::DVec; - use io::BytesReader; - use util::BufReader; - use net::tcp::TcpSocketBuf; + use core::int; + use core::io::BytesReader; + use core::io; + use core::sys; + use core::task; #[test] fn test_serializing_memory_stream() { diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs index acbe32c74dc4..3d9ee0d3d129 100644 --- a/src/libstd/getopts.rs +++ b/src/libstd/getopts.rs @@ -634,8 +634,11 @@ pub mod groups { mod tests { #[legacy_exports]; use opt = getopts; - use result::{Err, Ok}; use getopts::groups::OptGroup; + use getopts::groups; + + use core::result::{Err, Ok}; + use core::result; fn check_fail_type(f: Fail_, ft: FailType) { match f { diff --git a/src/libstd/json.rs b/src/libstd/json.rs index c3f30c45e623..44cd4fe44491 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -1193,6 +1193,9 @@ impl Error: to_str::ToStr { #[cfg(test)] mod tests { + use core::result; + use core::send_map::linear; + fn mk_object(items: &[(~str, Json)]) -> Json { let mut d = ~linear::LinearMap(); diff --git a/src/libstd/list.rs b/src/libstd/list.rs index 5922b20300e3..4a7574afd9f0 100644 --- a/src/libstd/list.rs +++ b/src/libstd/list.rs @@ -162,6 +162,10 @@ pub pure fn each(l: @List, f: fn(&T) -> bool) { mod tests { #[legacy_exports]; + use list; + + use core::option; + #[test] fn test_is_empty() { let empty : @list::List = from_vec(~[]); diff --git a/src/libstd/map.rs b/src/libstd/map.rs index 0e5a7972838f..b6c7c8be5a92 100644 --- a/src/libstd/map.rs +++ b/src/libstd/map.rs @@ -613,6 +613,10 @@ impl @Mut>: #[cfg(test)] mod tests { + use map; + + use core::option; + use core::uint; #[test] fn test_simple() { diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs index 7196dfad8e51..7d1806d931e6 100644 --- a/src/libstd/rope.rs +++ b/src/libstd/rope.rs @@ -1259,6 +1259,12 @@ pub mod node { #[cfg(test)] mod tests { + use rope::iterator; + use rope::node; + + use core::option; + use core::str; + use core::vec; //Utility function, used for sanity check fn rope_to_string(r: Rope) -> ~str { diff --git a/src/libstd/sha1.rs b/src/libstd/sha1.rs index 264a8791e018..ef3969a376b1 100644 --- a/src/libstd/sha1.rs +++ b/src/libstd/sha1.rs @@ -276,6 +276,11 @@ pub fn sha1() -> Sha1 { mod tests { #[legacy_exports]; + use sha1; + + use core::str; + use core::vec; + #[test] fn test() unsafe { type Test = {input: ~str, output: ~[u8]}; diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs index e412d237e65b..a6c14516af2c 100644 --- a/src/libstd/smallintmap.rs +++ b/src/libstd/smallintmap.rs @@ -19,8 +19,8 @@ use map::Map; use core::dvec::DVec; use core::ops; -use core::option; use core::option::{Some, None}; +use core::option; // FIXME (#2347): Should not be @; there's a bug somewhere in rustc that // requires this to be. @@ -168,6 +168,8 @@ pub fn as_map(s: SmallIntMap) -> map::Map { #[cfg(test)] mod tests { + use core::option::None; + use core::option; #[test] fn test_insert_with_key() { diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index b497f63b6742..e557730643a2 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -968,6 +968,9 @@ mod test_tim_sort { #[cfg(test)] mod big_tests { + use core::rand; + use core::task; + use core::vec; #[test] fn test_unique() { diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs index 66a3d6499563..f9afcc49bc15 100644 --- a/src/libstd/sync.rs +++ b/src/libstd/sync.rs @@ -708,6 +708,12 @@ impl &RWlockReadMode { #[cfg(test)] mod tests { #[legacy_exports]; + + use core::pipes; + use core::ptr; + use core::result; + use core::task; + /************************************************************************ * Semaphore tests ************************************************************************/ diff --git a/src/libstd/test.rs b/src/libstd/test.rs index a3959295735f..176953663ebf 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -425,6 +425,11 @@ fn calc_result(test: &TestDesc, task_succeeded: bool) -> TestResult { mod tests { #[legacy_exports]; + use core::either; + use core::oldcomm; + use core::option; + use core::vec; + #[test] fn do_not_run_ignored_tests() { fn f() { fail; } diff --git a/src/libstd/time.rs b/src/libstd/time.rs index 61f9dbb6cea5..7c586c3fd4e2 100644 --- a/src/libstd/time.rs +++ b/src/libstd/time.rs @@ -857,6 +857,14 @@ priv fn do_strftime(format: &str, tm: &Tm) -> ~str { mod tests { #[legacy_exports]; + use core::float; + use core::os; + use core::result; + use core::str; + use core::u64; + use core::uint; + use core::vec; + #[test] fn test_get_time() { const some_recent_date: i64 = 1325376000i64; // 2012-01-01T00:00:00Z @@ -904,7 +912,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let utc = at_utc(time); assert utc.tm_sec == 30_i32; @@ -926,7 +934,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let local = at(time); error!("time_at: %?", local); @@ -955,7 +963,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let utc = at_utc(time); assert utc.to_timespec() == time; @@ -967,7 +975,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let utc = at_utc(time); let local = at(time); @@ -1140,7 +1148,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let utc = at_utc(time); let local = at(time); @@ -1156,7 +1164,7 @@ mod tests { os::setenv(~"TZ", ~"America/Los_Angeles"); tzset(); - let time = Timespec::new(1234567890, 54321); + let time = ::time::Timespec::new(1234567890, 54321); let utc = at_utc(time); let local = at(time); diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs index ae132af8b6b3..038486f2b902 100644 --- a/src/libstd/timer.rs +++ b/src/libstd/timer.rs @@ -163,6 +163,14 @@ extern fn delayed_send_close_cb(handle: *uv::ll::uv_timer_t) unsafe { #[cfg(test)] mod test { #[legacy_exports]; + + use uv; + + use core::iter; + use core::oldcomm; + use core::rand; + use core::task; + #[test] fn test_gl_timer_simple_sleep_test() { let hl_loop = uv::global_loop::get(); diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs index e1874bd0bfd4..caccb763ee9d 100644 --- a/src/libstd/treemap.rs +++ b/src/libstd/treemap.rs @@ -107,6 +107,8 @@ pub fn equals(t1: &const TreeEdge, mod tests { #[legacy_exports]; + use core::str; + #[test] fn init_treemap() { let _m = TreeMap::(); } diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs index 0cbfbe87de4c..8a04059754a9 100644 --- a/src/libstd/uv_global_loop.rs +++ b/src/libstd/uv_global_loop.rs @@ -123,6 +123,14 @@ fn spawn_loop() -> IoTask { #[cfg(test)] mod test { + use uv::iotask; + use uv::ll; + + use core::iter; + use core::libc; + use core::oldcomm; + use core::ptr; + extern fn simple_timer_close_cb(timer_ptr: *ll::uv_timer_t) unsafe { let exit_ch_ptr = ll::get_data_for_uv_handle( timer_ptr as *libc::c_void) as *oldcomm::Chan; diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs index ed2da88bac41..c1c455c3a115 100644 --- a/src/libstd/uv_iotask.rs +++ b/src/libstd/uv_iotask.rs @@ -176,6 +176,11 @@ extern fn tear_down_close_cb(handle: *ll::uv_async_t) unsafe { #[cfg(test)] mod test { + use uv::ll; + + use core::oldcomm; + use core::ptr; + extern fn async_close_cb(handle: *ll::uv_async_t) unsafe { log(debug, fmt!("async_close_cb handle %?", handle)); let exit_ch = (*(ll::get_data_for_uv_handle(handle) diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs index 45c95146e8e8..3631556c2ba0 100644 --- a/src/libstd/workcache.rs +++ b/src/libstd/workcache.rs @@ -17,6 +17,7 @@ use core::io; use core::option; use core::pipes::{recv, oneshot, PortOne, send_one}; use core::result; +use core::run; use core::send_map::linear::LinearMap; use core::task; use core::to_bytes; @@ -331,6 +332,7 @@ fn unwrap