diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 19:29:16 -0800 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-01-08 19:29:16 -0800 |
| commit | 44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46 (patch) | |
| tree | 83f3d67a9e21c6ce1b99c2ce8f6a737896c673db /src/libstd/net_ip.rs | |
| parent | a8d37af2473da79be704c9ce2374f278c47177b6 (diff) | |
| download | rust-44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46.tar.gz rust-44ab00ee37c4ffb8440ff20fd8a15cd24a6f3e46.zip | |
Revert "librustc: Make unqualified identifier searches terminate at the nearest module scope. r=tjc"
This reverts commit a8d37af2473da79be704c9ce2374f278c47177b6.
Diffstat (limited to 'src/libstd/net_ip.rs')
| -rw-r--r-- | src/libstd/net_ip.rs | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs index fad583a668b..96bd6367e56 100644 --- a/src/libstd/net_ip.rs +++ b/src/libstd/net_ip.rs @@ -13,7 +13,6 @@ use core::libc; use core::oldcomm; -use core::prelude::*; use core::ptr; use core::result; use core::str; @@ -48,7 +47,7 @@ pub enum IpAddr { } /// Human-friendly feedback on why a parse_addr attempt failed -pub type ParseAddrErr = { +type ParseAddrErr = { err_msg: ~str }; @@ -148,12 +147,8 @@ pub fn get_addr(node: &str, iotask: iotask) } pub mod v4 { - use net::ip::{IpAddr, Ipv4, Ipv6, ParseAddrErr}; use uv::ll; - use uv_ip4_addr = uv::ll::ip4_addr; - use uv_ip4_name = uv::ll::ip4_name; - use core::prelude::*; use core::ptr; use core::result; use core::str; @@ -246,11 +241,6 @@ pub mod v4 { } } pub mod v6 { - use net::ip::{IpAddr, Ipv6, ParseAddrErr}; - use uv_ip6_addr = uv::ll::ip6_addr; - use uv_ip6_name = uv::ll::ip6_name; - - use core::prelude::*; use core::result; use core::str; @@ -360,9 +350,6 @@ extern fn get_addr_cb(handle: *uv_getaddrinfo_t, status: libc::c_int, #[cfg(test)] mod test { - use core::prelude::*; - - use net_ip::*; use net_ip::v4; use net_ip::v6; use uv; |
