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.

doc/tutorial-tasks.md

@@ -188,7 +188,7 @@ spawns the child task.
 
 ~~~~
 # use core::task::spawn;
-# use core::comm::{stream, Port, Chan};
+# use core::comm::stream;
 # fn some_expensive_computation() -> int { 42 }
 # let (port, chan) = stream();
 do spawn || {
@@ -208,7 +208,7 @@ computation, then waits for the child's result to arrive on the
 port:
 
 ~~~~
-# use core::comm::{stream, Port, Chan};
+# use core::comm::{stream};
 # fn some_other_expensive_computation() {}
 # let (port, chan) = stream::<int>();
 # chan.send(0);
@@ -277,7 +277,7 @@ might look like the example below.
 
 ~~~
 # use core::task::spawn;
-# use core::comm::{stream, Port, Chan};
+# use core::comm::stream;
 
 // Create a vector of ports, one for each child task
 let ports = do vec::from_fn(3) |init_val| {

src/compiletest/procsrv.rs

@@ -12,7 +12,7 @@ use core::prelude::*;
 
 use core::io::{ReaderUtil, WriterUtil};
 use core::io;
-use core::libc::{c_int, pid_t};
+use core::libc::c_int;
 use core::os;
 use core::run::spawn_process;
 use core::run;

src/libcore/cleanup.rs

@@ -11,11 +11,13 @@
 #[doc(hidden)];
 
 use libc::{c_char, c_void, intptr_t, uintptr_t};
-use ptr::{mut_null, null, to_unsafe_ptr};
+use ptr::mut_null;
 use repr::BoxRepr;
 use sys::TypeDesc;
 use cast::transmute;
 
+#[cfg(notest)] use ptr::to_unsafe_ptr;
+
 /**
  * Runtime structures
  *

src/libcore/comm.rs

@@ -429,7 +429,7 @@ pub fn try_send_one<T: Owned>(chan: ChanOne<T>, data: T)
 
 #[cfg(test)]
 pub mod test {
-    use either::{Either, Left, Right};
+    use either::Right;
     use super::{Chan, Port, oneshot, recv_one, stream};
 
     #[test]

src/libcore/gc.rs

@@ -38,7 +38,7 @@ with destructors.
 */
 
 use cast;
-use container::{Container, Mutable, Map, Set};
+use container::{Map, Set};
 use io;
 use libc::{size_t, uintptr_t};
 use option::{None, Option, Some};

src/libcore/hash.rs

@@ -20,7 +20,7 @@
  */
 
 use io;
-use io::{Writer, WriterUtil};
+use io::Writer;
 use to_bytes::IterBytes;
 use uint;
 use vec;

src/libcore/hashmap.rs

@@ -667,7 +667,7 @@ pub mod linear {
 
     #[test]
     mod test_map {
-        use container::{Container, Mutable, Map, Set};
+        use container::{Container, Map, Set};
         use option::{None, Some};
         use hashmap::linear::LinearMap;
         use hashmap::linear;
@@ -845,7 +845,7 @@ pub mod linear {
 #[test]
     mod test_set {
         use hashmap::linear;
-        use container::{Container, Mutable, Map, Set};
+        use container::{Container, Map, Set};
         use vec;
 
         #[test]

src/libcore/io.rs

@@ -18,7 +18,7 @@ use result::Result;
 
 use int;
 use libc;
-use libc::{c_int, c_long, c_uint, c_void, size_t, ssize_t};
+use libc::{c_int, c_long, c_void, size_t, ssize_t};
 use libc::consts::os::posix88::*;
 use os;
 use cast;

src/libcore/num/float.rs

@@ -24,12 +24,13 @@ use f64;
 use num::NumCast;
 use num::strconv;
 use num;
-use option::{None, Option, Some};
+use option::Option;
 use to_str;
 use from_str;
 
 #[cfg(notest)] use cmp::{Eq, Ord};
 #[cfg(notest)] use ops;
+#[cfg(test)] use option::{Some, None};
 
 pub use f64::{add, sub, mul, div, rem, lt, le, eq, ne, ge, gt};
 pub use f64::logarithm;

src/libcore/num/num.rs

@@ -9,9 +9,9 @@
 // except according to those terms.
 
 //! An interface for numeric types
-use cmp::{Ord, Eq};
-use ops::{Add, Div, Modulo, Mul, Neg, Sub};
-use option::{None, Option, Some};
+use cmp::Ord;
+use ops::{Div, Mul, Neg};
+use option::Option;
 use kinds::Copy;
 
 pub mod strconv;

src/libcore/num/uint-template.rs

@@ -16,7 +16,7 @@ use from_str::FromStr;
 use num::{ToStrRadix, FromStrRadix};
 use num::strconv;
 use num;
-use option::{None, Option, Some};
+use option::Option;
 use prelude::*;
 
 #[cfg(notest)] use cmp::{Eq, Ord};

src/libcore/os.rs

@@ -29,7 +29,7 @@
 use cast;
 use io;
 use libc;
-use libc::{c_char, c_void, c_int, c_uint, size_t, ssize_t};
+use libc::{c_char, c_void, c_int, size_t};
 use libc::{mode_t, pid_t, FILE};
 use option;
 use option::{Some, None};
@@ -397,7 +397,7 @@ pub fn pipe() -> Pipe {
         // first, as in rust_run_program.
         let mut fds = Pipe {in: 0 as c_int,
                     out: 0 as c_int };
-        let res = libc::pipe(&mut fds.in, 1024 as c_uint,
+        let res = libc::pipe(&mut fds.in, 1024 as ::libc::c_uint,
                              (libc::O_BINARY | libc::O_NOINHERIT) as c_int);
         fail_unless!((res == 0 as c_int));
         fail_unless!((fds.in != -1 as c_int && fds.in != 0 as c_int));
@@ -431,7 +431,7 @@ pub fn self_exe_path() -> Option<Path> {
                            KERN_PROC as c_int,
                            KERN_PROC_PATHNAME as c_int, -1 as c_int];
                 let mut sz = sz;
-                sysctl(vec::raw::to_ptr(mib), vec::len(mib) as c_uint,
+                sysctl(vec::raw::to_ptr(mib), vec::len(mib) as ::libc::c_uint,
                        buf as *mut c_void, &mut sz, ptr::null(),
                        0u as size_t) == (0 as c_int)
             }
@@ -670,7 +670,7 @@ pub fn list_dir(p: &Path) -> ~[~str] {
         #[cfg(target_os = "freebsd")]
         #[cfg(target_os = "macos")]
         unsafe fn get_list(p: &Path) -> ~[~str] {
-            use libc::{DIR, dirent_t};
+            use libc::{dirent_t};
             use libc::{opendir, readdir, closedir};
             extern mod rustrt {
                 unsafe fn rust_list_dir_val(ptr: *dirent_t)
@@ -1257,7 +1257,7 @@ pub mod consts {
 mod tests {
     use libc::{c_int, c_void, size_t};
     use libc;
-    use option::{None, Option, Some};
+    use option::Some;
     use option;
     use os::{as_c_charp, env, getcwd, getenv, make_absolute, real_args};
     use os::{remove_file, setenv};

src/libcore/pipes.rs

@@ -958,9 +958,9 @@ pub mod rt {
 
 #[cfg(test)]
 pub mod test {
-    use either::{Either, Left, Right};
+    use either::Right;
     use comm::{Chan, Port, oneshot, recv_one, stream, Select2,
-               GenericPort, GenericChan, Peekable};
+               GenericChan, Peekable};
 
     #[test]
     pub fn test_select2() {

src/libcore/ptr.rs

@@ -13,7 +13,6 @@
 use cast;
 use libc;
 use libc::{c_void, size_t};
-use unstable::intrinsics::{memmove32,memmove64};
 use sys;
 
 #[cfg(test)] use vec;
@@ -116,12 +115,14 @@ pub fn is_not_null<T>(ptr: *const T) -> bool { !is_null(ptr) }
 #[inline(always)]
 #[cfg(target_word_size = "32")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
+    use unstable::intrinsics::memmove32;
     let n = count * sys::size_of::<T>();
     memmove32(dst as *mut u8, src as *u8, n as u32);
 }
 #[inline(always)]
 #[cfg(target_word_size = "64")]
 pub unsafe fn copy_memory<T>(dst: *mut T, src: *const T, count: uint) {
+    use unstable::intrinsics::memmove64;
     let n = count * sys::size_of::<T>();
     memmove64(dst as *mut u8, src as *u8, n as u64);
 }

src/libcore/rand.rs

@@ -574,7 +574,7 @@ pub fn random() -> uint {
 
 #[cfg(test)]
 pub mod tests {
-    use option::{None, Option, Some};
+    use option::{Option, Some};
     use rand;
 
     #[test]

src/libcore/reflect.rs

@@ -14,7 +14,7 @@ Runtime type reflection
 
 */
 
-use intrinsic::{TyDesc, get_tydesc, visit_tydesc, TyVisitor};
+use intrinsic::{TyDesc, TyVisitor};
 use libc::c_void;
 use sys;
 use vec;

src/libcore/repr.rs

@@ -23,7 +23,7 @@ use libc::c_void;
 use managed;
 use ptr;
 use reflect;
-use reflect::{MovePtr, MovePtrAdaptor, align};
+use reflect::{MovePtr, align};
 use sys;
 use to_str::ToStr;
 use vec::UnboxedVecRepr;

src/libcore/rt/io/file.rs

@@ -9,8 +9,6 @@
 // except according to those terms.
 
 use prelude::*;
-use super::super::sched::*;
-use super::super::rtio::*;
 use super::Stream;
 
 pub struct FileStream;

src/libcore/rt/thread_local_storage.rs

@@ -8,9 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use libc::{c_void};
+use libc::c_void;
 #[cfg(unix)]
-use libc::{c_uint, c_ulong, c_int};
+use libc::c_int;
 #[cfg(unix)]
 use ptr::null;
 #[cfg(windows)]
@@ -36,13 +36,13 @@ pub unsafe fn get(key: Key) -> *mut c_void {
 
 #[cfg(target_os="macos")]
 #[allow(non_camel_case_types)] // foreign type
-type pthread_key_t = c_ulong;
+type pthread_key_t = ::libc::c_ulong;
 
 #[cfg(target_os="linux")]
 #[cfg(target_os="freebsd")]
 #[cfg(target_os="android")]
 #[allow(non_camel_case_types)] // foreign type
-type pthread_key_t = c_uint;
+type pthread_key_t = ::libc::c_uint;
 
 #[cfg(unix)]
 extern {

src/libcore/rt/uv/mod.rs

@@ -39,16 +39,13 @@ use str::raw::from_c_str;
 use to_str::ToStr;
 use vec;
 use ptr;
-use libc::{c_void, c_int, size_t, malloc, free, ssize_t};
-use cast::{transmute, transmute_mut_region};
+use libc::{c_void, c_int, size_t, malloc, free};
+use cast::transmute;
 use ptr::null;
 use super::uvll;
-use super::uvll::*;
 use unstable::finally::Finally;
 
 #[cfg(test)] use unstable::run_in_bare_thread;
-#[cfg(test)] use super::thread::Thread;
-#[cfg(test)] use cell::Cell;
 
 pub use self::file::{FsRequest, FsCallback};
 pub use self::net::{StreamWatcher, TcpWatcher};

src/libcore/rt/uv/net.rs

@@ -10,7 +10,7 @@
 
 use prelude::*;
 use libc::{size_t, ssize_t, c_int, c_void};
-use cast::{transmute, transmute_mut_region};
+use cast::transmute_mut_region;
 use super::super::uvll;
 use super::super::uvll::*;
 use super::{Loop, Watcher, Request, UvError, Buf, Callback, NativeHandle, NullCallback,

src/libcore/run.rs

@@ -458,7 +458,7 @@ pub fn waitpid(pid: pid_t) -> int {
 
 #[cfg(test)]
 mod tests {
-    use option::{None, Some};
+    use option::None;
     use os;
     use run::{readclose, writeclose};
     use run;

src/libcore/str.rs

@@ -21,7 +21,7 @@ use at_vec;
 use cast;
 use char;
 use clone::Clone;
-use cmp::{Equiv, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
+use cmp::{TotalOrd, Ordering, Less, Equal, Greater};
 use libc;
 use option::{None, Option, Some};
 use ptr;
@@ -31,7 +31,7 @@ use uint;
 use vec;
 use to_str::ToStr;
 
-#[cfg(notest)] use cmp::{Eq, Ord};
+#[cfg(notest)] use cmp::{Eq, Ord, Equiv, TotalEq};
 
 /*
 Section: Creating a string

src/libcore/task/mod.rs

@@ -36,13 +36,15 @@
 use cell::Cell;
 use cmp::Eq;
 use result::Result;
-use comm::{stream, Chan, GenericChan, GenericPort, Port, SharedChan};
+use comm::{stream, Chan, GenericChan, GenericPort, Port};
 use prelude::*;
 use result;
 use task::rt::{task_id, sched_id, rust_task};
 use util;
 use util::replace;
 
+#[cfg(test)] use comm::SharedChan;
+
 mod local_data_priv;
 pub mod local_data;
 pub mod rt;

src/libcore/task/spawn.rs

@@ -75,7 +75,7 @@
 use cast;
 use cell::Cell;
 use container::Map;
-use comm::{Chan, GenericChan, GenericPort, Port, stream};
+use comm::{Chan, GenericChan};
 use prelude::*;
 use unstable;
 use ptr;
@@ -86,10 +86,12 @@ use task::rt;
 use task::{Failure, ManualThreads, PlatformThread, SchedOpts, SingleThreaded};
 use task::{Success, TaskOpts, TaskResult, ThreadPerCore, ThreadPerTask};
 use task::{ExistingScheduler, SchedulerHandle};
-use task::{default_task_opts, unkillable};
+use task::unkillable;
 use uint;
 use util;
 
+#[cfg(test)] use task::default_task_opts;
+
 macro_rules! move_it (
     { $x:expr } => ( unsafe { let y = *ptr::addr_of(&($x)); y } )
 )

src/libcore/unstable.rs

@@ -15,7 +15,7 @@ use libc;
 use comm::{GenericChan, GenericPort};
 use prelude::*;
 use task;
-use task::{TaskBuilder, atomically};
+use task::atomically;
 
 #[path = "unstable/at_exit.rs"]
 pub mod at_exit;

src/libcore/unstable/at_exit.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use cast;
-use libc::{c_void, size_t};
+use libc::size_t;
 use rand::RngUtil;
 use rand;
 use sys;

src/libcore/unstable/exchange_alloc.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use sys::{TypeDesc, size_of};
-use libc::{c_void, size_t, uintptr_t};
+use libc::{c_void, size_t};
 use c_malloc = libc::malloc;
 use c_free = libc::free;
 use managed::raw::{BoxHeaderRepr, BoxRepr};

src/libcore/unstable/global.rs

@@ -28,7 +28,7 @@ avoid hitting the mutex.
 use cast::{transmute, reinterpret_cast};
 use clone::Clone;
 use kinds::Owned;
-use libc::{c_void, uintptr_t};
+use libc::{c_void};
 use option::{Option, Some, None};
 use ops::Drop;
 use unstable::{Exclusive, exclusive};

src/libcore/unstable/weak_task.rs

@@ -27,7 +27,9 @@ use unstable::at_exit::at_exit;
 use unstable::finally::Finally;
 use unstable::global::global_data_clone_create;
 use task::rt::{task_id, get_task_id};
-use task::{Task, task, spawn};
+use task::task;
+
+#[cfg(test)] use task::spawn;
 
 type ShutdownMsg = ();
 

src/libcore/vec.rs

@@ -14,7 +14,7 @@
 
 use container::{Container, Mutable};
 use cast;
-use cmp::{Eq, Equiv, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
+use cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
 use clone::Clone;
 use iter::BaseIter;
 use iter;
@@ -28,6 +28,8 @@ use sys;
 use uint;
 use vec;
 
+#[cfg(notest)] use cmp::Equiv;
+
 pub mod rustrt {
     use libc;
     use sys;

src/libfuzzer/fuzzer.rc

@@ -33,7 +33,7 @@ extern mod syntax(vers = "0.6");
 use core::*;
 use core::io::WriterUtil;
 
-use syntax::{ast, ast_util, fold, visit, codemap};
+use syntax::{ast, fold, visit, codemap};
 use syntax::parse;
 use syntax::print::pprust;
 use syntax::diagnostic;

src/librustc/back/link.rs

@@ -14,7 +14,7 @@ use back::rpath;
 use driver::session::Session;
 use driver::session;
 use lib::llvm::llvm;
-use lib::llvm::{ModuleRef, mk_pass_manager, mk_target_data, True, False};
+use lib::llvm::ModuleRef;
 use lib;
 use metadata::common::LinkMeta;
 use metadata::{encoder, csearch, cstore};
@@ -25,7 +25,7 @@ use util::ppaux;
 use core::char;
 use core::hash::Streaming;
 use core::hash;
-use core::io::{Writer, WriterUtil};
+use core::io::WriterUtil;
 use core::libc::{c_int, c_uint, c_char};
 use core::os::consts::{macos, freebsd, linux, android, win32};
 use core::os;
@@ -86,7 +86,7 @@ pub mod jit {
     use back::link::llvm_err;
     use driver::session::Session;
     use lib::llvm::llvm;
-    use lib::llvm::{ModuleRef, PassManagerRef, mk_target_data};
+    use lib::llvm::{ModuleRef, PassManagerRef};
     use metadata::cstore;
 
     use core::cast;
@@ -171,11 +171,11 @@ pub mod write {
     use driver::session::Session;
     use driver::session;
     use lib::llvm::llvm;
-    use lib::llvm::{False, True, ModuleRef, mk_pass_manager, mk_target_data};
+    use lib::llvm::{False, ModuleRef, mk_pass_manager, mk_target_data};
     use lib;
 
     use core::prelude::*;
-    use core::libc::{c_char, c_int, c_uint};
+    use core::libc::{c_int, c_uint};
     use core::path::Path;
     use core::str;
     use core::run;

src/librustc/back/upcall.rs

@@ -11,11 +11,8 @@
 
 use driver::session;
 use middle::trans::base;
-use middle::trans::common::{T_fn, T_i1, T_i8, T_i32,
-                               T_int, T_nil,
-                               T_opaque_vec, T_ptr, T_unique_ptr,
-                               T_size_t, T_void, T_vec2};
-use lib::llvm::{TypeNames, ModuleRef, ValueRef, TypeRef};
+use middle::trans::common::{T_fn, T_i8, T_i32, T_int, T_ptr, T_void};
+use lib::llvm::{ModuleRef, ValueRef, TypeRef};
 
 pub struct Upcalls {
     trace: ValueRef,

src/librustc/driver/driver.rs

@@ -13,7 +13,7 @@ use core::prelude::*;
 use back::link;
 use back::{arm, x86, x86_64, mips};
 use driver::session::{Aggressive};
-use driver::session::{Session, Session_, OptLevel, No, Less, Default};
+use driver::session::{Session, Session_, No, Less, Default};
 use driver::session;
 use front;
 use lib::llvm::llvm;

src/librustc/lib/llvm.rs

@@ -11,7 +11,7 @@
 use core::prelude::*;
 
 use core::hashmap::linear::LinearMap;
-use core::libc::{c_char, c_int, c_uint, c_longlong, c_ulonglong};
+use core::libc::c_uint;
 use core::option;
 use core::ptr;
 use core::str;
@@ -223,7 +223,7 @@ pub enum SectionIterator_opaque {}
 pub type SectionIteratorRef = *SectionIterator_opaque;
 
 pub mod llvm {
-    use super::{AsmDialect, AtomicBinOp, AtomicOrdering, BasicBlockRef};
+    use super::{AtomicBinOp, AtomicOrdering, BasicBlockRef};
     use super::{Bool, BuilderRef, ContextRef, MemoryBufferRef, ModuleRef};
     use super::{ObjectFileRef, Opcode, PassManagerRef, PassManagerBuilderRef};
     use super::{SectionIteratorRef, TargetDataRef, TypeKind, TypeRef, UseRef};

src/librustc/metadata/creader.rs

@@ -26,7 +26,7 @@ use syntax::codemap::{span, dummy_sp};
 use syntax::diagnostic::span_handler;
 use syntax::parse::token::ident_interner;
 use syntax::visit;
-use syntax::{ast, ast_util};
+use syntax::ast;
 
 // Traverses an AST, reading all the information about use'd crates and extern
 // libraries necessary for later resolving, typechecking, linking, etc.

src/librustc/metadata/cstore.rs

@@ -20,7 +20,7 @@ use metadata::decoder;
 use core::hashmap::linear::LinearMap;
 use core::vec;
 use std;
-use syntax::{ast, attr};
+use syntax::ast;
 use syntax::parse::token::ident_interner;
 
 // A map from external crate numbers (as decoded from some crate file) to

src/librustc/metadata/decoder.rs

@@ -22,7 +22,7 @@ use metadata::decoder;
 use metadata::tydecode::{parse_ty_data, parse_def_id, parse_bounds_data};
 use middle::{ty, resolve};
 
-use core::hash::{Hash, HashUtil};
+use core::hash::HashUtil;
 use core::int;
 use core::io::WriterUtil;
 use core::io;

src/librustc/metadata/encoder.rs

@@ -24,8 +24,8 @@ use middle;
 use util::ppaux::ty_to_str;
 
 use core::flate;
-use core::hash::{Hash, HashUtil};
-use core::hashmap::linear::{LinearMap, LinearSet};
+use core::hash::HashUtil;
+use core::hashmap::linear::LinearMap;
 use core::int;
 use core::io::{Writer, WriterUtil};
 use core::io;

src/librustc/metadata/tydecode.rs

@@ -23,7 +23,7 @@ use core::uint;
 use core::vec;
 use syntax::ast;
 use syntax::ast::*;
-use syntax::codemap::{respan, dummy_sp};
+use syntax::codemap::dummy_sp;
 use syntax::opt_vec;
 
 // Compact string representation for ty::t values. API ty_str &

src/librustc/metadata/tyencode.rs

@@ -13,7 +13,7 @@
 
 use core::prelude::*;
 
-use middle::ty::{Vid, param_ty};
+use middle::ty::param_ty;
 use middle::ty;
 
 use core::hashmap::linear::LinearMap;
@@ -24,7 +24,6 @@ use core::vec;
 use syntax::ast::*;
 use syntax::diagnostic::span_handler;
 use syntax::print::pprust::*;
-use middle::ty::Vid;
 
 pub struct ctxt {
     diag: @span_handler,

src/librustc/middle/astencode.rs

@@ -20,7 +20,7 @@ use metadata::tydecode;
 use metadata::tydecode::{DefIdSource, NominalType, TypeWithId, TypeParameter};
 use metadata::tyencode;
 use middle::freevars::freevar_entry;
-use middle::typeck::{method_origin, method_map_entry, vtable_res};
+use middle::typeck::{method_origin, method_map_entry};
 use middle::{ty, typeck, moves};
 use middle;
 use util::ppaux::ty_to_str;

src/librustc/middle/borrowck/check_loans.rs

@@ -24,7 +24,7 @@ use middle::borrowck::{Loan, bckerr, BorrowckCtxt, inherent_mutability};
 use middle::borrowck::{ReqMaps, root_map_key, save_and_restore_managed};
 use middle::borrowck::{MoveError, MoveOk, MoveFromIllegalCmt};
 use middle::borrowck::{MoveWhileBorrowed};
-use middle::mem_categorization::{cat_arg, cat_binding, cat_comp, cat_deref};
+use middle::mem_categorization::{cat_arg, cat_comp, cat_deref};
 use middle::mem_categorization::{cat_local, cat_rvalue, cat_self};
 use middle::mem_categorization::{cat_special, cmt, gc_ptr, loan_path, lp_arg};
 use middle::mem_categorization::{lp_comp, lp_deref, lp_local};
@@ -33,7 +33,7 @@ use util::ppaux::ty_to_str;
 
 use core::hashmap::linear::LinearSet;
 use core::uint;
-use syntax::ast::{m_const, m_imm, m_mutbl};
+use syntax::ast::m_mutbl;
 use syntax::ast;
 use syntax::ast_util;
 use syntax::codemap::span;

src/librustc/middle/borrowck/gather_loans.rs

@@ -24,8 +24,7 @@ use middle::borrowck::{LoanKind, TotalFreeze, PartialFreeze,
                        TotalTake, PartialTake, Immobile};
 use middle::borrowck::ReqMaps;
 use middle::borrowck::loan;
-use middle::mem_categorization::{cat_binding, cat_discr, cmt, comp_variant};
-use middle::mem_categorization::{mem_categorization_ctxt};
+use middle::mem_categorization::{cmt, mem_categorization_ctxt};
 use middle::pat_util;
 use middle::ty::{ty_region};
 use middle::ty;
@@ -166,7 +165,7 @@ fn req_loans_in_expr(ex: @ast::expr,
         visit::visit_expr(ex, self, vt);
       }
 
-      ast::expr_method_call(rcvr, _, _, ref args, _) => {
+      ast::expr_method_call(_, _, _, ref args, _) => {
         let arg_tys = ty::ty_fn_args(ty::node_id_to_type(self.tcx(),
                                                          ex.callee_id));
         let scope_r = ty::re_scope(ex.id);

src/librustc/middle/borrowck/loan.rs

@@ -55,8 +55,8 @@ use middle::mem_categorization::{gc_ptr, region_ptr};
 use middle::ty;
 use util::common::indenter;
 
-use core::result::{Err, Ok, Result};
-use syntax::ast::{m_const, m_imm, m_mutbl};
+use core::result::{Err, Ok};
+use syntax::ast::m_imm;
 use syntax::ast;
 
 pub fn loan(bccx: @BorrowckCtxt,

src/librustc/middle/borrowck/mod.rs

@@ -231,14 +231,14 @@ use middle::region;
 use middle::ty;
 use middle::typeck;
 use middle::moves;
-use util::common::{indenter, stmt_set};
+use util::common::stmt_set;
 use util::ppaux::note_and_explain_region;
 
 use core::hashmap::linear::{LinearSet, LinearMap};
 use core::io;
 use core::result::{Result, Ok, Err};
 use core::to_bytes;
-use syntax::ast::{mutability, m_mutbl, m_imm, m_const};
+use syntax::ast::{mutability, m_imm};
 use syntax::ast;
 use syntax::codemap::span;
 

src/librustc/middle/check_match.rs

@@ -11,7 +11,7 @@
 use core::prelude::*;
 
 use middle::const_eval::{compare_const_vals, lookup_const_by_id};
-use middle::const_eval::{eval_const_expr, const_val, const_int, const_bool};
+use middle::const_eval::{eval_const_expr, const_val, const_bool};
 use middle::pat_util::*;
 use middle::ty::*;
 use middle::ty;
@@ -23,7 +23,7 @@ use core::uint;
 use core::vec;
 use std::sort;
 use syntax::ast::*;
-use syntax::ast_util::{variant_def_ids, unguarded_pat, walk_pat};
+use syntax::ast_util::{unguarded_pat, walk_pat};
 use syntax::codemap::{span, dummy_sp, spanned};
 use syntax::visit;
 

src/librustc/middle/kind.rs

@@ -20,7 +20,7 @@ use util::ppaux::{ty_to_str, tys_to_str};
 
 use syntax::ast::*;
 use syntax::attr::attrs_contains_name;
-use syntax::codemap::{span, spanned};
+use syntax::codemap::span;
 use syntax::print::pprust::expr_to_str;
 use syntax::{visit, ast_util};
 

src/librustc/middle/lang_items.rs

@@ -23,13 +23,13 @@
 use core::prelude::*;
 
 use driver::session::Session;
-use metadata::csearch::{each_lang_item, get_item_attrs};
-use metadata::cstore::{iter_crate_data};
-use syntax::ast::{crate, def_fn, def_id, def_ty, lit_str, meta_item};
+use metadata::csearch::each_lang_item;
+use metadata::cstore::iter_crate_data;
+use syntax::ast::{crate, def_id, lit_str, meta_item};
 use syntax::ast::{meta_list, meta_name_value, meta_word};
-use syntax::ast_util::{local_def};
+use syntax::ast_util::local_def;
 use syntax::visit::{default_simple_visitor, mk_simple_visitor, SimpleVisitor};
-use syntax::visit::{visit_crate, visit_item};
+use syntax::visit::visit_crate;
 
 use core::hashmap::linear::LinearMap;
 use core::ptr;

src/librustc/middle/lint.rs

@@ -35,8 +35,8 @@ use std::smallintmap::SmallIntMap;
 use syntax::attr;
 use syntax::codemap::span;
 use syntax::codemap;
-use syntax::print::pprust::{expr_to_str, mode_to_str, pat_to_str};
-use syntax::{ast, ast_util, visit};
+use syntax::print::pprust::mode_to_str;
+use syntax::{ast, visit};
 
 /**
  * A 'lint' check is a kind of miscellaneous constraint that a user _might_

src/librustc/middle/moves.rs

@@ -211,8 +211,7 @@ use core::prelude::*;
 use middle::pat_util::{pat_bindings};
 use middle::freevars;
 use middle::ty;
-use middle::typeck::{method_map, method_map_entry};
-use middle::typeck::check::{DerefArgs, DoDerefArgs, DontDerefArgs};
+use middle::typeck::method_map;
 use util::ppaux;
 use util::common::indenter;
 
@@ -221,8 +220,7 @@ use core::vec;
 use syntax::ast::*;
 use syntax::ast_util;
 use syntax::visit;
-use syntax::visit::{fn_kind, fk_item_fn, fk_method, fk_dtor,
-                    fk_anon, fk_fn_block, vt};
+use syntax::visit::vt;
 use syntax::print::pprust;
 use syntax::codemap::span;
 

src/librustc/middle/pat_util.rs

@@ -15,7 +15,7 @@ use middle::resolve;
 use core::hashmap::linear::LinearMap;
 use syntax::ast::*;
 use syntax::ast_util::{path_to_ident, walk_pat};
-use syntax::codemap::{span, respan};
+use syntax::codemap::span;
 
 pub type PatIdMap = LinearMap<ident, node_id>;
 

src/librustc/middle/resolve.rs

@@ -13,27 +13,27 @@ use core::prelude::*;
 use driver::session;
 use driver::session::Session;
 use metadata::csearch::{each_path, get_method_names_if_trait};
-use metadata::csearch::{get_static_methods_if_impl, get_struct_fields};
-use metadata::csearch::{get_type_name_if_impl};
+use metadata::csearch::get_static_methods_if_impl;
+use metadata::csearch::get_type_name_if_impl;
 use metadata::cstore::find_extern_mod_stmt_cnum;
 use metadata::decoder::{def_like, dl_def, dl_field, dl_impl};
 use middle::lang_items::LanguageItems;
 use middle::lint::{deny, allow, forbid, level, unused_imports, warn};
 use middle::lint::{get_lint_level, get_lint_settings_level};
-use middle::pat_util::{pat_bindings};
+use middle::pat_util::pat_bindings;
 
 use core::str;
 use core::vec;
 use syntax::ast::{RegionTyParamBound, TraitTyParamBound, _mod, add, arm};
 use syntax::ast::{binding_mode, bitand, bitor, bitxor, blk};
 use syntax::ast::{bind_infer, bind_by_ref, bind_by_copy};
-use syntax::ast::{crate, crate_num, decl_item, def, def_arg, def_binding};
+use syntax::ast::{crate, decl_item, def, def_arg, def_binding};
 use syntax::ast::{def_const, def_foreign_mod, def_fn, def_id, def_label};
 use syntax::ast::{def_local, def_mod, def_prim_ty, def_region, def_self};
 use syntax::ast::{def_self_ty, def_static_method, def_struct, def_ty};
 use syntax::ast::{def_ty_param, def_typaram_binder};
 use syntax::ast::{def_upvar, def_use, def_variant, expr, expr_assign_op};
-use syntax::ast::{expr_binary, expr_break, expr_cast, expr_field};
+use syntax::ast::{expr_binary, expr_break, expr_field};
 use syntax::ast::{expr_fn_block, expr_index, expr_method_call, expr_path};
 use syntax::ast::{def_prim_ty, def_region, def_self, def_ty, def_ty_param};
 use syntax::ast::{def_upvar, def_use, def_variant, div, eq};
@@ -41,24 +41,24 @@ use syntax::ast::{expr, expr_again, expr_assign_op};
 use syntax::ast::{expr_index, expr_loop};
 use syntax::ast::{expr_path, expr_struct, expr_unary, fn_decl};
 use syntax::ast::{foreign_item, foreign_item_const, foreign_item_fn, ge};
-use syntax::ast::{Generics};
-use syntax::ast::{gt, ident, impure_fn, inherited, item, item_struct};
+use syntax::ast::Generics;
+use syntax::ast::{gt, ident, inherited, item, item_struct};
 use syntax::ast::{item_const, item_enum, item_fn, item_foreign_mod};
 use syntax::ast::{item_impl, item_mac, item_mod, item_trait, item_ty, le};
-use syntax::ast::{local, local_crate, lt, method, mode, module_ns, mul};
+use syntax::ast::{local, local_crate, lt, method, mode, mul};
 use syntax::ast::{named_field, ne, neg, node_id, pat, pat_enum, pat_ident};
-use syntax::ast::{path, pat_box, pat_lit, pat_range, pat_struct};
-use syntax::ast::{pat_tup, pat_uniq, pat_wild, prim_ty, private, provided};
+use syntax::ast::{path, pat_lit, pat_range, pat_struct};
+use syntax::ast::{prim_ty, private, provided};
 use syntax::ast::{public, required, rem, self_ty_, shl, shr, stmt_decl};
 use syntax::ast::{struct_dtor, struct_field, struct_variant_kind};
 use syntax::ast::{sty_static, subtract, trait_ref, tuple_variant_kind, Ty};
 use syntax::ast::{ty_bool, ty_char, ty_f, ty_f32, ty_f64, ty_float, ty_i};
 use syntax::ast::{ty_i16, ty_i32, ty_i64, ty_i8, ty_int, TyParam, ty_path};
 use syntax::ast::{ty_str, ty_u, ty_u16, ty_u32, ty_u64, ty_u8, ty_uint};
-use syntax::ast::{type_value_ns, unnamed_field};
+use syntax::ast::unnamed_field;
 use syntax::ast::{variant, view_item, view_item_extern_mod};
 use syntax::ast::{view_item_use, view_path_glob, view_path_list};
-use syntax::ast::{view_path_simple, visibility, anonymous, named, not};
+use syntax::ast::{view_path_simple, anonymous, named, not};
 use syntax::ast::{unsafe_fn};
 use syntax::ast_util::{def_id_of_def, local_def};
 use syntax::ast_util::{path_to_ident, walk_pat, trait_method_to_ty_method};
@@ -67,15 +67,16 @@ use syntax::ast_util::{variant_visibility_to_privacy, visibility_to_privacy};
 use syntax::attr::{attr_metas, contains_name, attrs_contains_name};
 use syntax::parse::token::ident_interner;
 use syntax::parse::token::special_idents;
-use syntax::print::pprust::{pat_to_str, path_to_str};
+use syntax::print::pprust::path_to_str;
 use syntax::codemap::{span, dummy_sp};
-use syntax::visit::{default_visitor, fk_method, mk_vt, Visitor, visit_block};
-use syntax::visit::{visit_crate, visit_expr, visit_expr_opt, visit_fn};
-use syntax::visit::{visit_foreign_item, visit_item, visit_method_helper};
+use syntax::visit::{default_visitor, mk_vt, Visitor, visit_block};
+use syntax::visit::{visit_crate, visit_expr, visit_expr_opt};
+use syntax::visit::{visit_foreign_item, visit_item};
 use syntax::visit::{visit_mod, visit_ty, vt};
 use syntax::opt_vec::OptVec;
 
-use core::str::{connect, each_split_str};
+use core::option::Some;
+use core::str::each_split_str;
 use core::hashmap::linear::{LinearMap, LinearSet};
 
 // Definition mapping
@@ -1425,7 +1426,6 @@ pub impl Resolver {
 
                     // Build up the import directives.
                     let module_ = self.get_module_from_parent(parent);
-                    let state = @mut ImportState();
                     match view_path.node {
                         view_path_simple(binding, full_path, _, _) => {
                             let source_ident = *full_path.idents.last();
@@ -1435,19 +1435,17 @@ pub impl Resolver {
                                                         module_,
                                                         module_path,
                                                         subclass,
-                                                        view_path.span,
-                                                        state);
+                                                        view_path.span);
                         }
                         view_path_list(_, ref source_idents, _) => {
-                            for (*source_idents).each |source_ident| {
+                            for source_idents.each |source_ident| {
                                 let name = source_ident.node.name;
                                 let subclass = @SingleImport(name, name);
                                 self.build_import_directive(privacy,
                                                             module_,
                                                             copy module_path,
                                                             subclass,
-                                                            view_path.span,
-                                                            state);
+                                                            source_ident.span);
                             }
                         }
                         view_path_glob(_, _) => {
@@ -1455,8 +1453,7 @@ pub impl Resolver {
                                                         module_,
                                                         module_path,
                                                         @GlobImport,
-                                                        view_path.span,
-                                                        state);
+                                                        view_path.span);
                         }
                     }
                 }
@@ -1842,8 +1839,7 @@ pub impl Resolver {
                               module_: @mut Module,
                               +module_path: ~[ident],
                               subclass: @ImportDirectiveSubclass,
-                              span: span,
-                              state: @mut ImportState) {
+                              span: span) {
         let directive = @ImportDirective(privacy, module_path,
                                          subclass, span);
         module_.imports.push(directive);
@@ -1867,6 +1863,7 @@ pub impl Resolver {
                     }
                     None => {
                         debug!("(building import directive) creating new");
+                        let state = @mut ImportState();
                         let resolution = @mut ImportResolution(privacy,
                                                                span,
                                                                state);

src/librustc/middle/trans/adt.rs

@@ -54,7 +54,7 @@ use core::libc::c_ulonglong;
 use core::option::{Option, Some, None};
 use core::vec;
 
-use lib::llvm::{ValueRef, TypeRef, True, False};
+use lib::llvm::{ValueRef, TypeRef, True};
 use middle::trans::_match;
 use middle::trans::build::*;
 use middle::trans::common::*;

src/librustc/middle/trans/base.rs

@@ -34,7 +34,7 @@ use lib::llvm::{True, False};
 use lib::llvm::{llvm, mk_target_data, mk_type_names};
 use lib;
 use metadata::common::LinkMeta;
-use metadata::{csearch, cstore, decoder, encoder};
+use metadata::{csearch, cstore, encoder};
 use middle::astencode;
 use middle::borrowck::RootInfo;
 use middle::resolve;
@@ -63,7 +63,7 @@ use middle::trans::type_of;
 use middle::trans::type_of::*;
 use middle::ty;
 use util::common::indenter;
-use util::ppaux::{ty_to_str, ty_to_short_str};
+use util::ppaux::ty_to_str;
 use util::ppaux;
 
 use core::hash;
@@ -72,14 +72,14 @@ use core::int;
 use core::io;
 use core::libc::{c_uint, c_ulonglong};
 use core::uint;
-use std::{time, list};
+use std::time;
 use syntax::ast::ident;
-use syntax::ast_map::{path, path_elt_to_str, path_mod, path_name};
-use syntax::ast_util::{def_id_of_def, local_def, path_to_ident};
+use syntax::ast_map::{path, path_elt_to_str, path_name};
+use syntax::ast_util::{local_def, path_to_ident};
 use syntax::attr;
 use syntax::codemap::span;
 use syntax::parse::token::special_idents;
-use syntax::print::pprust::{expr_to_str, stmt_to_str, path_to_str};
+use syntax::print::pprust::stmt_to_str;
 use syntax::visit;
 use syntax::{ast, ast_util, codemap, ast_map};
 

src/librustc/middle/trans/build.rs

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 use lib::llvm::llvm;
-use lib::llvm::{CallConv, TypeKind, AtomicBinOp, AtomicOrdering, AsmDialect};
-use lib::llvm::{Opcode, IntPredicate, RealPredicate, True, False};
+use lib::llvm::{CallConv, AtomicBinOp, AtomicOrdering, AsmDialect};
+use lib::llvm::{Opcode, IntPredicate, RealPredicate, False};
 use lib::llvm::{ValueRef, TypeRef, BasicBlockRef, BuilderRef, ModuleRef};
 use lib;
 use middle::trans::common::*;
@@ -19,7 +19,7 @@ use syntax::codemap::span;
 use core::prelude::*;
 use core::cast;
 use core::hashmap::linear::LinearMap;
-use core::libc::{c_uint, c_int, c_ulonglong, c_char};
+use core::libc::{c_uint, c_ulonglong, c_char};
 use core::libc;
 use core::option::Some;
 use core::ptr;

src/librustc/middle/trans/cabi_mips.rs

@@ -11,9 +11,9 @@
 use core::{ptr, vec, uint};
 use core::option::*;
 use core::libc::c_uint;
-use lib::llvm::{llvm, TypeRef, ValueRef, Integer, Pointer, Float, Double};
+use lib::llvm::{llvm, TypeRef, Integer, Pointer, Float, Double};
 use lib::llvm::{Struct, Array, Attribute};
-use lib::llvm::{StructRetAttribute, ByValAttribute};
+use lib::llvm::{StructRetAttribute};
 use middle::trans::common::*;
 use middle::trans::cabi::*;
 

src/librustc/middle/trans/cabi_x86_64.rs

@@ -11,7 +11,7 @@
 // The classification code for the x86_64 ABI is taken from the clay language
 // https://github.com/jckarter/clay/blob/master/compiler/src/externals.cpp
 
-use lib::llvm::{llvm, TypeRef, ValueRef, Integer, Pointer, Float, Double};
+use lib::llvm::{llvm, TypeRef, Integer, Pointer, Float, Double};
 use lib::llvm::{Struct, Array, Attribute};
 use lib::llvm::{StructRetAttribute, ByValAttribute};
 use lib::llvm::struct_tys;

src/librustc/middle/trans/callee.rs

@@ -21,7 +21,7 @@ use core::prelude::*;
 use back::abi;
 use driver::session;
 use lib;
-use lib::llvm::{ValueRef, TypeRef};
+use lib::llvm::ValueRef;
 use lib::llvm::llvm;
 use metadata::csearch;
 use middle::trans::base;

src/librustc/middle/trans/closure.rs

@@ -12,13 +12,13 @@ use core::prelude::*;
 
 use back::abi;
 use back::link::{mangle_internal_name_by_path_and_seq};
-use lib::llvm::{llvm, ValueRef, TypeRef};
+use lib::llvm::{llvm, ValueRef};
 use middle::moves;
 use middle::trans::base::*;
 use middle::trans::build::*;
 use middle::trans::callee;
 use middle::trans::common::*;
-use middle::trans::datum::{Datum, INIT, ByRef, ByValue, ZeroMem};
+use middle::trans::datum::{Datum, INIT, ByRef, ZeroMem};
 use middle::trans::expr;
 use middle::trans::glue;
 use middle::trans::machine;
@@ -27,7 +27,7 @@ use middle::ty;
 use util::ppaux::ty_to_str;
 
 use syntax::ast;
-use syntax::ast_map::{path, path_mod, path_name};
+use syntax::ast_map::path_name;
 use syntax::ast_util;
 use syntax::parse::token::special_idents;
 

src/librustc/middle/trans/common.rs

@@ -16,7 +16,7 @@
 
 use core::prelude::*;
 
-use back::{link, abi, upcall};
+use back::{abi, upcall};
 use driver::session;
 use driver::session::Session;
 use lib::llvm::{ModuleRef, ValueRef, TypeRef, BasicBlockRef, BuilderRef};

src/librustc/middle/trans/consts.rs

@@ -28,7 +28,7 @@ use middle::ty;
 use util::ppaux::{expr_repr, ty_to_str};
 
 use core::libc::c_uint;
-use syntax::{ast, ast_util, codemap, ast_map};
+use syntax::{ast, ast_util, ast_map};
 use util::ppaux::ty_to_str;
 
 pub fn const_lit(cx: @CrateContext, e: @ast::expr, lit: ast::lit)

src/librustc/middle/trans/debuginfo.rs

@@ -24,7 +24,7 @@ use core::hashmap::linear::LinearMap;
 use core::libc;
 use core::option;
 use core::sys;
-use syntax::codemap::{span, CharPos};
+use syntax::codemap::span;
 use syntax::parse::token::ident_interner;
 use syntax::{ast, codemap, ast_util, ast_map};
 

src/librustc/middle/trans/expr.rs

@@ -123,7 +123,7 @@ use core::prelude::*;
 
 use back::abi;
 use lib;
-use lib::llvm::{ValueRef, TypeRef, llvm, True};
+use lib::llvm::{ValueRef, TypeRef, llvm};
 use metadata::csearch;
 use middle::borrowck::root_map_key;
 use middle::trans::_match;
@@ -132,7 +132,7 @@ use middle::trans::asm;
 use middle::trans::base;
 use middle::trans::base::*;
 use middle::trans::build::*;
-use middle::trans::callee::{AutorefArg, DoAutorefArg, DontAutorefArg};
+use middle::trans::callee::DoAutorefArg;
 use middle::trans::callee;
 use middle::trans::closure;
 use middle::trans::common::*;

src/librustc/middle/trans/foreign.rs

@@ -16,7 +16,7 @@ use driver::session::arch_x86_64;
 use driver::session::arch_arm;
 use driver::session::arch_mips;
 use lib::llvm::{SequentiallyConsistent, Acquire, Release, Xchg};
-use lib::llvm::{llvm, TypeRef, ValueRef, Integer, Pointer, Float, Double};
+use lib::llvm::{TypeRef, ValueRef};
 use lib;
 use middle::trans::base::*;
 use middle::trans::cabi;
@@ -27,7 +27,7 @@ use middle::trans::build::*;
 use middle::trans::callee::*;
 use middle::trans::common::*;
 use middle::trans::datum::*;
-use middle::trans::expr::{Dest, Ignore};
+use middle::trans::expr::Ignore;
 use middle::trans::machine::llsize_of;
 use middle::trans::glue;
 use middle::trans::machine;

src/librustc/middle/trans/inline.rs

@@ -14,14 +14,14 @@ use metadata::csearch;
 use middle::astencode;
 use middle::trans::base::{get_insn_ctxt};
 use middle::trans::base::{impl_owned_self, impl_self, no_self};
-use middle::trans::base::{trans_item, get_item_val, self_arg, trans_fn};
+use middle::trans::base::{trans_item, get_item_val, trans_fn};
 use middle::trans::common::*;
 use middle::ty;
 use util::ppaux::ty_to_str;
 
 use core::vec;
 use syntax::ast;
-use syntax::ast_map::{path, path_mod, path_name};
+use syntax::ast_map::path_name;
 use syntax::ast_util::local_def;
 
 // `translate` will be true if this function is allowed to translate the

src/librustc/middle/trans/machine.rs

@@ -12,8 +12,8 @@
 
 use core::prelude::*;
 
-use lib::llvm::{ModuleRef, ValueRef, TypeRef, BasicBlockRef, BuilderRef};
-use lib::llvm::{True, False, Bool};
+use lib::llvm::{ValueRef, TypeRef};
+use lib::llvm::False;
 use lib::llvm::llvm;
 use middle::trans::common::*;
 use middle::trans::type_of;

src/librustc/middle/trans/meth.rs

@@ -10,10 +10,10 @@
 
 use core::prelude::*;
 
-use back::{link, abi};
+use back::abi;
 use driver;
 use lib::llvm::llvm;
-use lib::llvm::{ValueRef, TypeRef};
+use lib::llvm::ValueRef;
 use lib;
 use metadata::csearch;
 use middle::trans::base::*;
@@ -31,9 +31,9 @@ use middle::ty;
 use middle::ty::arg;
 use middle::typeck;
 use util::common::indenter;
-use util::ppaux::{ty_to_str, tys_to_str};
+use util::ppaux::ty_to_str;
 
-use syntax::ast_map::{path, path_mod, path_name, node_id_to_str};
+use syntax::ast_map::{path, path_mod, path_name};
 use syntax::ast_util;
 use syntax::{ast, ast_map};
 

src/librustc/middle/trans/monomorphize.rs

@@ -16,8 +16,8 @@ use lib::llvm::ValueRef;
 use middle::trans::base::{get_insn_ctxt};
 use middle::trans::base::{set_inline_hint_if_appr, set_inline_hint};
 use middle::trans::base::{trans_enum_variant, trans_struct_dtor};
-use middle::trans::base::{trans_fn, impl_self, decl_internal_cdecl_fn};
-use middle::trans::base::{trans_item, get_item_val, no_self, self_arg};
+use middle::trans::base::{trans_fn, decl_internal_cdecl_fn};
+use middle::trans::base::{get_item_val, no_self};
 use middle::trans::base;
 use middle::trans::common::*;
 use middle::trans::datum;
@@ -35,7 +35,7 @@ use util::ppaux::ty_to_str;
 use core::vec;
 use syntax::ast;
 use syntax::ast_map;
-use syntax::ast_map::{path, path_mod, path_name};
+use syntax::ast_map::path_name;
 use syntax::ast_util::local_def;
 use syntax::opt_vec;
 use syntax::parse::token::special_idents;

src/librustc/middle/trans/reachable.rs

@@ -28,7 +28,7 @@ use syntax::ast_util::def_id_of_def;
 use syntax::attr;
 use syntax::codemap;
 use syntax::print::pprust::expr_to_str;
-use syntax::{visit, ast_util, ast_map};
+use syntax::{visit, ast_map};
 
 pub type map = @LinearSet<node_id>;
 

src/librustc/middle/trans/shape.rs

@@ -13,7 +13,7 @@
 
 
 use lib::llvm::llvm;
-use lib::llvm::{True, False, ModuleRef, TypeRef, ValueRef};
+use lib::llvm::{True, ModuleRef, ValueRef};
 use middle::trans::common::*;
 use middle::trans;
 

src/librustc/middle/trans/type_use.rs

@@ -35,7 +35,7 @@ use middle::trans::inline;
 use middle::ty;
 use middle::typeck;
 
-use core::option::{Some, None, Option};
+use core::option::{Some, None};
 use core::uint;
 use core::vec;
 use std::list::{List, Cons, Nil};

src/librustc/middle/ty.rs

@@ -23,7 +23,7 @@ use middle::ty;
 use middle::typeck;
 use middle;
 use util::ppaux::{note_and_explain_region, bound_region_to_str};
-use util::ppaux::{region_to_str, explain_region, vstore_to_str};
+use util::ppaux::{region_to_str, vstore_to_str};
 use util::ppaux::{trait_store_to_str, ty_to_str, tys_to_str};
 use util::common::{indenter};
 

src/librustc/middle/typeck/astconv.rs

@@ -55,12 +55,12 @@
 use core::prelude::*;
 
 use middle::const_eval;
-use middle::ty::{arg, field, substs};
+use middle::ty::{arg, substs};
 use middle::ty::{ty_param_substs_and_ty};
 use middle::ty;
-use middle::typeck::rscope::{in_binding_rscope};
-use middle::typeck::rscope::{region_scope, type_rscope, RegionError};
-use middle::typeck::rscope::{RegionParamNames};
+use middle::typeck::rscope::in_binding_rscope;
+use middle::typeck::rscope::{region_scope, RegionError};
+use middle::typeck::rscope::RegionParamNames;
 
 use core::result;
 use core::vec;

src/librustc/middle/typeck/check/mod.rs

@@ -81,11 +81,11 @@ use core::prelude::*;
 use middle::const_eval;
 use middle::pat_util::pat_id_map;
 use middle::pat_util;
-use middle::ty::{TyVid, Vid, FnSig, VariantInfo_, field};
+use middle::ty::{FnSig, VariantInfo_};
 use middle::ty::{ty_param_bounds_and_ty, ty_param_substs_and_ty};
-use middle::ty::{re_bound, br_cap_avoid, substs, arg, param_ty};
+use middle::ty::{substs, arg, param_ty};
 use middle::ty;
-use middle::typeck::astconv::{AstConv, ast_path_to_ty};
+use middle::typeck::astconv::AstConv;
 use middle::typeck::astconv::{ast_region_to_region, ast_ty_to_ty};
 use middle::typeck::astconv;
 use middle::typeck::check::_match::pat_ctxt;
@@ -97,16 +97,15 @@ use middle::typeck::check::method::{TransformTypeNormally};
 use middle::typeck::check::regionmanip::replace_bound_regions_in_fn_sig;
 use middle::typeck::check::vtable::{LocationInfo, VtableContext};
 use middle::typeck::CrateCtxt;
-use middle::typeck::infer::{resolve_type, force_tvar, mk_eqty};
+use middle::typeck::infer::{resolve_type, force_tvar};
 use middle::typeck::infer;
-use middle::typeck::rscope::{binding_rscope, bound_self_region};
+use middle::typeck::rscope::bound_self_region;
 use middle::typeck::rscope::{RegionError, RegionParameterization};
-use middle::typeck::rscope::{in_binding_rscope, region_scope, type_rscope};
+use middle::typeck::rscope::region_scope;
 use middle::typeck::rscope;
-use middle::typeck::{isr_alist, lookup_def_ccx, method_map_entry};
-use middle::typeck::{method_map, vtable_map};
-use middle::typeck::{method_origin, method_self, method_trait, no_params};
-use middle::typeck::{require_same_types};
+use middle::typeck::{isr_alist, lookup_def_ccx};
+use middle::typeck::no_params;
+use middle::typeck::{require_same_types, method_map, vtable_map};
 use util::common::{block_query, indenter, loop_query};
 use util::ppaux::{bound_region_to_str, expr_repr, pat_repr};
 use util::ppaux;
@@ -119,12 +118,12 @@ use core::result;
 use core::str;
 use core::vec;
 use std::list::Nil;
-use syntax::ast::{provided, required, ty_i};
+use syntax::ast::{provided, required};
 use syntax::ast;
 use syntax::ast_map;
-use syntax::ast_util::{Private, Public, is_local, local_def};
+use syntax::ast_util::local_def;
 use syntax::ast_util;
-use syntax::codemap::{span, spanned, respan};
+use syntax::codemap::span;
 use syntax::codemap;
 use syntax::opt_vec::OptVec;
 use syntax::opt_vec;

src/librustc/middle/typeck/check/regionck.rs

@@ -30,13 +30,13 @@ this point a bit better.
 use core::prelude::*;
 
 use middle::freevars::get_freevars;
-use middle::pat_util::{pat_bindings, pat_is_binding};
+use middle::pat_util::pat_bindings;
 use middle::ty::{encl_region, re_scope};
 use middle::ty;
 use middle::typeck::check::FnCtxt;
 use middle::typeck::check::lookup_def;
-use middle::typeck::infer::{fres, resolve_and_force_all_but_regions};
-use middle::typeck::infer::{resolve_type};
+use middle::typeck::infer::resolve_and_force_all_but_regions;
+use middle::typeck::infer::resolve_type;
 use util::ppaux::{note_and_explain_region, ty_to_str};
 
 use core::result;

src/librustc/middle/typeck/check/vtable.rs

@@ -15,16 +15,16 @@ use middle::ty::{param_ty, substs};
 use middle::ty;
 use middle::typeck::check::{FnCtxt, impl_self_ty};
 use middle::typeck::check::{structurally_resolved_type};
-use middle::typeck::infer::{fixup_err_to_str, InferCtxt};
+use middle::typeck::infer::fixup_err_to_str;
 use middle::typeck::infer::{resolve_and_force_all_but_regions, resolve_type};
 use middle::typeck::infer;
 use middle::typeck::{CrateCtxt, vtable_origin, vtable_param, vtable_res};
-use middle::typeck::{vtable_static};
+use middle::typeck::vtable_static;
 use util::common::indenter;
 use util::ppaux::tys_to_str;
 use util::ppaux;
 
-use core::result::{Result, Ok, Err};
+use core::result::{Ok, Err};
 use core::result;
 use core::uint;
 use core::vec;

src/librustc/middle/typeck/check/writeback.rs

@@ -19,15 +19,15 @@ use middle::ty::arg;
 use middle::ty;
 use middle::typeck::check::{FnCtxt, SelfInfo};
 use middle::typeck::infer::{force_all, resolve_all, resolve_region};
-use middle::typeck::infer::{resolve_type};
+use middle::typeck::infer::resolve_type;
 use middle::typeck::infer;
-use middle::typeck::{method_map_entry};
 use middle::typeck::{vtable_origin, vtable_static, vtable_param};
-use middle::typeck::{vtable_param, write_substs_to_tcx};
-use middle::typeck::{write_ty_to_tcx};
+use middle::typeck::method_map_entry;
+use middle::typeck::write_substs_to_tcx;
+use middle::typeck::write_ty_to_tcx;
 use util::ppaux;
 
-use core::result::{Result, Ok, Err};
+use core::result::{Ok, Err};
 use core::vec;
 use syntax::ast;
 use syntax::codemap::span;

src/librustc/middle/typeck/coherence.rs

@@ -17,7 +17,7 @@
 use core::prelude::*;
 
 use driver;
-use metadata::csearch::{ProvidedTraitMethodInfo, each_path, get_impl_traits};
+use metadata::csearch::{each_path, get_impl_traits};
 use metadata::csearch::{get_impls_for_mod};
 use metadata::csearch;
 use metadata::cstore::{CStore, iter_crate_data};
@@ -35,14 +35,11 @@ use middle::ty::{type_is_ty_var};
 use middle::ty;
 use middle::typeck::CrateCtxt;
 use middle::typeck::infer::combine::Combine;
-use middle::typeck::infer::{InferCtxt, can_mk_subty};
+use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::{new_infer_ctxt, resolve_ivar};
 use middle::typeck::infer::{resolve_nested_tvar, resolve_type};
 use syntax::ast::{crate, def_id, def_mod, def_ty};
-use syntax::ast::{item, item_struct, item_const, item_enum, item_fn};
-use syntax::ast::{item_foreign_mod, item_impl, item_mac, item_mod};
-use syntax::ast::{item_trait, item_ty, local_crate, method, node_id};
-use syntax::ast::{trait_ref};
+use syntax::ast::{item, item_impl, item_mod, local_crate, method, trait_ref};
 use syntax::ast;
 use syntax::ast_map::node_item;
 use syntax::ast_map;

src/librustc/middle/typeck/collect.rs

@@ -33,7 +33,7 @@ are represented as `ty_param()` instances.
 use core::prelude::*;
 
 use metadata::csearch;
-use middle::ty::{InstantiatedTraitRef, arg};
+use middle::ty::InstantiatedTraitRef;
 use middle::ty::{substs, ty_param_bounds_and_ty, ty_param_substs_and_ty};
 use middle::ty;
 use middle::typeck::astconv::{AstConv, ty_of_arg};

src/librustc/middle/typeck/infer/coercion.rs

@@ -66,9 +66,9 @@ we may want to adjust precisely when coercions occur.
 
 use core::prelude::*;
 
-use middle::ty::{TyVar, AutoPtr, AutoBorrowVec, AutoBorrowFn};
-use middle::ty::{AutoAdjustment, AutoDerefRef, AutoRef};
-use middle::ty::{vstore_slice, vstore_box, vstore_uniq, vstore_fixed};
+use middle::ty::{AutoPtr, AutoBorrowVec, AutoBorrowFn};
+use middle::ty::{AutoDerefRef, AutoRef};
+use middle::ty::{vstore_slice, vstore_box, vstore_uniq};
 use middle::ty::{mt};
 use middle::ty;
 use middle::typeck::infer::{CoerceResult, resolve_type};
@@ -76,9 +76,9 @@ use middle::typeck::infer::combine::CombineFields;
 use middle::typeck::infer::sub::Sub;
 use middle::typeck::infer::to_str::InferStr;
 use middle::typeck::infer::resolve::try_resolve_tvar_shallow;
-use util::common::{indent, indenter};
+use util::common::indenter;
 
-use syntax::ast::{m_const, m_imm, m_mutbl};
+use syntax::ast::m_imm;
 use syntax::ast;
 
 // Note: Coerce is not actually a combiner, in that it does not

src/librustc/middle/typeck/infer/combine.rs

@@ -68,7 +68,7 @@ use util::common::indent;
 
 use core::result::{iter_vec2, map_vec2};
 use core::vec;
-use syntax::ast::{Onceness, purity, ret_style};
+use syntax::ast::{Onceness, purity};
 use syntax::ast;
 use syntax::opt_vec;
 use syntax::codemap::span;

src/librustc/middle/typeck/infer/glb.rs

@@ -21,8 +21,7 @@ use middle::typeck::infer::{cres, InferCtxt};
 use middle::typeck::isr_alist;
 use syntax::ast;
 use syntax::ast::{Many, Once, extern_fn, impure_fn, m_const, m_imm, m_mutbl};
-use syntax::ast::{noreturn, pure_fn, ret_style, return_val, unsafe_fn};
-use syntax::ast::{Onceness, purity};
+use syntax::ast::{pure_fn, unsafe_fn, Onceness, purity};
 use syntax::codemap::span;
 use util::common::{indent, indenter};
 use util::ppaux::mt_to_str;

src/librustc/middle/typeck/infer/lub.rs

@@ -24,8 +24,8 @@ use util::ppaux::mt_to_str;
 
 use std::list;
 use syntax::ast;
-use syntax::ast::{Many, Once, extern_fn, m_const, impure_fn, noreturn};
-use syntax::ast::{pure_fn, ret_style, return_val, unsafe_fn};
+use syntax::ast::{Many, Once, extern_fn, m_const, impure_fn};
+use syntax::ast::{pure_fn, unsafe_fn};
 use syntax::ast::{Onceness, purity};
 use syntax::codemap::span;
 

src/librustc/middle/typeck/infer/mod.rs

@@ -264,16 +264,16 @@ use middle::typeck::infer::sub::Sub;
 use middle::typeck::infer::to_str::InferStr;
 use middle::typeck::infer::unify::{ValsAndBindings, Root};
 use middle::typeck::isr_alist;
-use util::common::{indent, indenter};
-use util::ppaux::{bound_region_to_str, ty_to_str, mt_to_str};
+use util::common::indent;
+use util::ppaux::{bound_region_to_str, ty_to_str};
 
 use core::cmp::Eq;
-use core::result::{Result, Ok, Err, map_vec, map_vec2, iter_vec2};
+use core::result::{Result, Ok, Err};
 use core::result;
 use core::vec;
 use std::list::Nil;
 use std::smallintmap::SmallIntMap;
-use syntax::ast::{m_const, m_imm, m_mutbl};
+use syntax::ast::{m_imm, m_mutbl};
 use syntax::ast;
 use syntax::codemap;
 use syntax::codemap::span;

src/librustc/middle/typeck/infer/region_inference.rs

@@ -549,7 +549,7 @@ use util::ppaux::note_and_explain_region;
 
 use core::cell::{Cell, empty_cell};
 use core::hashmap::linear::{LinearMap, LinearSet};
-use core::result::{Err, Ok, Result};
+use core::result::{Err, Ok};
 use core::to_bytes;
 use core::uint;
 use core::vec;

src/librustc/middle/typeck/infer/sub.rs

@@ -25,7 +25,7 @@ use util::ppaux::bound_region_to_str;
 use std::list::Nil;
 use std::list;
 use syntax::ast;
-use syntax::ast::{Onceness, m_const, purity, ret_style};
+use syntax::ast::{Onceness, m_const, purity};
 use syntax::codemap::span;
 
 

src/librustc/middle/typeck/infer/to_str.rs

@@ -11,14 +11,14 @@
 use core::prelude::*;
 
 use middle::ty::{FnSig, Vid};
-use middle::ty::{IntVarValue, IntType, UintType};
+use middle::ty::IntVarValue;
 use middle::ty;
 use middle::typeck::infer::{Bound, Bounds};
 use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::unify::{Redirect, Root, VarValue};
 use util::ppaux::{mt_to_str, ty_to_str};
 
-use syntax::{ast, ast_util};
+use syntax::ast;
 
 use core::uint;
 use core::str;

src/librustc/middle/typeck/infer/unify.rs

@@ -13,7 +13,7 @@ use std::smallintmap::SmallIntMap;
 
 use middle::ty::{Vid, expected_found, IntVarValue};
 use middle::ty;
-use middle::typeck::infer::{Bound, Bounds, cres, uok, ures};
+use middle::typeck::infer::{Bounds, uok, ures};
 use middle::typeck::infer::InferCtxt;
 use middle::typeck::infer::to_str::InferStr;
 use syntax::ast;

src/librustc/middle/typeck/mod.rs

@@ -58,11 +58,11 @@ use util::ppaux;
 use core::hashmap::linear::LinearMap;
 use core::result;
 use core::vec;
-use std::list::{List, Nil, Cons};
+use std::list::List;
 use std::list;
-use syntax::codemap::{span, spanned, respan};
+use syntax::codemap::span;
 use syntax::print::pprust::*;
-use syntax::{ast, ast_util, ast_map};
+use syntax::{ast, ast_map};
 
 #[path = "check/mod.rs"]
 pub mod check;

src/librustc/util/ppaux.rs

@@ -11,7 +11,7 @@
 use core::prelude::*;
 
 use middle::ty;
-use middle::ty::{arg, canon_mode};
+use middle::ty::canon_mode;
 use middle::ty::{bound_region, br_anon, br_named, br_self, br_cap_avoid,
                  br_fresh};
 use middle::ty::{ctxt, field, method};
@@ -27,7 +27,7 @@ use middle::ty::{ty_uint, ty_unboxed_vec, ty_infer};
 use metadata::encoder;
 use syntax::codemap::span;
 use syntax::print::pprust;
-use syntax::print::pprust::{path_to_str, mode_to_str};
+use syntax::print::pprust::mode_to_str;
 use syntax::{ast, ast_util};
 use syntax::ast_map;
 

src/librustdoc/astsrv.rs

@@ -22,7 +22,7 @@ use core::prelude::*;
 use parse;
 
 use core::cell::Cell;
-use core::comm::{stream, Chan, SharedChan, Port};
+use core::comm::{stream, SharedChan, Port};
 use rustc::driver::driver;
 use rustc::driver::session::Session;
 use rustc::driver::session::{basic_options, options};

src/librustdoc/page_pass.rs

@@ -19,7 +19,7 @@ use core::prelude::*;
 
 use astsrv;
 use config;
-use doc::{ItemUtils, PageUtils};
+use doc::ItemUtils;
 use doc;
 use fold::Fold;
 use fold;
@@ -29,6 +29,8 @@ use util::NominalOp;
 use core::comm::*;
 use syntax::ast;
 
+#[cfg(test)] use doc::PageUtils;
+
 pub fn mk_pass(output_style: config::OutputStyle) -> Pass {
     Pass {
         name: ~"page",

src/librusti/rusti.rc

@@ -29,9 +29,9 @@ extern mod rustc(vers = "0.6");
 extern mod syntax(vers = "0.6");
 
 use core::*;
-use core::io::{ReaderUtil, WriterUtil};
+use core::io::WriterUtil;
 use rustc::driver::{driver, session};
-use syntax::{ast, ast_util, codemap, diagnostic, fold, parse, print, visit};
+use syntax::{ast, diagnostic};
 use syntax::ast_util::*;
 use syntax::parse::token;
 use syntax::print::{pp, pprust};

src/librustpkg/rustpkg.rc

@@ -29,14 +29,13 @@ extern mod syntax(vers = "0.6");
 use core::*;
 use core::container::Map;
 use core::hashmap::linear::LinearMap;
-use core::io::{ReaderUtil, WriterUtil};
+use core::io::WriterUtil;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
 use std::net::url;
 use std::{json, semver, getopts};
 use syntax::codemap::spanned;
-use syntax::{ast, attr, codemap, diagnostic, parse, visit};
-
+use syntax::{ast, diagnostic};
 use util::Package;
 
 mod usage;

src/librustpkg/util.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 use core::*;
-use core::hash::{Hash, HashUtil, Streaming};
+use core::hash::Streaming;
 use core::hashmap::linear::LinearMap;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
@@ -17,10 +17,10 @@ use std::getopts::groups::getopts;
 use std::semver;
 use std::{json, term, sort, getopts};
 use syntax::ast_util::*;
-use syntax::codemap::{span, dummy_sp, spanned};
+use syntax::codemap::{dummy_sp, spanned};
 use syntax::ext::base::{mk_ctxt, ext_ctxt};
 use syntax::ext::build;
-use syntax::{ast, attr, codemap, diagnostic, fold, parse, visit};
+use syntax::{ast, attr, codemap, diagnostic, fold};
 
 pub struct Package {
     id: ~str,

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() {

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;

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;