diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 070d7ca1eef..a063b856468 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -12,8 +12,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use prelude::v1::*; - use mem; use ops::Range; use iter::FusedIterator; @@ -454,7 +452,6 @@ static ASCII_UPPERCASE_MAP: [u8; 256] = [ #[cfg(test)] mod tests { - use prelude::v1::*; use super::*; use char::from_u32; diff --git a/src/libstd/collections/hash/map.rs b/src/libstd/collections/hash/map.rs index ba27fafa59a..14da36ca483 100644 --- a/src/libstd/collections/hash/map.rs +++ b/src/libstd/collections/hash/map.rs @@ -2059,8 +2059,6 @@ fn assert_covariance() { #[cfg(test)] mod test_map { - use prelude::v1::*; - use super::HashMap; use super::Entry::{Occupied, Vacant}; use cell::RefCell; diff --git a/src/libstd/collections/hash/set.rs b/src/libstd/collections/hash/set.rs index 96efff86abf..ca5137e9573 100644 --- a/src/libstd/collections/hash/set.rs +++ b/src/libstd/collections/hash/set.rs @@ -1067,8 +1067,6 @@ fn assert_covariance() { #[cfg(test)] mod test_set { - use prelude::v1::*; - use super::HashSet; #[test] diff --git a/src/libstd/env.rs b/src/libstd/env.rs index 753411991ab..7a94c396218 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -16,8 +16,6 @@ #![stable(feature = "env", since = "1.0.0")] -use prelude::v1::*; - use error::Error; use ffi::{OsStr, OsString}; use fmt; @@ -950,7 +948,6 @@ mod arch { #[cfg(test)] mod tests { - use prelude::v1::*; use super::*; use iter::repeat; diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 914599271ac..44595361fb5 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -48,16 +48,15 @@ // reconsider what crate these items belong in. use any::TypeId; -use boxed::Box; use cell; use char; use fmt::{self, Debug, Display}; -use marker::{Send, Sync, Reflect}; +use marker::Reflect; use mem::transmute; use num; use raw::TraitObject; use str; -use string::{self, String}; +use string; /// Base functionality for all errors in Rust. #[stable(feature = "rust1", since = "1.0.0")] @@ -454,7 +453,6 @@ impl Error + Send + Sync { #[cfg(test)] mod tests { - use prelude::v1::*; use super::Error; use fmt; diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 5dae1a09bf4..38222c014f6 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -9,25 +9,18 @@ // except according to those terms. use ascii; -use borrow::{Cow, ToOwned, Borrow}; -use boxed::Box; -use convert::{Into, From}; -use cmp::{PartialEq, Eq, PartialOrd, Ord, Ordering}; +use borrow::{Cow, Borrow}; +use cmp::Ordering; use error::Error; use fmt::{self, Write}; use io; -use iter::Iterator; use libc; use mem; use memchr; use ops; -use option::Option::{self, Some, None}; use os::raw::c_char; -use result::Result::{self, Ok, Err}; use slice; use str::{self, Utf8Error}; -use string::String; -use vec::Vec; /// A type representing an owned C-compatible string /// @@ -700,7 +693,6 @@ impl AsRef for CString { #[cfg(test)] mod tests { - use prelude::v1::*; use super::*; use os::raw::c_char; use borrow::Cow::{Borrowed, Owned}; diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs index 3d23a9a2383..36cf4ef758d 100644 --- a/src/libstd/ffi/os_str.rs +++ b/src/libstd/ffi/os_str.rs @@ -8,14 +8,12 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use borrow::{Borrow, Cow, ToOwned}; +use borrow::{Borrow, Cow}; use fmt::{self, Debug}; use mem; -use string::String; use ops; use cmp; use hash::{Hash, Hasher}; -use vec::Vec; use sys::os_str::{Buf, Slice}; use sys_common::{AsInner, IntoInner, FromInner}; diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs index b78db24e44b..f2374e722c1 100644 --- a/src/libstd/fs.rs +++ b/src/libstd/fs.rs @@ -23,7 +23,6 @@ use io::{self, SeekFrom, Seek, Read, Write}; use path::{Path, PathBuf}; use sys::fs as fs_imp; use sys_common::{AsInnerMut, FromInner, AsInner, IntoInner}; -use vec::Vec; use time::SystemTime; /// A reference to an open file on the filesystem. @@ -1677,7 +1676,6 @@ impl AsInnerMut for DirBuilder { #[cfg(test)] mod tests { - use prelude::v1::*; use io::prelude::*; use fs::{self, File, OpenOptions}; diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index a92ca95f4ee..a26a932ad2d 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -10,7 +10,6 @@ //! Buffering wrappers for I/O traits -use prelude::v1::*; use io::prelude::*; use marker::Reflect; @@ -788,7 +787,6 @@ impl fmt::Debug for LineWriter where W: fmt::Debug { #[cfg(test)] mod tests { - use prelude::v1::*; use io::prelude::*; use io::{self, BufReader, BufWriter, LineWriter, SeekFrom}; use sync::atomic::{AtomicUsize, Ordering}; diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 2d780559db1..1b836b74537 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use io::prelude::*; use cmp; @@ -284,7 +283,6 @@ impl Write for Cursor> { mod tests { use io::prelude::*; use io::{Cursor, SeekFrom}; - use vec::Vec; #[test] fn test_vec_writer() { diff --git a/src/libstd/io/error.rs b/src/libstd/io/error.rs index 5333b0a531e..d90be2e08a9 100644 --- a/src/libstd/io/error.rs +++ b/src/libstd/io/error.rs @@ -8,12 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use boxed::Box; -use convert::Into; use error; use fmt; -use marker::{Send, Sync}; -use option::Option::{self, Some, None}; use result; use sys; @@ -522,7 +518,6 @@ fn _assert_error_is_sync_send() { #[cfg(test)] mod test { - use prelude::v1::*; use super::{Error, ErrorKind}; use error; use fmt; diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs index 31799381563..cd05e6b5de9 100644 --- a/src/libstd/io/impls.rs +++ b/src/libstd/io/impls.rs @@ -8,13 +8,10 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use boxed::Box; use cmp; use io::{self, SeekFrom, Read, Write, Seek, BufRead, Error, ErrorKind}; use fmt; use mem; -use string::String; -use vec::Vec; // ============================================================================= // Forwarding implementations @@ -228,7 +225,6 @@ impl Write for Vec { #[cfg(test)] mod tests { use io::prelude::*; - use vec::Vec; use test; #[bench] diff --git a/src/libstd/io/lazy.rs b/src/libstd/io/lazy.rs index 11551601207..ce205c3b11c 100644 --- a/src/libstd/io/lazy.rs +++ b/src/libstd/io/lazy.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use cell::Cell; use ptr; use sync::Arc; diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 307d014fd68..1053792cd43 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -253,15 +253,8 @@ use cmp; use rustc_unicode::str as core_str; use error as std_error; use fmt; -use iter::{Iterator}; -use marker::Sized; -use ops::{Drop, FnOnce}; -use option::Option::{self, Some, None}; -use result::Result::{Ok, Err}; use result; -use string::String; use str; -use vec::Vec; use memchr; #[stable(feature = "rust1", since = "1.0.0")] @@ -1734,7 +1727,6 @@ impl Iterator for Lines { #[cfg(test)] mod tests { - use prelude::v1::*; use io::prelude::*; use io; use super::Cursor; diff --git a/src/libstd/io/stdio.rs b/src/libstd/io/stdio.rs index b8b66a58359..9a782e95f6e 100644 --- a/src/libstd/io/stdio.rs +++ b/src/libstd/io/stdio.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use io::prelude::*; use cell::{RefCell, BorrowState}; diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index c8b52fc0467..2c6880281b5 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -167,8 +167,6 @@ impl Write for Sink { #[cfg(test)] mod tests { - use prelude::v1::*; - use io::prelude::*; use io::{copy, sink, empty, repeat}; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index d4644a190f4..9a8cd0c712f 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -252,6 +252,7 @@ #![feature(optin_builtin_traits)] #![feature(panic_unwind)] #![feature(placement_in_syntax)] +#![feature(prelude_import)] #![feature(question_mark)] #![feature(rand)] #![feature(raw)] @@ -292,6 +293,10 @@ #![allow(unused_features)] // std may use features in a platform-specific way #![cfg_attr(not(stage0), deny(warnings))] +#[prelude_import] +#[allow(unused)] +use prelude::v1::*; + #[cfg(test)] extern crate test; // We want to reexport a few macros from core but libcore has already been diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs index b93ca8277e6..d0b59b42c17 100644 --- a/src/libstd/net/addr.rs +++ b/src/libstd/net/addr.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use fmt; use hash; use io; @@ -523,7 +521,6 @@ impl<'a, T: ToSocketAddrs + ?Sized> ToSocketAddrs for &'a T { #[cfg(test)] mod tests { - use prelude::v1::*; use net::*; use net::test::{tsa, sa6, sa4}; diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 4c3b993497c..c6a7a77e68a 100644 --- a/src/libstd/net/ip.rs +++ b/src/libstd/net/ip.rs @@ -653,7 +653,6 @@ impl From<[u8; 16]> for Ipv6Addr { // Tests for this module #[cfg(test)] mod tests { - use prelude::v1::*; use net::*; use net::Ipv6MulticastScope::*; use net::test::{tsa, sa6, sa4}; diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs index 11a16b27113..2a78afa85f7 100644 --- a/src/libstd/net/mod.rs +++ b/src/libstd/net/mod.rs @@ -12,8 +12,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use prelude::v1::*; - use io::{self, Error, ErrorKind}; use sys_common::net as net_imp; diff --git a/src/libstd/net/parser.rs b/src/libstd/net/parser.rs index 5851ce7135d..854d87c4cbe 100644 --- a/src/libstd/net/parser.rs +++ b/src/libstd/net/parser.rs @@ -13,8 +13,6 @@ //! This module is "publicly exported" through the `FromStr` implementations //! below. -use prelude::v1::*; - use error::Error; use fmt; use net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6}; diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index 76617f15970..dcd3652af87 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use io::prelude::*; use fmt; @@ -438,8 +437,6 @@ impl fmt::Debug for TcpListener { #[cfg(test)] mod tests { - use prelude::v1::*; - use io::ErrorKind; use io::prelude::*; use net::*; diff --git a/src/libstd/net/test.rs b/src/libstd/net/test.rs index 9665fd72287..98ac61f6461 100644 --- a/src/libstd/net/test.rs +++ b/src/libstd/net/test.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use env; use net::{SocketAddr, SocketAddrV4, SocketAddrV6, Ipv4Addr, Ipv6Addr, ToSocketAddrs}; use sync::atomic::{AtomicUsize, Ordering}; diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index 9d0279deb1b..781f026c12c 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -355,8 +355,6 @@ impl fmt::Debug for UdpSocket { #[cfg(test)] mod tests { - use prelude::v1::*; - use io::ErrorKind; use net::*; use net::test::{next_test_ip4, next_test_ip6}; diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs index 20804d62dfa..d1c2fc3d3fc 100644 --- a/src/libstd/num/mod.rs +++ b/src/libstd/num/mod.rs @@ -24,9 +24,7 @@ pub use core::num::{FpCategory, ParseIntError, ParseFloatError, TryFromIntError} #[stable(feature = "rust1", since = "1.0.0")] pub use core::num::Wrapping; -#[cfg(test)] use cmp::PartialEq; #[cfg(test)] use fmt; -#[cfg(test)] use marker::Copy; #[cfg(test)] use ops::{Add, Sub, Mul, Div, Rem}; /// Helper function for testing numeric operations @@ -52,7 +50,6 @@ mod tests { use u32; use u64; use usize; - use string::ToString; use ops::Mul; #[test] @@ -287,7 +284,6 @@ mod tests { mod bench { extern crate test; use self::test::Bencher; - use prelude::v1::*; #[bench] fn bench_pow_function(b: &mut Bencher) { diff --git a/src/libstd/panic.rs b/src/libstd/panic.rs index 2f67081e0d7..47f594a9b0c 100644 --- a/src/libstd/panic.rs +++ b/src/libstd/panic.rs @@ -13,7 +13,6 @@ #![stable(feature = "std_panic", since = "1.9.0")] use any::Any; -use boxed::Box; use cell::UnsafeCell; use ops::{Deref, DerefMut}; use panicking; diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs index 5961fd59699..0c10dcbdad6 100644 --- a/src/libstd/panicking.rs +++ b/src/libstd/panicking.rs @@ -17,7 +17,6 @@ //! * Executing a panic up to doing the actual implementation //! * Shims around "try" -use prelude::v1::*; use io::prelude::*; use any::Any; diff --git a/src/libstd/path.rs b/src/libstd/path.rs index bc8fd66a438..67219b6fd1b 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -100,7 +100,7 @@ #![stable(feature = "rust1", since = "1.0.0")] use ascii::*; -use borrow::{Borrow, ToOwned, Cow}; +use borrow::{Borrow, Cow}; use cmp; use error::Error; use fmt; @@ -110,8 +110,6 @@ use io; use iter::{self, FusedIterator}; use mem; use ops::{self, Deref}; -use string::String; -use vec::Vec; use ffi::{OsStr, OsString}; @@ -2152,8 +2150,6 @@ impl Error for StripPrefixError { #[cfg(test)] mod tests { use super::*; - use string::{ToString, String}; - use vec::Vec; macro_rules! t( ($path:expr, iter: $iter:expr) => ( diff --git a/src/libstd/process.rs b/src/libstd/process.rs index 660c098d30b..f0c44430700 100644 --- a/src/libstd/process.rs +++ b/src/libstd/process.rs @@ -12,7 +12,6 @@ #![stable(feature = "process", since = "1.0.0")] -use prelude::v1::*; use io::prelude::*; use ffi::OsStr; @@ -810,7 +809,6 @@ pub fn exit(code: i32) -> ! { #[cfg(test)] mod tests { - use prelude::v1::*; use io::prelude::*; use io::ErrorKind; diff --git a/src/libstd/rt.rs b/src/libstd/rt.rs index a3d9e4db7d1..e3de1efaa31 100644 --- a/src/libstd/rt.rs +++ b/src/libstd/rt.rs @@ -30,7 +30,6 @@ pub use panicking::{begin_panic, begin_panic_fmt, update_panic_count}; #[cfg(not(test))] #[lang = "start"] fn lang_start(main: *const u8, argc: isize, argv: *const *const u8) -> isize { - use borrow::ToOwned; use mem; use panic; use sys; diff --git a/src/libstd/sync/barrier.rs b/src/libstd/sync/barrier.rs index b1267acdee6..ac0f400379e 100644 --- a/src/libstd/sync/barrier.rs +++ b/src/libstd/sync/barrier.rs @@ -113,8 +113,6 @@ impl BarrierWaitResult { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::{Arc, Barrier}; use sync::mpsc::{channel, TryRecvError}; use thread; diff --git a/src/libstd/sync/condvar.rs b/src/libstd/sync/condvar.rs index 3c52ebc72f2..1f480f6d4a9 100644 --- a/src/libstd/sync/condvar.rs +++ b/src/libstd/sync/condvar.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use sync::atomic::{AtomicUsize, Ordering}; use sync::{mutex, MutexGuard, PoisonError}; use sys_common::condvar as sys; @@ -245,8 +243,6 @@ impl Drop for Condvar { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::mpsc::channel; use sync::{Condvar, Mutex, Arc}; use thread; diff --git a/src/libstd/sync/mpsc/blocking.rs b/src/libstd/sync/mpsc/blocking.rs index 4a70de0e7d8..0f9ef6fabb0 100644 --- a/src/libstd/sync/mpsc/blocking.rs +++ b/src/libstd/sync/mpsc/blocking.rs @@ -13,9 +13,7 @@ use thread::{self, Thread}; use sync::atomic::{AtomicBool, Ordering}; use sync::Arc; -use marker::{Sync, Send}; use mem; -use clone::Clone; use time::Instant; struct Inner { diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index d8b8c6a77a2..3d9f81413dc 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -1270,8 +1270,6 @@ impl error::Error for TryRecvError { #[cfg(test)] mod tests { - use prelude::v1::*; - use env; use super::*; use thread; @@ -1946,8 +1944,6 @@ mod tests { #[cfg(test)] mod sync_tests { - use prelude::v1::*; - use env; use thread; use super::*; diff --git a/src/libstd/sync/mpsc/mpsc_queue.rs b/src/libstd/sync/mpsc/mpsc_queue.rs index 6a6c19cfcc3..d926043fbbc 100644 --- a/src/libstd/sync/mpsc/mpsc_queue.rs +++ b/src/libstd/sync/mpsc/mpsc_queue.rs @@ -148,8 +148,6 @@ impl Drop for Queue { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::mpsc::channel; use super::{Queue, Data, Empty, Inconsistent}; use sync::Arc; diff --git a/src/libstd/sync/mpsc/select.rs b/src/libstd/sync/mpsc/select.rs index 5aa4ce81b8a..677544d335e 100644 --- a/src/libstd/sync/mpsc/select.rs +++ b/src/libstd/sync/mpsc/select.rs @@ -369,8 +369,6 @@ impl<'rx, T:Send+'rx> fmt::Debug for Handle<'rx, T> { #[cfg(test)] #[allow(unused_imports)] mod tests { - use prelude::v1::*; - use thread; use sync::mpsc::*; diff --git a/src/libstd/sync/mpsc/spsc_queue.rs b/src/libstd/sync/mpsc/spsc_queue.rs index 02506e7c2f3..724d7b1be73 100644 --- a/src/libstd/sync/mpsc/spsc_queue.rs +++ b/src/libstd/sync/mpsc/spsc_queue.rs @@ -233,8 +233,6 @@ impl Drop for Queue { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::Arc; use super::Queue; use thread; diff --git a/src/libstd/sync/mpsc/sync.rs b/src/libstd/sync/mpsc/sync.rs index 9d13a71ff95..9985daaba8f 100644 --- a/src/libstd/sync/mpsc/sync.rs +++ b/src/libstd/sync/mpsc/sync.rs @@ -36,7 +36,6 @@ pub use self::Failure::*; use self::Blocker::*; -use vec::Vec; use core::mem; use core::ptr; diff --git a/src/libstd/sync/mutex.rs b/src/libstd/sync/mutex.rs index 6bc458397f1..c8ae88c2331 100644 --- a/src/libstd/sync/mutex.rs +++ b/src/libstd/sync/mutex.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use cell::UnsafeCell; use fmt; use marker; @@ -355,8 +353,6 @@ pub fn guard_poison<'a, T: ?Sized>(guard: &MutexGuard<'a, T>) -> &'a poison::Fla #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::mpsc::channel; use sync::{Arc, Mutex, Condvar}; use sync::atomic::{AtomicUsize, Ordering}; diff --git a/src/libstd/sync/once.rs b/src/libstd/sync/once.rs index 54c1fe6c564..86d2986959c 100644 --- a/src/libstd/sync/once.rs +++ b/src/libstd/sync/once.rs @@ -369,8 +369,6 @@ impl OnceState { #[cfg(test)] mod tests { - use prelude::v1::*; - use panic; use sync::mpsc::channel; use thread; diff --git a/src/libstd/sync/rwlock.rs b/src/libstd/sync/rwlock.rs index 65b5686de86..4801bcffd08 100644 --- a/src/libstd/sync/rwlock.rs +++ b/src/libstd/sync/rwlock.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use cell::UnsafeCell; use fmt; use marker; @@ -385,8 +383,6 @@ impl<'a, T: ?Sized> Drop for RwLockWriteGuard<'a, T> { mod tests { #![allow(deprecated)] // rand - use prelude::v1::*; - use rand::{self, Rng}; use sync::mpsc::channel; use thread; @@ -552,8 +548,6 @@ mod tests { #[test] fn test_rwlock_try_write() { - use mem::drop; - let lock = RwLock::new(0isize); let read_guard = lock.read().unwrap(); diff --git a/src/libstd/sys/common/args.rs b/src/libstd/sys/common/args.rs index e877391fb8b..fad2c277da4 100644 --- a/src/libstd/sys/common/args.rs +++ b/src/libstd/sys/common/args.rs @@ -21,8 +21,6 @@ #![allow(dead_code)] // different code on OSX/linux/etc -use vec::Vec; - /// One-time global initialization. pub unsafe fn init(argc: isize, argv: *const *const u8) { imp::init(argc, argv) } @@ -42,8 +40,6 @@ pub fn clone() -> Option>> { imp::clone() } target_os = "solaris", target_os = "emscripten"))] mod imp { - use prelude::v1::*; - use libc::c_char; use mem; use ffi::CStr; @@ -91,8 +87,6 @@ mod imp { target_os = "ios", target_os = "windows"))] mod imp { - use vec::Vec; - pub unsafe fn init(_argc: isize, _argv: *const *const u8) { } diff --git a/src/libstd/sys/common/at_exit_imp.rs b/src/libstd/sys/common/at_exit_imp.rs index b2683750d67..ce6fd4cb075 100644 --- a/src/libstd/sys/common/at_exit_imp.rs +++ b/src/libstd/sys/common/at_exit_imp.rs @@ -13,10 +13,8 @@ //! Documentation can be found on the `rt::at_exit` function. use alloc::boxed::FnBox; -use boxed::Box; use ptr; use sys_common::mutex::Mutex; -use vec::Vec; type Queue = Vec>; diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys/common/backtrace.rs index 4c23ceb63f2..c1d1792363d 100644 --- a/src/libstd/sys/common/backtrace.rs +++ b/src/libstd/sys/common/backtrace.rs @@ -191,7 +191,6 @@ pub fn demangle(writer: &mut Write, s: &str) -> io::Result<()> { #[cfg(test)] mod tests { - use prelude::v1::*; use sys_common; macro_rules! t { ($a:expr, $b:expr) => ({ let mut m = Vec::new(); diff --git a/src/libstd/sys/common/io.rs b/src/libstd/sys/common/io.rs index 7b08852ba51..3cd70eddb85 100644 --- a/src/libstd/sys/common/io.rs +++ b/src/libstd/sys/common/io.rs @@ -7,7 +7,6 @@ // , at your // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use io; use io::ErrorKind; use io::Read; @@ -53,7 +52,6 @@ pub unsafe fn read_to_end_uninitialized(r: &mut Read, buf: &mut Vec) -> io:: #[cfg(test)] pub mod test { - use prelude::v1::*; use path::{Path, PathBuf}; use env; use rand::{self, Rng}; @@ -93,7 +91,6 @@ pub mod test { #[cfg(test)] mod tests { - use prelude::v1::*; use io::prelude::*; use super::*; use io; diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys/common/mod.rs index a1f3f477b3a..d1ca6765107 100644 --- a/src/libstd/sys/common/mod.rs +++ b/src/libstd/sys/common/mod.rs @@ -10,7 +10,6 @@ #![allow(missing_docs)] -use boxed::Box; use sync::Once; use sys; diff --git a/src/libstd/sys/common/mutex.rs b/src/libstd/sys/common/mutex.rs index 7a2183c522f..d1a738770d3 100644 --- a/src/libstd/sys/common/mutex.rs +++ b/src/libstd/sys/common/mutex.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use marker::Sync; use sys::mutex as imp; /// An OS-based mutual exclusion lock. diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys/common/net.rs index 442618c55b3..a777cfe35e5 100644 --- a/src/libstd/sys/common/net.rs +++ b/src/libstd/sys/common/net.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use cmp; use ffi::CString; use fmt; @@ -608,8 +606,6 @@ impl fmt::Debug for UdpSocket { #[cfg(test)] mod tests { - use prelude::v1::*; - use super::*; use collections::HashMap; diff --git a/src/libstd/sys/common/remutex.rs b/src/libstd/sys/common/remutex.rs index 39d41042467..cbdeaad7f6b 100644 --- a/src/libstd/sys/common/remutex.rs +++ b/src/libstd/sys/common/remutex.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use fmt; use marker; use ops::Deref; @@ -160,7 +158,6 @@ impl<'a, T> Drop for ReentrantMutexGuard<'a, T> { #[cfg(test)] mod tests { - use prelude::v1::*; use sys_common::remutex::{ReentrantMutex, ReentrantMutexGuard}; use cell::RefCell; use sync::Arc; diff --git a/src/libstd/sys/common/thread.rs b/src/libstd/sys/common/thread.rs index 16f4f01bf39..3ee160da5fa 100644 --- a/src/libstd/sys/common/thread.rs +++ b/src/libstd/sys/common/thread.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use alloc::boxed::FnBox; use libc; use sys::stack_overflow; diff --git a/src/libstd/sys/common/thread_info.rs b/src/libstd/sys/common/thread_info.rs index 0467c67167b..95d8b6cc951 100644 --- a/src/libstd/sys/common/thread_info.rs +++ b/src/libstd/sys/common/thread_info.rs @@ -11,7 +11,6 @@ #![allow(dead_code)] // stack_guard isn't used right now on all platforms use cell::RefCell; -use string::String; use thread::Thread; use thread::LocalKeyState; diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys/common/thread_local.rs index 56885cdd56d..25a9d5720d9 100644 --- a/src/libstd/sys/common/thread_local.rs +++ b/src/libstd/sys/common/thread_local.rs @@ -233,7 +233,6 @@ impl Drop for Key { #[cfg(test)] mod tests { - use prelude::v1::*; use super::{Key, StaticKey}; fn assert_sync() {} diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys/common/wtf8.rs index c1b4f8a8c88..8d357aa78c9 100644 --- a/src/libstd/sys/common/wtf8.rs +++ b/src/libstd/sys/common/wtf8.rs @@ -37,9 +37,7 @@ use mem; use ops; use slice; use str; -use string::String; use sys_common::AsInner; -use vec::Vec; const UTF8_REPLACEMENT_CHARACTER: &'static [u8] = b"\xEF\xBF\xBD"; @@ -807,7 +805,6 @@ impl AsciiExt for Wtf8 { #[cfg(test)] mod tests { - use prelude::v1::*; use borrow::Cow; use super::*; diff --git a/src/libstd/sys/unix/ext/ffi.rs b/src/libstd/sys/unix/ext/ffi.rs index 825e74cabde..d59b4fc0b70 100644 --- a/src/libstd/sys/unix/ext/ffi.rs +++ b/src/libstd/sys/unix/ext/ffi.rs @@ -14,7 +14,6 @@ use ffi::{OsStr, OsString}; use mem; -use prelude::v1::*; use sys::os_str::Buf; use sys_common::{FromInner, IntoInner, AsInner}; diff --git a/src/libstd/sys/unix/ext/net.rs b/src/libstd/sys/unix/ext/net.rs index a4564b9543b..3f93fce1935 100644 --- a/src/libstd/sys/unix/ext/net.rs +++ b/src/libstd/sys/unix/ext/net.rs @@ -14,7 +14,6 @@ use libc; -use prelude::v1::*; use ascii; use ffi::OsStr; use fmt; @@ -789,7 +788,6 @@ impl IntoRawFd for UnixDatagram { #[cfg(test)] mod test { - use prelude::v1::*; use thread; use io; use io::prelude::*; diff --git a/src/libstd/sys/unix/ext/process.rs b/src/libstd/sys/unix/ext/process.rs index dd70ba2e490..5bd92f2eb57 100644 --- a/src/libstd/sys/unix/ext/process.rs +++ b/src/libstd/sys/unix/ext/process.rs @@ -12,8 +12,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use prelude::v1::*; - use io; use os::unix::io::{FromRawFd, RawFd, AsRawFd, IntoRawFd}; use process; diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs index b99f4a2eacd..b2b1f16f20a 100644 --- a/src/libstd/sys/unix/fd.rs +++ b/src/libstd/sys/unix/fd.rs @@ -10,8 +10,6 @@ #![unstable(reason = "not public", issue = "0", feature = "fd")] -use prelude::v1::*; - use io::{self, Read}; use libc::{self, c_int, size_t, c_void}; use mem; diff --git a/src/libstd/sys/unix/fs.rs b/src/libstd/sys/unix/fs.rs index 3b132744f70..e6fe3eb112a 100644 --- a/src/libstd/sys/unix/fs.rs +++ b/src/libstd/sys/unix/fs.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use os::unix::prelude::*; use ffi::{CString, CStr, OsString, OsStr}; @@ -534,7 +533,6 @@ impl fmt::Debug for File { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { #[cfg(target_os = "linux")] fn get_path(fd: c_int) -> Option { - use string::ToString; let mut p = PathBuf::from("/proc/self/fd"); p.push(&fd.to_string()); readlink(&p).ok() diff --git a/src/libstd/sys/unix/net.rs b/src/libstd/sys/unix/net.rs index 6f1b70acb60..3f77abd7f44 100644 --- a/src/libstd/sys/unix/net.rs +++ b/src/libstd/sys/unix/net.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use ffi::CStr; use io; use libc::{self, c_int, size_t, sockaddr, socklen_t}; diff --git a/src/libstd/sys/unix/os.rs b/src/libstd/sys/unix/os.rs index c29e87f91c9..e61804efd50 100644 --- a/src/libstd/sys/unix/os.rs +++ b/src/libstd/sys/unix/os.rs @@ -12,7 +12,6 @@ #![allow(unused_imports)] // lots of cfg code here -use prelude::v1::*; use os::unix::prelude::*; use error::Error as StdError; diff --git a/src/libstd/sys/unix/os_str.rs b/src/libstd/sys/unix/os_str.rs index d5eea5d1f3b..5a733c0cb87 100644 --- a/src/libstd/sys/unix/os_str.rs +++ b/src/libstd/sys/unix/os_str.rs @@ -13,9 +13,7 @@ use borrow::Cow; use fmt::{self, Debug}; -use vec::Vec; use str; -use string::String; use mem; use sys_common::{AsInner, IntoInner}; diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index 01059413338..ffe8032e460 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use cmp; use io; use libc::{self, c_int}; diff --git a/src/libstd/sys/unix/process.rs b/src/libstd/sys/unix/process.rs index d68867fb3d2..50014f51f6c 100644 --- a/src/libstd/sys/unix/process.rs +++ b/src/libstd/sys/unix/process.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use os::unix::prelude::*; use collections::hash_map::{HashMap, Entry}; @@ -593,7 +592,6 @@ impl Process { #[cfg(test)] mod tests { use super::*; - use prelude::v1::*; use ffi::OsStr; use mem; diff --git a/src/libstd/sys/unix/stdio.rs b/src/libstd/sys/unix/stdio.rs index 37d1d9a969e..972bdbc3818 100644 --- a/src/libstd/sys/unix/stdio.rs +++ b/src/libstd/sys/unix/stdio.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use io; use libc; use sys::fd::FileDesc; diff --git a/src/libstd/sys/unix/thread.rs b/src/libstd/sys/unix/thread.rs index 75e10d25853..5db7086e427 100644 --- a/src/libstd/sys/unix/thread.rs +++ b/src/libstd/sys/unix/thread.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use alloc::boxed::FnBox; use cmp; use ffi::CStr; @@ -193,8 +191,6 @@ pub mod guard { target_os = "solaris"))] #[cfg_attr(test, allow(dead_code))] pub mod guard { - use prelude::v1::*; - use libc; use libc::mmap; use libc::{PROT_NONE, MAP_PRIVATE, MAP_ANON, MAP_FAILED, MAP_FIXED}; diff --git a/src/libstd/sys/windows/compat.rs b/src/libstd/sys/windows/compat.rs index acbfacce8bd..cd42b7d05ee 100644 --- a/src/libstd/sys/windows/compat.rs +++ b/src/libstd/sys/windows/compat.rs @@ -21,8 +21,6 @@ //! manner we pay a semi-large one-time cost up front for detecting whether a //! function is available but afterwards it's just a load and a jump. -use prelude::v1::*; - use ffi::CString; use sync::atomic::{AtomicUsize, Ordering}; use sys::c; diff --git a/src/libstd/sys/windows/dynamic_lib.rs b/src/libstd/sys/windows/dynamic_lib.rs index dde13ec8364..5227280808f 100644 --- a/src/libstd/sys/windows/dynamic_lib.rs +++ b/src/libstd/sys/windows/dynamic_lib.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use os::windows::prelude::*; use ffi::{CString, OsStr}; diff --git a/src/libstd/sys/windows/fs.rs b/src/libstd/sys/windows/fs.rs index 4e6cef9a28d..fe448cdd78f 100644 --- a/src/libstd/sys/windows/fs.rs +++ b/src/libstd/sys/windows/fs.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use os::windows::prelude::*; use ffi::OsString; diff --git a/src/libstd/sys/windows/handle.rs b/src/libstd/sys/windows/handle.rs index d10abae2865..97e746ee345 100644 --- a/src/libstd/sys/windows/handle.rs +++ b/src/libstd/sys/windows/handle.rs @@ -10,8 +10,6 @@ #![unstable(issue = "0", feature = "windows_handle")] -use prelude::v1::*; - use cmp; use io::{ErrorKind, Read}; use io; diff --git a/src/libstd/sys/windows/mod.rs b/src/libstd/sys/windows/mod.rs index 12219c1e9d4..9741a704e8f 100644 --- a/src/libstd/sys/windows/mod.rs +++ b/src/libstd/sys/windows/mod.rs @@ -10,8 +10,6 @@ #![allow(missing_docs, bad_style)] -use prelude::v1::*; - use ffi::{OsStr, OsString}; use io::{self, ErrorKind}; use os::windows::ffi::{OsStrExt, OsStringExt}; diff --git a/src/libstd/sys/windows/mutex.rs b/src/libstd/sys/windows/mutex.rs index 8762b34e3da..85560368590 100644 --- a/src/libstd/sys/windows/mutex.rs +++ b/src/libstd/sys/windows/mutex.rs @@ -29,8 +29,6 @@ //! CriticalSection is used and we keep track of who's holding the mutex to //! detect recursive locks. -use prelude::v1::*; - use cell::UnsafeCell; use mem; use sync::atomic::{AtomicUsize, Ordering}; diff --git a/src/libstd/sys/windows/net.rs b/src/libstd/sys/windows/net.rs index 71e164f012f..aca6994503f 100644 --- a/src/libstd/sys/windows/net.rs +++ b/src/libstd/sys/windows/net.rs @@ -10,8 +10,6 @@ #![unstable(issue = "0", feature = "windows_net")] -use prelude::v1::*; - use cmp; use io::{self, Read}; use libc::{c_int, c_void, c_ulong}; diff --git a/src/libstd/sys/windows/os.rs b/src/libstd/sys/windows/os.rs index 0cea7f81e36..260fc3c4db6 100644 --- a/src/libstd/sys/windows/os.rs +++ b/src/libstd/sys/windows/os.rs @@ -12,7 +12,6 @@ #![allow(bad_style)] -use prelude::v1::*; use os::windows::prelude::*; use error::Error as StdError; diff --git a/src/libstd/sys/windows/os_str.rs b/src/libstd/sys/windows/os_str.rs index 26767a1349e..a065c7a7fd0 100644 --- a/src/libstd/sys/windows/os_str.rs +++ b/src/libstd/sys/windows/os_str.rs @@ -14,9 +14,6 @@ use borrow::Cow; use fmt::{self, Debug}; use sys_common::wtf8::{Wtf8, Wtf8Buf}; -use string::String; -use result::Result; -use option::Option; use mem; use sys_common::{AsInner, IntoInner}; diff --git a/src/libstd/sys/windows/pipe.rs b/src/libstd/sys/windows/pipe.rs index 6e9c67051a6..ed7e88e72cd 100644 --- a/src/libstd/sys/windows/pipe.rs +++ b/src/libstd/sys/windows/pipe.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; use os::windows::prelude::*; use ffi::OsStr; diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 3ca75cf3643..d371714ff0e 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use ascii::*; use collections::HashMap; use collections; @@ -491,7 +489,6 @@ fn make_dirp(d: Option<&OsString>) -> io::Result<(*const u16, Vec)> { #[cfg(test)] mod tests { - use prelude::v1::*; use ffi::{OsStr, OsString}; use super::make_command_line; diff --git a/src/libstd/sys/windows/stdio.rs b/src/libstd/sys/windows/stdio.rs index fa3cab2191e..01249f05f62 100644 --- a/src/libstd/sys/windows/stdio.rs +++ b/src/libstd/sys/windows/stdio.rs @@ -10,7 +10,6 @@ #![unstable(issue = "0", feature = "windows_stdio")] -use prelude::v1::*; use io::prelude::*; use cmp; diff --git a/src/libstd/sys/windows/thread.rs b/src/libstd/sys/windows/thread.rs index 0383e92c79e..5a376a867ee 100644 --- a/src/libstd/sys/windows/thread.rs +++ b/src/libstd/sys/windows/thread.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use alloc::boxed::FnBox; use io; use ffi::CStr; diff --git a/src/libstd/sys/windows/thread_local.rs b/src/libstd/sys/windows/thread_local.rs index 59da74b7287..5d3084094fb 100644 --- a/src/libstd/sys/windows/thread_local.rs +++ b/src/libstd/sys/windows/thread_local.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use prelude::v1::*; - use ptr; use sys::c; use sys_common::mutex::Mutex; diff --git a/src/libstd/thread/local.rs b/src/libstd/thread/local.rs index 152b9771086..c44dee49f14 100644 --- a/src/libstd/thread/local.rs +++ b/src/libstd/thread/local.rs @@ -369,7 +369,6 @@ pub mod elf { // Due to rust-lang/rust#18804, make sure this is not generic! #[cfg(target_os = "linux")] unsafe fn register_dtor(t: *mut u8, dtor: unsafe extern fn(*mut u8)) { - use prelude::v1::*; use mem; use libc; use sys_common::thread_local as os; @@ -460,8 +459,6 @@ pub mod elf { #[doc(hidden)] pub mod os { - use prelude::v1::*; - use cell::{Cell, UnsafeCell}; use marker; use ptr; @@ -529,8 +526,6 @@ pub mod os { #[cfg(test)] mod tests { - use prelude::v1::*; - use sync::mpsc::{channel, Sender}; use cell::{Cell, UnsafeCell}; use super::LocalKeyState; @@ -693,8 +688,6 @@ mod tests { #[cfg(test)] mod dynamic_tests { - use prelude::v1::*; - use cell::RefCell; use collections::HashMap; diff --git a/src/libstd/thread/mod.rs b/src/libstd/thread/mod.rs index f06c105d30e..f3e1710f50b 100644 --- a/src/libstd/thread/mod.rs +++ b/src/libstd/thread/mod.rs @@ -161,8 +161,6 @@ #![stable(feature = "rust1", since = "1.0.0")] -use prelude::v1::*; - use any::Any; use cell::UnsafeCell; use ffi::{CStr, CString}; @@ -732,8 +730,6 @@ fn _assert_sync_and_send() { #[cfg(test)] mod tests { - use prelude::v1::*; - use any::Any; use sync::mpsc::{channel, Sender}; use result; @@ -786,8 +782,6 @@ mod tests { #[test] fn test_spawn_sched() { - use clone::Clone; - let (tx, rx) = channel(); fn f(i: i32, tx: Sender<()>) {