From 6a18a57acd54b4ac1fdec97d28671eb852fe107c Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Wed, 22 Oct 2014 15:26:19 +1300 Subject: [PATCH 1/2] de-glob io/net/udp.rs --- src/libstd/io/net/udp.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs index 53e60d553be5f..3a8c6917fcfb3 100644 --- a/src/libstd/io/net/udp.rs +++ b/src/libstd/io/net/udp.rs @@ -247,11 +247,11 @@ impl Writer for UdpStream { #[cfg(test)] #[allow(experimental)] mod test { - use super::*; - use prelude::*; - use io::*; - use io::net::ip::*; - use io::test::*; + use prelude::{Ok,Err,Some,None,Clone,spawn,channel,range,drop}; + use io::test::{next_test_ip4,next_test_ip6}; + use io::{Writer,Reader,PermissionDenied,TimedOut,IoError,ShortWrite}; + use io::net::ip::{SocketAddr,Ipv4Addr}; + use io::net::udp::UdpSocket; // FIXME #11530 this fails on android because tests are run as root #[cfg_attr(any(windows, target_os = "android"), ignore)] From 897054b8a7f21f64a5c1b0fe34430fa07322b6c6 Mon Sep 17 00:00:00 2001 From: Mike Dilger Date: Wed, 22 Oct 2014 15:59:26 +1300 Subject: [PATCH 2/2] de-glob io/net/tcp.rs --- src/libstd/io/net/tcp.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index d6528ce977e98..0b15a38cddc79 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -521,11 +521,13 @@ impl Clone for TcpAcceptor { #[cfg(test)] #[allow(experimental)] mod test { - use io::net::tcp::*; - use io::net::ip::*; - use io::*; - use io::test::*; - use prelude::*; + use prelude::{Ok,Err,Some,None,Clone,ToString,Str,Iterator,spawn,channel,range,drop}; + use io::test::{next_test_ip4,next_test_ip6}; + use io::{TcpStream,Listener,Acceptor,Reader,Writer, + NotConnected,ConnectionReset,BrokenPipe,ConnectionAborted,PermissionDenied, + ConnectionRefused,EndOfFile,TimedOut,ShortWrite,IoError,OtherIoError}; + use io::net::tcp::{TcpListener}; + use io::net::ip::{SocketAddr}; // FIXME #11530 this fails on android because tests are run as root #[cfg_attr(any(windows, target_os = "android"), ignore)]