diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2013-02-27 00:10:03 -0500 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2013-03-04 12:27:01 -0500 |
| commit | dfb5c10dea0dd7bc56950148fa23fd02a07706fa (patch) | |
| tree | 18fc8c7483b7acf5c1ee8e22cbd92bd119541b66 /src/libcore | |
| parent | 55461d888f63e7113f1ea40e586e4917abe4815b (diff) | |
| download | rust-dfb5c10dea0dd7bc56950148fa23fd02a07706fa.tar.gz rust-dfb5c10dea0dd7bc56950148fa23fd02a07706fa.zip | |
Remove unused imports throughout src/
Diffstat (limited to 'src/libcore')
41 files changed, 13 insertions, 108 deletions
diff --git a/src/libcore/bool.rs b/src/libcore/bool.rs index 89ffaeff63d..33953e952e8 100644 --- a/src/libcore/bool.rs +++ b/src/libcore/bool.rs @@ -11,9 +11,7 @@ //! Boolean logic -use bool; use cmp; -use cmp::Eq; use option::{None, Option, Some}; /// Negation / inverse diff --git a/src/libcore/char.rs b/src/libcore/char.rs index daff7d116e8..ea12d5fd7ec 100644 --- a/src/libcore/char.rs +++ b/src/libcore/char.rs @@ -10,7 +10,6 @@ //! Utilities for manipulating the char type -use char; use cmp::Eq; use option::{None, Option, Some}; use str; diff --git a/src/libcore/dvec.rs b/src/libcore/dvec.rs index 7197de36404..5ec0dd073c8 100644 --- a/src/libcore/dvec.rs +++ b/src/libcore/dvec.rs @@ -20,7 +20,6 @@ Note that recursive use is not permitted. */ use cast; -use cast::reinterpret_cast; use prelude::*; use ptr::null; use vec; diff --git a/src/libcore/either.rs b/src/libcore/either.rs index 93b28233acd..e5091cc8c34 100644 --- a/src/libcore/either.rs +++ b/src/libcore/either.rs @@ -11,7 +11,6 @@ //! A type that represents one of two alternatives use cmp::Eq; -use cmp; use kinds::Copy; use result::Result; use result; diff --git a/src/libcore/flate.rs b/src/libcore/flate.rs index c47e27e75d9..f89aa3411f1 100644 --- a/src/libcore/flate.rs +++ b/src/libcore/flate.rs @@ -17,7 +17,6 @@ Simple compression use libc; use libc::{c_void, size_t, c_int}; use ptr; -use rand; use vec; extern mod rustrt { diff --git a/src/libcore/hash.rs b/src/libcore/hash.rs index 4a1a1952907..a6048e2b25a 100644 --- a/src/libcore/hash.rs +++ b/src/libcore/hash.rs @@ -21,7 +21,6 @@ use io; use io::{Writer, WriterUtil}; -use os; use to_bytes::IterBytes; use uint; use vec; diff --git a/src/libcore/hashmap.rs b/src/libcore/hashmap.rs index 007e3260aa1..b6ba790c300 100644 --- a/src/libcore/hashmap.rs +++ b/src/libcore/hashmap.rs @@ -19,11 +19,8 @@ pub mod linear { use iter::BaseIter; use hash::Hash; use iter; - use kinds::Copy; use option::{None, Option, Some}; - use option; use rand; - use to_bytes::IterBytes; use uint; use vec; diff --git a/src/libcore/io.rs b/src/libcore/io.rs index 4f9b8ccf757..824a18b8c01 100644 --- a/src/libcore/io.rs +++ b/src/libcore/io.rs @@ -16,14 +16,11 @@ Basic input/output use result::Result; -use cmp::Eq; use dvec::DVec; use int; use libc; use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t}; use libc::consts::os::posix88::*; -use libc::consts::os::extra::*; -use option; use os; use prelude::*; use ptr; @@ -715,7 +712,9 @@ pub fn mk_file_writer(path: &Path, flags: &[FileFlag]) -> Result<Writer, ~str> { #[cfg(windows)] - fn wb() -> c_int { (O_WRONLY | O_BINARY) as c_int } + fn wb() -> c_int { + (O_WRONLY | libc::consts::os::extra::O_BINARY) as c_int + } #[cfg(unix)] fn wb() -> c_int { O_WRONLY as c_int } diff --git a/src/libcore/iter-trait/dlist.rs b/src/libcore/iter-trait/dlist.rs index 5f95c00f336..41d509f1402 100644 --- a/src/libcore/iter-trait/dlist.rs +++ b/src/libcore/iter-trait/dlist.rs @@ -9,8 +9,6 @@ // except according to those terms. mod inst { - use cast; - use dlist; use dlist::DList; use managed; use option::{Option, Some}; diff --git a/src/libcore/libc.rs b/src/libcore/libc.rs index c6229d7604c..9f673a14284 100644 --- a/src/libcore/libc.rs +++ b/src/libcore/libc.rs @@ -1007,7 +1007,6 @@ pub mod funcs { pub mod c95 { use libc::types::common::c95::{FILE, c_void, fpos_t}; - use libc::types::common::posix88::dirent_t; use libc::types::os::arch::c95::{c_char, c_double, c_int, c_long}; use libc::types::os::arch::c95::{c_uint, c_ulong, c_void, size_t}; diff --git a/src/libcore/managed.rs b/src/libcore/managed.rs index bed50cfbc25..1f347371dfd 100644 --- a/src/libcore/managed.rs +++ b/src/libcore/managed.rs @@ -10,12 +10,9 @@ //! Operations on managed box types -use cast::transmute; -use cmp::{Eq, Ord}; -use managed::raw::BoxRepr; -use prelude::*; use ptr; +#[cfg(notest)] use cmp::{Eq, Ord}; pub mod raw { diff --git a/src/libcore/num/f64.rs b/src/libcore/num/f64.rs index 5362a65f7ce..1c9f8286bcb 100644 --- a/src/libcore/num/f64.rs +++ b/src/libcore/num/f64.rs @@ -13,7 +13,6 @@ use cmath; use cmp; use libc::{c_double, c_int}; -use libc; use num::NumCast; use num::strconv; use num; diff --git a/src/libcore/num/float.rs b/src/libcore/num/float.rs index 1b79ec614d4..366f9e5f7b7 100644 --- a/src/libcore/num/float.rs +++ b/src/libcore/num/float.rs @@ -20,18 +20,13 @@ // PORT this must match in width according to architecture -use m_float = f64; - use cmp::{Eq, Ord}; -use cmp; use f64; use num::NumCast; use num::strconv; use num; use ops; use option::{None, Option, Some}; -use str; -use uint; use to_str; use from_str; diff --git a/src/libcore/num/int-template.rs b/src/libcore/num/int-template.rs index ef661d2160b..98e3bebd466 100644 --- a/src/libcore/num/int-template.rs +++ b/src/libcore/num/int-template.rs @@ -10,21 +10,16 @@ use T = self::inst::T; -use char; use cmp::{Eq, Ord}; -use cmp; use to_str::ToStr; use from_str::FromStr; use num::{ToStrRadix, FromStrRadix}; use num::strconv; use num; use prelude::*; -use str; -use uint; -use vec; -use i8; -use i16; -use i32; + +#[cfg(notest)] use cmp::{Eq, Ord}; + pub use cmp::{min, max}; pub const bits : uint = inst::bits; diff --git a/src/libcore/num/num.rs b/src/libcore/num/num.rs index 4d97df621da..c141820198f 100644 --- a/src/libcore/num/num.rs +++ b/src/libcore/num/num.rs @@ -12,10 +12,7 @@ use cmp::{Ord, Eq}; use ops::{Add, Div, Modulo, Mul, Neg, Sub}; use option::{None, Option, Some}; -use char; -use str; use kinds::Copy; -use vec; pub mod strconv; diff --git a/src/libcore/num/uint-template.rs b/src/libcore/num/uint-template.rs index 8d5726b8679..0811c955078 100644 --- a/src/libcore/num/uint-template.rs +++ b/src/libcore/num/uint-template.rs @@ -11,9 +11,7 @@ use T = self::inst::T; use T_SIGNED = self::inst::T_SIGNED; -use char; use cmp::{Eq, Ord}; -use cmp; use to_str::ToStr; use from_str::FromStr; use num::{ToStrRadix, FromStrRadix}; @@ -21,12 +19,6 @@ use num::strconv; use num; use option::{None, Option, Some}; use prelude::*; -use str; -use uint; -use vec; -use u8; -use u16; -use u32; pub use cmp::{min, max}; @@ -357,7 +349,6 @@ pub fn to_str_radix37() { uint::to_str_radix(100u, 37u); } -use io; #[test] pub fn test_ranges() { let mut l = ~[]; diff --git a/src/libcore/num/uint-template/uint.rs b/src/libcore/num/uint-template/uint.rs index 07467575319..0131bff685d 100644 --- a/src/libcore/num/uint-template/uint.rs +++ b/src/libcore/num/uint-template/uint.rs @@ -19,7 +19,6 @@ pub use self::inst::{ pub mod inst { use sys; - use uint; use iter; pub type T = uint; diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 53944c4c2c8..55244b81b93 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -43,9 +43,6 @@ let unwrapped_msg = match msg { use cmp::{Eq,Ord}; use kinds::Copy; -use option; -use ptr; -use str; use util; use num::Zero; diff --git a/src/libcore/os.rs b/src/libcore/os.rs index 6e040286ba4..2341ec33115 100644 --- a/src/libcore/os.rs +++ b/src/libcore/os.rs @@ -27,7 +27,6 @@ */ use cast; -use either; use io; use libc; use libc::{c_char, c_void, c_int, c_uint, size_t, ssize_t}; @@ -38,7 +37,6 @@ use prelude::*; use ptr; use str; use task; -use task::TaskBuilder; use uint; use vec; diff --git a/src/libcore/path.rs b/src/libcore/path.rs index 8d528a11598..a88c779d808 100644 --- a/src/libcore/path.rs +++ b/src/libcore/path.rs @@ -17,7 +17,6 @@ Cross-platform file path handling use cmp::Eq; use libc; use option::{None, Option, Some}; -use ptr; use str; use to_str::ToStr; @@ -830,7 +829,6 @@ pub pure fn normalize(components: &[~str]) -> ~[~str] { pub mod windows { use libc; use option::{None, Option, Some}; - use to_str::ToStr; #[inline(always)] pub pure fn is_sep(u: u8) -> bool { diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs index e4fc9528f23..c16281706d7 100644 --- a/src/libcore/pipes.rs +++ b/src/libcore/pipes.rs @@ -90,10 +90,8 @@ use kinds::Owned; use libc; use option; use option::{None, Option, Some, unwrap}; -use pipes; use unstable::intrinsics; use ptr; -use unstable; use task; use vec; diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index ecbce18e6da..8996d404dbc 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -15,10 +15,7 @@ use cmp::{Eq, Ord}; use libc; use libc::{c_void, size_t}; use unstable::intrinsics::{memmove32,memmove64}; -use ptr; -use str; use sys; -use vec; #[nolink] #[abi = "cdecl"] diff --git a/src/libcore/repr.rs b/src/libcore/repr.rs index af135339b2e..dd5a427c4ce 100644 --- a/src/libcore/repr.rs +++ b/src/libcore/repr.rs @@ -15,25 +15,19 @@ More runtime type reflection */ use cast::transmute; -use cast; use char; use dvec::DVec; use intrinsic; use intrinsic::{TyDesc, TyVisitor, visit_tydesc}; -use io; use io::{Writer, WriterUtil}; use libc::c_void; use managed; -use managed::raw::BoxHeaderRepr; use ptr; use reflect; use reflect::{MovePtr, MovePtrAdaptor, align}; -use repr; use str; use sys; -use sys::TypeDesc; use to_str::ToStr; -use uint; use vec::UnboxedVecRepr; use vec::raw::{VecRepr, SliceRepr}; use vec; diff --git a/src/libcore/result.rs b/src/libcore/result.rs index ddcd1547841..26d91777bd8 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -12,7 +12,6 @@ // NB: transitionary, de-mode-ing. -use cmp; use cmp::Eq; use either; use either::Either; diff --git a/src/libcore/run.rs b/src/libcore/run.rs index e8cd9caaef6..99a0405cbf8 100644 --- a/src/libcore/run.rs +++ b/src/libcore/run.rs @@ -11,7 +11,6 @@ //! Process spawning use cast; use io; -use io::ReaderUtil; use libc; use libc::{pid_t, c_void, c_int}; use comm::{stream, SharedChan, GenericChan, GenericPort}; diff --git a/src/libcore/stackwalk.rs b/src/libcore/stackwalk.rs index 8950a1d0c02..c2b62ad5dee 100644 --- a/src/libcore/stackwalk.rs +++ b/src/libcore/stackwalk.rs @@ -11,8 +11,6 @@ #[doc(hidden)]; // FIXME #3538 use cast::reinterpret_cast; -use ptr::offset; -use sys::size_of; pub type Word = uint; diff --git a/src/libcore/str.rs b/src/libcore/str.rs index f1e23f01e7b..dfe58365850 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -22,12 +22,9 @@ use cast; use char; use cmp::{Eq, Ord, TotalOrd, Ordering, Less, Equal, Greater}; use libc; -use libc::size_t; -use io::WriterUtil; use option::{None, Option, Some}; use ptr; use str; -use to_str::ToStr; use u8; use uint; use vec; diff --git a/src/libcore/sys.rs b/src/libcore/sys.rs index ec3ab25a27d..da2f68166ce 100644 --- a/src/libcore/sys.rs +++ b/src/libcore/sys.rs @@ -16,10 +16,8 @@ use gc; use io; use libc; use libc::{c_void, c_char, size_t}; -use ptr; use repr; use str; -use vec; pub type FreeGlue = fn(*TypeDesc, *c_void); diff --git a/src/libcore/task/local_data.rs b/src/libcore/task/local_data.rs index 185d8caae01..d9fdd51fdce 100644 --- a/src/libcore/task/local_data.rs +++ b/src/libcore/task/local_data.rs @@ -29,7 +29,6 @@ magic. use prelude::*; use task::local_data_priv::{local_get, local_pop, local_modify, local_set}; use task::rt; -use task; /** * Indexes a task-local data slot. The function's code pointer is used for diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs index 0835d4400ed..ff3c8386f0b 100644 --- a/src/libcore/task/mod.rs +++ b/src/libcore/task/mod.rs @@ -33,22 +33,14 @@ * ~~~ */ -use cast; use cell::Cell; -use cmp; use cmp::Eq; -use iter; -use libc; use option; use result::Result; use comm::{stream, Chan, GenericChan, GenericPort, Port, SharedChan}; -use pipes; use prelude::*; -use ptr; use result; -use task::local_data_priv::{local_get, local_set}; use task::rt::{task_id, sched_id, rust_task}; -use task; use util; use util::replace; diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs index 152e602eeee..74384ee3d93 100644 --- a/src/libcore/task/spawn.rs +++ b/src/libcore/task/spawn.rs @@ -77,14 +77,12 @@ use cell::Cell; use container::Map; use option; use comm::{Chan, GenericChan, GenericPort, Port, stream}; -use pipes; use prelude::*; use unstable; use ptr; use hashmap::linear::LinearSet; use task::local_data_priv::{local_get, local_set}; use task::rt::rust_task; -use task::rt::rust_closure; use task::rt; use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded}; use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask}; diff --git a/src/libcore/to_str.rs b/src/libcore/to_str.rs index 916c188a9c3..dec6cbeb201 100644 --- a/src/libcore/to_str.rs +++ b/src/libcore/to_str.rs @@ -14,9 +14,7 @@ The `ToStr` trait for converting to strings */ -use kinds::Copy; use str; -use vec; pub trait ToStr { pure fn to_str(&self) -> ~str; diff --git a/src/libcore/unstable.rs b/src/libcore/unstable.rs index 8c0c029a90f..a70a2144c73 100644 --- a/src/libcore/unstable.rs +++ b/src/libcore/unstable.rs @@ -11,16 +11,12 @@ #[doc(hidden)]; use cast; -use iter; use libc; use option; use comm::{GenericChan, GenericPort}; use prelude::*; -use ptr; -use result; use task; use task::{TaskBuilder, atomically}; -use uint; #[path = "unstable/at_exit.rs"] pub mod at_exit; diff --git a/src/libcore/unstable/at_exit.rs b/src/libcore/unstable/at_exit.rs index 4785cb622cb..cb3d6fddc22 100644 --- a/src/libcore/unstable/at_exit.rs +++ b/src/libcore/unstable/at_exit.rs @@ -10,9 +10,7 @@ use sys; use cast; -use ptr; use task; -use uint; use vec; use rand; use libc::{c_void, size_t}; diff --git a/src/libcore/unstable/extfmt.rs b/src/libcore/unstable/extfmt.rs index 616d37a133a..9b2a205b673 100644 --- a/src/libcore/unstable/extfmt.rs +++ b/src/libcore/unstable/extfmt.rs @@ -77,9 +77,7 @@ debug!("hello, %s!", "world"); */ use cmp::Eq; -use option::{Some, None}; use prelude::*; -use str; /* * We have a 'ct' (compile-time) module that parses format strings into a @@ -98,7 +96,6 @@ pub mod ct { use char; use prelude::*; use str; - use vec; #[deriving_eq] pub enum Signedness { Signed, Unsigned, } diff --git a/src/libcore/unstable/finally.rs b/src/libcore/unstable/finally.rs index c995d914a7a..dc6aae6c5cc 100644 --- a/src/libcore/unstable/finally.rs +++ b/src/libcore/unstable/finally.rs @@ -24,7 +24,6 @@ do || { */ use ops::Drop; -use task::{spawn, failing}; pub trait Finally<T> { fn finally(&self, dtor: &fn()) -> T; diff --git a/src/libcore/unstable/global.rs b/src/libcore/unstable/global.rs index aa28310f7ba..1187dafdabb 100644 --- a/src/libcore/unstable/global.rs +++ b/src/libcore/unstable/global.rs @@ -31,16 +31,14 @@ use kinds::Owned; use libc::{c_void, uintptr_t}; use option::{Option, Some, None}; use ops::Drop; -use pipes; use unstable::{Exclusive, exclusive}; -use unstable::{SharedMutableState, shared_mutable_state}; -use unstable::{get_shared_immutable_state}; use unstable::at_exit::at_exit; use unstable::intrinsics::atomic_cxchg; use hashmap::linear::LinearMap; use sys::Closure; -use task::spawn; -use uint; + +#[cfg(test)] +use private::{SharedMutableState, shared_mutable_state}; pub type GlobalDataKey<T> = &fn(v: T); diff --git a/src/libcore/unstable/lang.rs b/src/libcore/unstable/lang.rs index e74052995e6..48462eabc38 100644 --- a/src/libcore/unstable/lang.rs +++ b/src/libcore/unstable/lang.rs @@ -18,7 +18,8 @@ use sys; use unstable::exchange_alloc; use cast::transmute; -use gc::{cleanup_stack_for_failure, gc, Word}; +#[allow(non_camel_case_types)] +pub type rust_task = c_void; #[cfg(target_word_size = "32")] pub const FROZEN_BIT: uint = 0x80000000; diff --git a/src/libcore/unstable/weak_task.rs b/src/libcore/unstable/weak_task.rs index bff5e9750ec..7f420123465 100644 --- a/src/libcore/unstable/weak_task.rs +++ b/src/libcore/unstable/weak_task.rs @@ -22,7 +22,6 @@ use cell::Cell; use comm::{GenericSmartChan, stream}; use comm::{Port, Chan, SharedChan, GenericChan, GenericPort}; use hashmap::linear::LinearMap; -use ops::Drop; use option::{Some, None, swap_unwrap}; use unstable::at_exit::at_exit; use unstable::finally::Finally; diff --git a/src/libcore/util.rs b/src/libcore/util.rs index 522cb2d2783..48be6178ed2 100644 --- a/src/libcore/util.rs +++ b/src/libcore/util.rs @@ -14,7 +14,6 @@ Miscellaneous helpers for common patterns. */ -use cmp::Eq; use prelude::*; /// The identity function. @@ -102,8 +101,8 @@ pub fn unreachable() -> ! { fail!(~"internal error: entered unreachable code"); } +#[cfg(test)] mod tests { - use option::{None, Some}; use util::{NonCopyable, id, replace, swap}; #[test] diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs index 925d78a3b81..f7676bd211e 100644 --- a/src/libcore/vec.rs +++ b/src/libcore/vec.rs @@ -13,7 +13,6 @@ #[warn(non_camel_case_types)]; use container::{Container, Mutable}; -use cast::transmute; use cast; use cmp::{Eq, Ord, TotalOrd, Ordering, Less, Equal, Greater}; use iter::BaseIter; |
