only use #[no_core] in libcore

39 files changed, 0 insertions, 142 deletions

diff --git a/src/libstd/arc.rs b/src/libstd/arc.rs
index 33aa6171de4..f45fb4e7658 100644
--- a/src/libstd/arc.rs
+++ b/src/libstd/arc.rs
@@ -17,7 +17,6 @@ use sync;
 use sync::{Mutex, mutex_with_condvars, RWlock, rwlock_with_condvars};
 
 use core::cast;
-use core::prelude::*;
 use core::unstable::{SharedMutableState, shared_mutable_state};
 use core::unstable::{clone_shared_mutable_state};
 use core::unstable::{get_shared_mutable_state, get_shared_immutable_state};
@@ -478,7 +477,6 @@ pub impl<'self, T:Const + Owned> RWReadMode<'self, T> {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use arc::*;
     use arc;
diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs
index 6b536ff6b46..8e2c7345045 100644
--- a/src/libstd/arena.rs
+++ b/src/libstd/arena.rs
@@ -39,7 +39,6 @@ use core::at_vec;
 use core::cast::transmute;
 use core::cast;
 use core::libc::size_t;
-use core::prelude::*;
 use core::ptr;
 use core::sys::TypeDesc;
 use core::sys;
diff --git a/src/libstd/bitv.rs b/src/libstd/bitv.rs
index 8bfa2013950..5314c35419c 100644
--- a/src/libstd/bitv.rs
+++ b/src/libstd/bitv.rs
@@ -8,12 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::container::{Container, Mutable, Set};
-use core::ops;
-use core::prelude::*;
-use core::uint;
 use core::vec::from_elem;
-use core::vec;
 
 struct SmallBitv {
     /// only the lowest nbits of this value are used. the rest is undefined.
@@ -867,7 +862,6 @@ priv impl BitvSet {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
     use std::test::BenchHarness;
 
     use bitv::*;
diff --git a/src/libstd/c_vec.rs b/src/libstd/c_vec.rs
index dd85e886b1e..b4b4e2bf1a2 100644
--- a/src/libstd/c_vec.rs
+++ b/src/libstd/c_vec.rs
@@ -36,10 +36,6 @@
  * still held if needed.
  */
 
-use core::option;
-use core::prelude::*;
-use core::ptr;
-
 /**
  * The type representing a foreign chunk of memory
  *
@@ -146,7 +142,6 @@ pub fn ptr<T>(t: CVec<T>) -> *mut T { t.base }
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use c_vec::*;
 
diff --git a/src/libstd/comm.rs b/src/libstd/comm.rs
index 0e0347406ae..d866ee6cedb 100644
--- a/src/libstd/comm.rs
+++ b/src/libstd/comm.rs
@@ -17,7 +17,6 @@ Higher level communication abstractions.
 use core::comm::{GenericChan, GenericSmartChan, GenericPort};
 use core::comm::{Chan, Port, Selectable, Peekable};
 use core::pipes;
-use core::prelude::*;
 
 /// An extension of `pipes::stream` that allows both sending and receiving.
 pub struct DuplexStream<T, U> {
diff --git a/src/libstd/deque.rs b/src/libstd/deque.rs
index b120e40ec25..5d52bb7c081 100644
--- a/src/libstd/deque.rs
+++ b/src/libstd/deque.rs
@@ -10,10 +10,6 @@
 
 //! A double-ended queue implemented as a circular buffer
 
-use core::container::{Container, Mutable};
-use core::prelude::*;
-use core::vec;
-
 static initial_capacity: uint = 32u; // 2^5
 
 pub struct Deque<T> {
diff --git a/src/libstd/dlist.rs b/src/libstd/dlist.rs
index e736273a5ee..5fdc467cfa2 100644
--- a/src/libstd/dlist.rs
+++ b/src/libstd/dlist.rs
@@ -18,7 +18,6 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
 
 */
 
-use core::prelude::*;
 use core::managed;
 
 pub type DListLink<T> = Option<@mut DListNode<T>>;
@@ -534,7 +533,6 @@ impl<T> BaseIter<T> for @mut DList<T> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use core::prelude::*;
 
     #[test]
     fn test_dlist_concat() {
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 7b479bc7578..2598e96a141 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 // Simple Extensible Binary Markup Language (ebml) reader and writer on a
 // cursor model. See the specification here:
 //     http://www.matroska.org/technical/specs/rfc/index.html
@@ -62,7 +60,6 @@ pub mod reader {
     use core::cast::transmute;
     use core::int;
     use core::io;
-    use core::prelude::*;
     use core::ptr::offset;
     use core::str;
     use core::unstable::intrinsics::bswap32;
diff --git a/src/libstd/fileinput.rs b/src/libstd/fileinput.rs
index 4ac3e0b1747..a24b11d71c6 100644
--- a/src/libstd/fileinput.rs
+++ b/src/libstd/fileinput.rs
@@ -96,7 +96,6 @@ total line count).
 
 #[allow(deprecated_mutable_fields)];
 
-use core::prelude::*;
 use core::io::ReaderUtil;
 
 /**
@@ -410,7 +409,6 @@ pub fn input_vec_state(files: ~[Option<Path>],
 #[cfg(test)]
 mod test {
     use core::io::WriterUtil;
-    use core::prelude::*;
     use super::{FileInput, pathify, input_vec, input_vec_state};
 
     fn make_file(path : &Path, contents: &[~str]) {
diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs
index 56c67156d3d..bd0acb849fc 100644
--- a/src/libstd/flatpipes.rs
+++ b/src/libstd/flatpipes.rs
@@ -51,7 +51,6 @@ block the scheduler thread, so will their pipes.
 use core::io;
 use core::comm::GenericChan;
 use core::comm::GenericPort;
-use core::prelude::*;
 use core::sys::size_of;
 use core::vec;
 
@@ -177,7 +176,6 @@ pub mod pod {
     use core::io::{Reader, Writer};
     use core::comm::{Port, Chan};
     use core::comm;
-    use core::prelude::*;
 
     pub type ReaderPort<T, R> =
         FlatPort<T, PodUnflattener<T>, ReaderBytePort<R>>;
@@ -341,7 +339,6 @@ pub mod flatteners {
 
     use core::cast;
     use core::io::{Writer, Reader, ReaderUtil};
-    use core::prelude::*;
     use core::ptr;
     use core::sys::size_of;
     use core::vec;
@@ -504,7 +501,6 @@ pub mod bytepipes {
 
     use core::io::{Writer, Reader, ReaderUtil};
     use core::comm::{Port, Chan};
-    use core::prelude::*;
 
     pub struct ReaderBytePort<R> {
         reader: R
@@ -626,8 +622,6 @@ pub mod bytepipes {
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
-
     use flatpipes::{Flattener, Unflattener};
     use flatpipes::bytepipes::*;
     use flatpipes::pod;
@@ -636,11 +630,7 @@ mod test {
     use flatpipes::{BytePort, FlatChan, FlatPort};
     use net::tcp::TcpSocketBuf;
 
-    use core::int;
     use core::io::BytesWriter;
-    use core::prelude::*;
-    use core::result;
-    use core::task;
 
     #[test]
     fn test_serializing_memory_stream() {
@@ -805,7 +795,6 @@ mod test {
         // Client task
         let addr = copy addr0;
         do task::spawn || {
-
             // Wait for the server to start listening
             begin_connect_port.recv();
 
@@ -858,17 +847,11 @@ mod test {
     // Tests that the different backends behave the same when the
     // binary streaming protocol is broken
     mod broken_protocol {
-        use core::prelude::*;
-
         use flatpipes::{BytePort, FlatPort};
         use flatpipes::flatteners::PodUnflattener;
         use flatpipes::pod;
         use io_util::BufReader;
 
-        use core::io;
-        use core::sys;
-        use core::task;
-
         type PortLoader<P> =
             ~fn(~[u8]) -> FlatPort<int, PodUnflattener<int>, P>;
 
diff --git a/src/libstd/fun_treemap.rs b/src/libstd/fun_treemap.rs
index 735f86b34ec..3bffeddbe09 100644
--- a/src/libstd/fun_treemap.rs
+++ b/src/libstd/fun_treemap.rs
@@ -21,7 +21,6 @@
 
 use core::cmp::{Eq, Ord};
 use core::option::{Some, None};
-use core::prelude::*;
 
 pub type Treemap<K, V> = @TreeNode<K, V>;
 
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index a36f67fc95a..264f3072cb1 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -25,7 +25,6 @@ use core::cast;
 use core::cell::Cell;
 use core::comm::{oneshot, PortOne, send_one};
 use core::pipes::recv;
-use core::prelude::*;
 use core::task;
 
 #[doc = "The future type"]
@@ -173,7 +172,6 @@ pub fn spawn<A:Owned>(blk: ~fn() -> A) -> Future<A> {
 #[allow(non_implicitly_copyable_typarams)]
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
 
     use future::*;
 
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index d710a7b8735..fda5c105da5 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -79,7 +79,6 @@
  */
 
 use core::cmp::Eq;
-use core::prelude::*;
 use core::result::{Err, Ok};
 use core::result;
 use core::option::{Some, None};
@@ -461,7 +460,6 @@ pub mod groups {
     use getopts::{HasArg, Long, Maybe, Multi, No, Occur, Opt, Optional, Req};
     use getopts::{Short, Yes};
 
-    use core::prelude::*;
     use core::str;
     use core::vec;
 
@@ -654,7 +652,6 @@ pub mod groups {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use getopts::groups::OptGroup;
     use getopts::*;
diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index f5cd8b4bd68..7353bec7333 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -14,7 +14,6 @@
 
 //! json serialization
 
-use core::prelude::*;
 use core::io::{WriterUtil, ReaderUtil};
 use core::hashmap::HashMap;
 
@@ -1266,7 +1265,6 @@ impl to_str::ToStr for Error {
 mod tests {
     use super::*;
 
-    use core::prelude::*;
     use core::hashmap::HashMap;
 
     use std::serialize::Decodable;
diff --git a/src/libstd/list.rs b/src/libstd/list.rs
index 8e173ff8a9c..401cc121a62 100644
--- a/src/libstd/list.rs
+++ b/src/libstd/list.rs
@@ -10,11 +10,6 @@
 
 //! A standard linked list
 
-use core::cmp::Eq;
-use core::option::*;
-use core::prelude::*;
-use core::vec;
-
 #[deriving(Eq)]
 pub enum List<T> {
     Cons(T, @List<T>),
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index e58b17b8321..aa1903e4a21 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -11,7 +11,6 @@
 //! Types/fns concerning Internet Protocol (IP), versions 4 & 6
 
 use core::libc;
-use core::prelude::*;
 use core::comm::{stream, SharedChan};
 use core::ptr;
 use core::result;
@@ -152,7 +151,6 @@ pub mod v4 {
     use uv_ip4_addr = uv::ll::ip4_addr;
     use uv_ip4_name = uv::ll::ip4_name;
 
-    use core::prelude::*;
     use core::ptr;
     use core::result;
     use core::str;
@@ -252,7 +250,6 @@ pub mod v6 {
     use uv_ip6_addr = uv::ll::ip6_addr;
     use uv_ip6_name = uv::ll::ip6_name;
 
-    use core::prelude::*;
     use core::result;
     use core::str;
 
@@ -364,7 +361,6 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int,
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
 
     use net_ip::*;
     use net_ip::v4;
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index ef4932d667a..ee109047cb1 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -24,7 +24,6 @@ use core::io;
 use core::libc::size_t;
 use core::libc;
 use core::comm::{stream, Port, SharedChan};
-use core::prelude::*;
 use core::ptr;
 use core::result::{Result};
 use core::result;
@@ -1449,7 +1448,6 @@ mod test {
 
     use core::io;
     use core::comm::{stream, SharedChan};
-    use core::prelude::*;
     use core::result;
     use core::str;
     use core::task;
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index 4cb9a98036b..f3b11c13279 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -16,7 +16,6 @@ use core::cmp::Eq;
 use core::from_str::FromStr;
 use core::io::{Reader, ReaderUtil};
 use core::io;
-use core::prelude::*;
 use core::hashmap::HashMap;
 use core::str;
 use core::to_bytes::IterBytes;
@@ -803,7 +802,6 @@ fn test_get_path() {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use net_url::*;
 
diff --git a/src/libstd/num/complex.rs b/src/libstd/num/complex.rs
index fc17cbc678e..02393b15cca 100644
--- a/src/libstd/num/complex.rs
+++ b/src/libstd/num/complex.rs
@@ -12,7 +12,6 @@
 //! Complex numbers.
 
 use core::num::{Zero,One,ToStrRadix};
-use core::prelude::*;
 
 // FIXME #1284: handle complex NaN & infinity etc. This
 // probably doesn't map to C's _Complex correctly.
@@ -162,7 +161,6 @@ impl<T: ToStrRadix + Num + Ord> ToStrRadix for Cmplx<T> {
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
     use super::*;
     use core::num::{Zero,One};
 
diff --git a/src/libstd/num/rational.rs b/src/libstd/num/rational.rs
index 93b63593a5e..34308988fa5 100644
--- a/src/libstd/num/rational.rs
+++ b/src/libstd/num/rational.rs
@@ -13,9 +13,6 @@
 
 use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
 use core::from_str::FromStr;
-use core::to_str::ToStr;
-use core::prelude::*;
-use core::cmp::TotalEq;
 use super::bigint::BigInt;
 
 /// Represents the ratio between 2 numbers.
@@ -299,7 +296,6 @@ impl<T: FromStrRadix + Copy + Num + Ord>
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
     use super::*;
     use core::num::{Zero,One,FromStrRadix};
     use core::from_str::FromStr;
diff --git a/src/libstd/par.rs b/src/libstd/par.rs
index 3992cc41961..cfedbb66caa 100644
--- a/src/libstd/par.rs
+++ b/src/libstd/par.rs
@@ -8,16 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cast;
-use core::prelude::*;
-use core::ptr;
-use core::sys;
-use core::uint;
-use core::vec;
-
 use future_spawn = future::spawn;
 
-
 /**
  * The maximum number of tasks this module will spawn for a single
  * operation.
diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs
index c8d250f90f6..08a58125d7e 100644
--- a/src/libstd/priority_queue.rs
+++ b/src/libstd/priority_queue.rs
@@ -10,12 +10,8 @@
 
 //! A priority queue implemented with a binary heap
 
-use core::container::{Container, Mutable};
-use core::cmp::Ord;
 use core::iter::BaseIter;
-use core::prelude::*;
 use core::ptr::addr_of;
-use core::vec;
 
 #[abi = "rust-intrinsic"]
 extern "rust-intrinsic" mod rusti {
diff --git a/src/libstd/rl.rs b/src/libstd/rl.rs
index 9f9f2323d27..b2407be0b99 100644
--- a/src/libstd/rl.rs
+++ b/src/libstd/rl.rs
@@ -12,9 +12,6 @@
 // state without mutexes.
 
 use core::libc::{c_char, c_int};
-use core::prelude::*;
-use core::str;
-use core::task;
 
 pub mod rustrt {
     use core::libc::{c_char, c_int};
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index a5793462327..1292d2a8585 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -33,8 +33,6 @@
  * * access to a character by index is logarithmic (linear in strings);
  */
 
-use core::prelude::*;
-
 /// The type of ropes.
 pub type Rope = node::Root;
 
@@ -443,7 +441,6 @@ pub mod iterator {
     pub mod leaf {
         use rope::{Rope, node};
 
-        use core::prelude::*;
 
         pub fn start(rope: Rope) -> node::leaf_iterator::T {
             match (rope) {
@@ -458,7 +455,6 @@ pub mod iterator {
     pub mod char {
         use rope::{Rope, node};
 
-        use core::prelude::*;
 
         pub fn start(rope: Rope) -> node::char_iterator::T {
             match (rope) {
@@ -554,8 +550,6 @@ pub fn char_at(rope: Rope, pos: uint) -> char {
 pub mod node {
     use rope::node;
 
-    use core::prelude::*;
-
     /// Implementation of type `rope`
     pub enum Root {
         /// An empty rope
@@ -1135,8 +1129,6 @@ pub mod node {
     pub mod leaf_iterator {
         use rope::node::{Concat, Leaf, Node, height};
 
-        use core::prelude::*;
-
         pub struct T {
             stack: ~[@Node],
             stackpos: int,
@@ -1177,8 +1169,6 @@ pub mod node {
         use rope::node::{Leaf, Node};
         use rope::node::leaf_iterator;
 
-        use core::prelude::*;
-
         pub struct T {
             leaf_iterator: leaf_iterator::T,
             leaf:  Option<Leaf>,
diff --git a/src/libstd/serialize.rs b/src/libstd/serialize.rs
index e4e53b9b614..1ad581ba993 100644
--- a/src/libstd/serialize.rs
+++ b/src/libstd/serialize.rs
@@ -16,7 +16,6 @@ Core encoding and decoding interfaces.
 
 #[forbid(non_camel_case_types)];
 
-use core::prelude::*;
 use core::hashmap::{HashMap, HashSet};
 use core::trie::{TrieMap, TrieSet};
 use deque::Deque;
diff --git a/src/libstd/smallintmap.rs b/src/libstd/smallintmap.rs
index d50804ba47b..487a5598d6f 100644
--- a/src/libstd/smallintmap.rs
+++ b/src/libstd/smallintmap.rs
@@ -16,7 +16,6 @@
 use core::container::{Container, Mutable, Map, Set};
 use core::iter::{BaseIter};
 use core::option::{Some, None};
-use core::prelude::*;
 
 pub struct SmallIntMap<T> {
     priv v: ~[Option<T>],
@@ -243,7 +242,6 @@ pub impl<V:Copy> SmallIntMap<V> {
 #[cfg(test)]
 mod tests {
     use super::SmallIntMap;
-    use core::prelude::*;
 
     #[test]
     fn test_find_mut() {
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index cc002bc8305..3e6011e80df 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -11,7 +11,6 @@
 //! Sorting methods
 
 use core::cmp::{Eq, Ord};
-use core::prelude::*;
 use core::util;
 use core::vec::len;
 use core::vec;
@@ -836,7 +835,6 @@ mod test_qsort {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use sort::*;
 
@@ -905,7 +903,6 @@ mod tests {
 
 #[cfg(test)]
 mod test_tim_sort {
-    use core::prelude::*;
     use sort::tim_sort;
     use core::rand::RngUtil;
 
@@ -995,7 +992,6 @@ mod test_tim_sort {
 
 #[cfg(test)]
 mod big_tests {
-    use core::prelude::*;
     use sort::*;
     use core::rand::RngUtil;
 
diff --git a/src/libstd/std.rc b/src/libstd/std.rc
index 07c679409cf..0a5348d7976 100644
--- a/src/libstd/std.rc
+++ b/src/libstd/std.rc
@@ -30,11 +30,6 @@ not required in or otherwise suitable for the core library.
 #[deny(non_camel_case_types)];
 #[allow(deprecated_mutable_fields)];
 
-#[no_core];
-
-extern mod core(vers = "0.7-pre");
-use core::prelude::*;
-
 pub mod uv_ll;
 
 // General io and system-services modules
diff --git a/src/libstd/sync.rs b/src/libstd/sync.rs
index 2497064ae04..58e5352890f 100644
--- a/src/libstd/sync.rs
+++ b/src/libstd/sync.rs
@@ -15,7 +15,6 @@
  * in std.
  */
 
-use core::prelude::*;
 use core::unstable::{Exclusive, exclusive};
 use core::ptr;
 use core::task;
@@ -713,7 +712,6 @@ pub impl<'self> RWlockReadMode<'self> {
 
 #[cfg(test)]
 mod tests {
-    use core::prelude::*;
 
     use sync::*;
 
diff --git a/src/libstd/task_pool.rs b/src/libstd/task_pool.rs
index 3f2772942a5..82053602755 100644
--- a/src/libstd/task_pool.rs
+++ b/src/libstd/task_pool.rs
@@ -12,7 +12,6 @@
 /// parallelism.
 
 use core::comm::Chan;
-use core::prelude::*;
 use core::task::SchedMode;
 use core::task;
 use core::vec;
diff --git a/src/libstd/tempfile.rs b/src/libstd/tempfile.rs
index c9bcb3b8952..846a9aec153 100644
--- a/src/libstd/tempfile.rs
+++ b/src/libstd/tempfile.rs
@@ -10,7 +10,6 @@
 
 //! Temporary files and directories
 
-use core::prelude::*;
 use core::rand::RngUtil;
 
 pub fn mkdtemp(tmpdir: &Path, suffix: &str) -> Option<Path> {
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index f82cc25e0f6..278a326d1de 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -21,7 +21,6 @@ use term;
 
 use core::to_str::ToStr;
 use core::comm::{stream, SharedChan};
-use core::prelude::*;
 
 pub mod rustrt {
     use core::libc::size_t;
@@ -597,7 +596,6 @@ pub mod bench {
     use time::precise_time_ns;
     use test::{BenchHarness, BenchSamples};
     use stats::Stats;
-    use core::prelude::*;
     use core::rand::RngUtil;
 
     pub impl BenchHarness {
diff --git a/src/libstd/time.rs b/src/libstd/time.rs
index a763aa1592e..8889abe6472 100644
--- a/src/libstd/time.rs
+++ b/src/libstd/time.rs
@@ -8,15 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::cmp::{Eq, Ord};
-use core::int;
-use core::i32;
-use core::io::{Reader, ReaderUtil};
-use core::io;
-use core::prelude::*;
-use core::result::{Result, Ok, Err};
-use core::str;
-
 static NSEC_PER_SEC: i32 = 1_000_000_000_i32;
 
 pub mod rustrt {
diff --git a/src/libstd/timer.rs b/src/libstd/timer.rs
index 1e48ce5aa6f..a36a6da4653 100644
--- a/src/libstd/timer.rs
+++ b/src/libstd/timer.rs
@@ -14,13 +14,10 @@ use uv;
 use uv::iotask;
 use uv::iotask::IoTask;
 
-use core::either;
 use core::libc;
 use core::libc::c_void;
 use core::cast::transmute;
 use core::comm::{stream, Chan, SharedChan, Port, select2i};
-use core::prelude::*;
-use core::ptr;
 
 /**
  * Wait for timeout period then send provided value over a channel
@@ -171,7 +168,6 @@ extern fn delayed_send_close_cb(handle: *uv::ll::uv_timer_t) {
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
 
     use timer::*;
     use uv;
diff --git a/src/libstd/treemap.rs b/src/libstd/treemap.rs
index 020f4daefd9..51695f2fa7d 100644
--- a/src/libstd/treemap.rs
+++ b/src/libstd/treemap.rs
@@ -12,7 +12,6 @@
 //! trees. The only requirement for the types is that the key implements
 //! `TotalOrd`.
 
-use core::prelude::*;
 use core::iterator::*;
 
 // This is implemented as an AA tree, which is a simplified variation of
@@ -694,7 +693,6 @@ fn remove<K: TotalOrd, V>(node: &mut Option<~TreeNode<K, V>>,
 
 #[cfg(test)]
 mod test_treemap {
-    use core::prelude::*;
     use core::iterator::*;
     use super::*;
     use core::rand::RngUtil;
@@ -1013,7 +1011,6 @@ mod test_treemap {
 
 #[cfg(test)]
 mod test_set {
-    use core::prelude::*;
     use core::iterator::*;
     use super::*;
 
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index ac762d7d801..a9016697031 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -13,11 +13,9 @@
 use iotask = uv_iotask;
 use uv_iotask::{IoTask, spawn_iotask};
 
-use core::clone::Clone;
 use core::comm::Chan;
 use core::option::{Some, None};
 use core::task::task;
-use core::task;
 use core::unstable::global::{global_data_clone_create, global_data_clone};
 use core::unstable::weak_task::weaken_task;
 
@@ -115,7 +113,6 @@ fn spawn_loop() -> IoTask {
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
 
     use get_gl = uv_global_loop::get;
     use uv::iotask;
diff --git a/src/libstd/uv_iotask.rs b/src/libstd/uv_iotask.rs
index 7e1c9d858ce..f03c60757f3 100644
--- a/src/libstd/uv_iotask.rs
+++ b/src/libstd/uv_iotask.rs
@@ -20,9 +20,7 @@ use ll = uv_ll;
 use core::libc::c_void;
 use core::libc;
 use core::comm::{stream, Port, Chan, SharedChan};
-use core::prelude::*;
 use core::ptr::addr_of;
-use core::task;
 
 /// Used to abstract-away direct interaction with a libuv loop.
 pub struct IoTask {
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index a5c53100400..fb40596b888 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -34,7 +34,6 @@
 
 use core::libc::size_t;
 use core::libc::c_void;
-use core::prelude::*;
 use core::ptr::to_unsafe_ptr;
 
 pub type uv_handle_t = c_void;
@@ -1225,7 +1224,6 @@ pub unsafe fn addrinfo_as_sockaddr_in6(input: *addrinfo) -> *sockaddr_in6 {
 
 #[cfg(test)]
 mod test {
-    use core::prelude::*;
     use core::comm::{SharedChan, stream, GenericChan, GenericPort};
     use super::*;
 
diff --git a/src/libstd/workcache.rs b/src/libstd/workcache.rs
index d1aa069559e..ae09b9b9026 100644
--- a/src/libstd/workcache.rs
+++ b/src/libstd/workcache.rs
@@ -16,16 +16,10 @@ use serialize::{Encoder, Encodable, Decoder, Decodable};
 use sort;
 
 use core::cell::Cell;
-use core::cmp;
-use core::either::{Either, Left, Right};
-use core::io;
 use core::comm::{oneshot, PortOne, send_one};
 use core::pipes::recv;
-use core::prelude::*;
-use core::result;
 use core::run;
 use core::hashmap::HashMap;
-use core::task;
 use core::to_bytes;
 
 /**