auto merge of #5570 : alexcrichton/rust/fix-unused-imports, r=sanxiyn

Before it wouldn't warn about unused imports in the list if something in the list was used. These commits fix that case, add a test, and remove all unused imports in lists of imports throughout the compiler.

12 files changed, 26 insertions, 20 deletions

diff --git a/src/libstd/bigint.rs b/src/libstd/bigint.rs
index 7d20eb7b891..9671112bec0 100644
--- a/src/libstd/bigint.rs
+++ b/src/libstd/bigint.rs
@@ -866,7 +866,7 @@ mod biguint_tests {
 
     use core::*;
     use core::num::{IntConvertible, Zero, One};
-    use super::{BigInt, BigUint, BigDigit};
+    use super::{BigUint, BigDigit};
 
     #[test]
     fn test_from_slice() {
diff --git a/src/libstd/ebml.rs b/src/libstd/ebml.rs
index 331bede5b7a..98c4b3c6b16 100644
--- a/src/libstd/ebml.rs
+++ b/src/libstd/ebml.rs
@@ -54,7 +54,7 @@ pub enum EbmlEncoderTag {
 
 pub mod reader {
     use ebml::{Doc, EbmlEncoderTag, EsBool, EsEnum, EsEnumBody, EsEnumVid};
-    use ebml::{EsF32, EsF64, EsFloat, EsI16, EsI32, EsI64, EsI8, EsInt};
+    use ebml::{EsI16, EsI32, EsI64, EsI8, EsInt};
     use ebml::{EsLabel, EsOpaque, EsStr, EsU16, EsU32, EsU64, EsU8, EsUint};
     use ebml::{EsVec, EsVecElt, EsVecLen, TaggedDoc};
     use serialize;
@@ -443,10 +443,10 @@ pub mod reader {
 }
 
 pub mod writer {
-    use ebml::{Doc, EbmlEncoderTag, EsBool, EsEnum, EsEnumBody, EsEnumVid};
-    use ebml::{EsF32, EsF64, EsFloat, EsI16, EsI32, EsI64, EsI8, EsInt};
+    use ebml::{EbmlEncoderTag, EsBool, EsEnum, EsEnumBody, EsEnumVid};
+    use ebml::{EsI16, EsI32, EsI64, EsI8, EsInt};
     use ebml::{EsLabel, EsOpaque, EsStr, EsU16, EsU32, EsU64, EsU8, EsUint};
-    use ebml::{EsVec, EsVecElt, EsVecLen, TaggedDoc};
+    use ebml::{EsVec, EsVecElt, EsVecLen};
 
     use core::io;
     use core::str;
diff --git a/src/libstd/flatpipes.rs b/src/libstd/flatpipes.rs
index 1a3a28f7492..ab6844b80ff 100644
--- a/src/libstd/flatpipes.rs
+++ b/src/libstd/flatpipes.rs
@@ -334,13 +334,13 @@ pub impl<T,F:Flattener<T>,C:ByteChan> FlatChan<T, F, C> {
 
 pub mod flatteners {
     use ebml;
-    use flatpipes::{ByteChan, BytePort, Flattener, Unflattener};
+    use flatpipes::{Flattener, Unflattener};
     use io_util::BufReader;
     use json;
     use serialize::{Encoder, Decoder, Encodable, Decodable};
 
     use core::cast;
-    use core::io::{Writer, Reader, BytesWriter, ReaderUtil};
+    use core::io::{Writer, Reader, ReaderUtil};
     use core::prelude::*;
     use core::ptr;
     use core::sys::size_of;
@@ -637,7 +637,7 @@ mod test {
     use net::tcp::TcpSocketBuf;
 
     use core::int;
-    use core::io::{BytesReader, BytesWriter};
+    use core::io::BytesWriter;
     use core::prelude::*;
     use core::result;
     use core::task;
diff --git a/src/libstd/future.rs b/src/libstd/future.rs
index 29771fa3501..8504b3e8ae5 100644
--- a/src/libstd/future.rs
+++ b/src/libstd/future.rs
@@ -23,7 +23,7 @@
 
 use core::cast;
 use core::cell::Cell;
-use core::comm::{oneshot, ChanOne, PortOne, send_one, recv_one};
+use core::comm::{oneshot, PortOne, send_one};
 use core::pipes::recv;
 use core::prelude::*;
 use core::task;
diff --git a/src/libstd/getopts.rs b/src/libstd/getopts.rs
index ae783fb9b69..4525dc0ae61 100644
--- a/src/libstd/getopts.rs
+++ b/src/libstd/getopts.rs
@@ -461,7 +461,7 @@ pub enum FailType {
  */
 pub mod groups {
     use getopts::{HasArg, Long, Maybe, Multi, No, Occur, Opt, Optional, Req};
-    use getopts::{Result, Short, Yes};
+    use getopts::{Short, Yes};
 
     use core::prelude::*;
     use core::str;
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index 4d82d35cc32..4fd06f43164 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -149,7 +149,7 @@ pub fn get_addr(node: &str, iotask: &iotask)
 }
 
 pub mod v4 {
-    use net::ip::{IpAddr, Ipv4, Ipv6, ParseAddrErr};
+    use net::ip::{IpAddr, Ipv4, ParseAddrErr};
     use uv::ll;
     use uv_ip4_addr = uv::ll::ip4_addr;
     use uv_ip4_name = uv::ll::ip4_name;
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index a47a53caab9..998b8640b68 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -24,7 +24,7 @@ use core::io::{Reader, ReaderUtil, Writer};
 use core::io;
 use core::libc::size_t;
 use core::libc;
-use core::comm::{stream, Chan, Port, SharedChan};
+use core::comm::{stream, Port, SharedChan};
 use core::prelude::*;
 use core::ptr;
 use core::result::{Result};
@@ -1449,7 +1449,7 @@ pub mod test {
     use uv;
 
     use core::io;
-    use core::comm::{stream, Chan, Port, SharedChan};
+    use core::comm::{stream, SharedChan};
     use core::prelude::*;
     use core::result;
     use core::str;
diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs
index 1588d688148..761a17352a9 100644
--- a/src/libstd/sort.rs
+++ b/src/libstd/sort.rs
@@ -13,7 +13,7 @@
 use core::cmp::{Eq, Ord};
 use core::prelude::*;
 use core::util;
-use core::vec::{len, push};
+use core::vec::len;
 use core::vec;
 
 type Le<'self, T> = &'self fn(v1: &T, v2: &T) -> bool;
diff --git a/src/libstd/task_pool.rs b/src/libstd/task_pool.rs
index 16645f151ee..dbfe3d6a8b5 100644
--- a/src/libstd/task_pool.rs
+++ b/src/libstd/task_pool.rs
@@ -11,12 +11,14 @@
 /// A task pool abstraction. Useful for achieving predictable CPU
 /// parallelism.
 
-use core::comm::{Chan, Port};
+use core::comm::Chan;
 use core::prelude::*;
-use core::task::{SchedMode, SingleThreaded};
+use core::task::SchedMode;
 use core::task;
 use core::vec;
 
+#[cfg(test)] use core::task::SingleThreaded;
+
 enum Msg<T> {
     Execute(~fn(&T)),
     Quit
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index 93170668c13..853a17abb55 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -26,7 +26,7 @@ use core::either::Either;
 use core::either;
 use core::io::WriterUtil;
 use core::io;
-use core::comm::{stream, Chan, Port, SharedChan};
+use core::comm::{stream, SharedChan};
 use core::option;
 use core::prelude::*;
 use core::result;
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index 1f3dc2f01de..3130abdc7cd 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -14,9 +14,9 @@ use iotask = uv_iotask;
 use uv_iotask::{IoTask, spawn_iotask};
 
 use core::clone::Clone;
-use core::comm::{Port, Chan, SharedChan, select2i};
+use core::comm::Chan;
 use core::option::{Some, None};
-use core::task::{task, SingleThreaded, spawn};
+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;
diff --git a/src/libstd/uv_ll.rs b/src/libstd/uv_ll.rs
index 57d769d707e..f6cc35e0c9e 100644
--- a/src/libstd/uv_ll.rs
+++ b/src/libstd/uv_ll.rs
@@ -375,11 +375,15 @@ pub mod uv_ll_struct_stubgen {
     #[cfg(target_os = "freebsd")]
     use super::{
         uv_async_t_32bit_unix_riders,
-        uv_tcp_t_32bit_unix_riders,
         uv_timer_t_32bit_unix_riders,
         uv_write_t_32bit_unix_riders,
     };
 
+    #[cfg(target_os = "linux")]
+    #[cfg(target_os = "android")]
+    #[cfg(target_os = "freebsd")]
+    use super::uv_tcp_t_32bit_unix_riders;
+
     pub fn gen_stub_uv_tcp_t() -> uv_tcp_t {
         return gen_stub_os();
         #[cfg(target_os = "linux")]