From ac095351fba2750bddd84c3f434d16c1ed7f1640 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Mon, 29 Dec 2014 16:52:10 +1300
Subject: [PATCH] Fallout from globs/re-export/shadowing change
---
src/libcollections/slice.rs | 5 ++++-
src/libcollections/str.rs | 2 +-
src/libstd/c_str.rs | 3 ++-
src/libstd/comm/mod.rs | 5 +++--
src/libstd/io/mem.rs | 4 ++--
src/libstd/io/mod.rs | 4 ++--
src/libstd/io/net/pipe.rs | 2 +-
src/libstd/io/net/tcp.rs | 7 +++++--
src/libstd/io/net/udp.rs | 4 ++--
src/libstd/io/process.rs | 6 ++++--
src/libstd/io/util.rs | 2 +-
src/libstd/num/mod.rs | 6 ++++--
src/libstd/path/posix.rs | 2 +-
src/libstd/sync/atomic.rs | 2 +-
14 files changed, 33 insertions(+), 21 deletions(-)
diff --git a/src/libcollections/slice.rs b/src/libcollections/slice.rs
index d6d94f57acf..cca071836dd 100644
--- a/src/libcollections/slice.rs
+++ b/src/libcollections/slice.rs
@@ -1343,7 +1343,10 @@ pub mod raw {
#[cfg(test)]
mod tests {
use std::boxed::Box;
- use prelude::*;
+ use prelude::{Some, None, range, Vec, ToString, Clone, Greater, Less, Equal};
+ use prelude::{SliceExt, Iterator, IteratorExt, DoubleEndedIteratorExt};
+ use prelude::{OrdSliceExt, CloneSliceExt, PartialEqSliceExt, AsSlice};
+ use prelude::{RandomAccessIterator, Ord, VectorVector};
use core::cell::Cell;
use core::default::Default;
use core::mem;
diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs
index bccd2a1198a..5b26dc29478 100644
--- a/src/libcollections/str.rs
+++ b/src/libcollections/str.rs
@@ -3331,7 +3331,7 @@ mod tests {
#[cfg(test)]
mod bench {
use super::*;
- use prelude::*;
+ use prelude::{SliceExt, IteratorExt, DoubleEndedIteratorExt};
use test::Bencher;
use test::black_box;
diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs
index ffe19203769..39c57b99b36 100644
--- a/src/libstd/c_str.rs
+++ b/src/libstd/c_str.rs
@@ -537,7 +537,8 @@ pub unsafe fn from_c_multistring<F>(buf: *const libc::c_char,
#[cfg(test)]
mod tests {
use super::*;
- use prelude::*;
+ use prelude::{spawn, Some, None, Option, FnOnce, ToString, CloneSliceExt};
+ use prelude::{Clone, RawPtr, Iterator, SliceExt, StrExt};
use ptr;
use thread::Thread;
use libc;
diff --git a/src/libstd/comm/mod.rs b/src/libstd/comm/mod.rs
index 4b0b21ec8d8..a405627aecc 100644
--- a/src/libstd/comm/mod.rs
+++ b/src/libstd/comm/mod.rs
@@ -336,7 +336,8 @@ macro_rules! test {
use super::*;
use comm::*;
use thread::Thread;
- use prelude::*;
+ use prelude::{Ok, Err, spawn, range, drop, Box, Some, None, Option};
+ use prelude::{Vec, Buffer, from_str, Clone};
$(#[$a])* #[test] fn f() { $b }
}
@@ -1046,7 +1047,7 @@ unsafe impl<T> kinds::Sync for RacyCell<T> { } // Oh dear
#[cfg(test)]
mod test {
use super::*;
- use prelude::*;
+ use prelude::{spawn, range, Some, None, from_str, Clone, Str};
use os;
pub fn stress_factor() -> uint {
diff --git a/src/libstd/io/mem.rs b/src/libstd/io/mem.rs
index 01151059530..ccece874ce7 100644
--- a/src/libstd/io/mem.rs
+++ b/src/libstd/io/mem.rs
@@ -400,8 +400,8 @@ impl<'a> Buffer for BufReader<'a> {
mod test {
extern crate "test" as test_crate;
use super::*;
- use io::*;
- use prelude::*;
+ use io::{SeekSet, SeekCur, SeekEnd, Reader, Writer, Seek};
+ use prelude::{Ok, Err, range, Vec, Buffer, AsSlice, SliceExt, IteratorExt, CloneSliceExt};
use io;
use self::test_crate::Bencher;
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index b6f8bb25b65..82aa00dc98e 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1959,8 +1959,8 @@ impl fmt::Show for FilePermission {
#[cfg(test)]
mod tests {
use self::BadReaderBehavior::*;
- use super::{IoResult, Reader, MemReader, NoProgress, InvalidInput};
- use prelude::*;
+ use super::{IoResult, Reader, MemReader, NoProgress, InvalidInput, Writer};
+ use prelude::{Ok, Vec, Buffer, CloneSliceExt};
use uint;
#[deriving(Clone, PartialEq, Show)]
diff --git a/src/libstd/io/net/pipe.rs b/src/libstd/io/net/pipe.rs
index 4afc72cde71..93f37a8c98f 100644
--- a/src/libstd/io/net/pipe.rs
+++ b/src/libstd/io/net/pipe.rs
@@ -269,7 +269,7 @@ mod tests {
use super::*;
use io::*;
use io::test::*;
- use prelude::*;
+ use prelude::{Ok, Err, spawn, range, drop, Some, None, channel, Send, FnOnce, Clone};
use io::fs::PathExtensions;
use time::Duration;
diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs
index 6adb5387f2e..24cf06973cc 100644
--- a/src/libstd/io/net/tcp.rs
+++ b/src/libstd/io/net/tcp.rs
@@ -484,9 +484,12 @@ impl sys_common::AsInner<TcpAcceptorImp> for TcpAcceptor {
mod test {
use io::net::tcp::*;
use io::net::ip::*;
- use io::*;
+ use io::{EndOfFile, TimedOut, IoError, ShortWrite, OtherIoError, ConnectionAborted};
+ use io::{ConnectionRefused, ConnectionReset, BrokenPipe, NotConnected};
+ use io::{PermissionDenied, Listener, Acceptor};
use io::test::*;
- use prelude::*;
+ use prelude::{Ok, Err, spawn, range, drop, Some, None, channel, Clone};
+ use prelude::{Reader, Writer, IteratorExt};
// FIXME #11530 this fails on android because tests are run as root
#[cfg_attr(any(windows, target_os = "android"), ignore)]
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index a36703172c3..a165232c5f5 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -250,9 +250,9 @@ impl Writer for UdpStream {
mod test {
use super::*;
use io::net::ip::*;
- use io::*;
+ use io::{ShortWrite, IoError, TimedOut, PermissionDenied};
use io::test::*;
- use prelude::*;
+ use prelude::{Ok, Err, spawn, range, drop, Some, None, channel, Clone, Reader, Writer};
// FIXME #11530 this fails on android because tests are run as root
#[cfg_attr(any(windows, target_os = "android"), ignore)]
diff --git a/src/libstd/io/process.rs b/src/libstd/io/process.rs
index 93aa627ffba..9e0c76e4e79 100644
--- a/src/libstd/io/process.rs
+++ b/src/libstd/io/process.rs
@@ -745,8 +745,10 @@ mod tests {
use super::*;
use io::timer::*;
- use io::*;
- use prelude::*;
+ use io::{Truncate, Write, TimedOut, timer, process, FileNotFound};
+ use prelude::{Ok, Err, spawn, range, drop, Box, Some, None, Option, Vec, Buffer};
+ use prelude::{from_str, Path, String, channel, Reader, Writer, Clone, Slice};
+ use prelude::{SliceExt, Str, StrExt, AsSlice, ToString, GenericPath};
use io::fs::PathExtensions;
use time::Duration;
use str;
diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs
index 18fabcbd1a2..79a2b8b84f0 100644
--- a/src/libstd/io/util.rs
+++ b/src/libstd/io/util.rs
@@ -280,7 +280,7 @@ mod test {
use io;
use boxed::Box;
use super::*;
- use prelude::*;
+ use prelude::{Ok, range, Vec, Buffer, Writer, Reader, ToString, AsSlice};
#[test]
fn test_limit_reader_unlimited() {
diff --git a/src/libstd/num/mod.rs b/src/libstd/num/mod.rs
index 7c8763979bb..48ff1a364e9 100644
--- a/src/libstd/num/mod.rs
+++ b/src/libstd/num/mod.rs
@@ -147,8 +147,10 @@ pub fn test_num<T>(ten: T, two: T) where
#[cfg(test)]
mod tests {
- use prelude::*;
- use super::*;
+ use prelude::{range, Some, None, Option, IteratorExt};
+ use super::{from_int, from_uint, from_i32, from_i64, from_u64, from_u32};
+ use super::{from_f64, from_f32, from_u16, from_i16, from_u8, from_i8, Int};
+ use super::{cast, NumCast, ToPrimitive, FromPrimitive, UnsignedInt};
use i8;
use i16;
use i32;
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs
index d941665f048..60f147eac9b 100644
--- a/src/libstd/path/posix.rs
+++ b/src/libstd/path/posix.rs
@@ -1239,7 +1239,7 @@ mod bench {
extern crate test;
use self::test::Bencher;
use super::*;
- use prelude::*;
+ use prelude::{Clone, GenericPath};
#[bench]
fn join_home_dir(b: &mut Bencher) {
diff --git a/src/libstd/sync/atomic.rs b/src/libstd/sync/atomic.rs
index 26778ef70b3..bdf947438f3 100644
--- a/src/libstd/sync/atomic.rs
+++ b/src/libstd/sync/atomic.rs
@@ -180,7 +180,7 @@ impl<T: Send> Drop for AtomicOption<T> {
#[cfg(test)]
mod test {
- use prelude::*;
+ use prelude::{Some, None};
use super::*;
#[test]