diff options
| author | bors <bors@rust-lang.org> | 2015-05-08 01:32:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-08 01:32:59 +0000 |
| commit | cf76e637450a861e94ef583340b8f080379a159a (patch) | |
| tree | f01e7c305dbe832c5283d229168223c5e8a24cf7 /src/libstd/net/mod.rs | |
| parent | b402c43f088882db8a03bfcbb5eb8429ef7def0e (diff) | |
| parent | 7529bd60c3cbc4c7b635ee43a89d5b14f6fb8bf7 (diff) | |
| download | rust-cf76e637450a861e94ef583340b8f080379a159a.tar.gz rust-cf76e637450a861e94ef583340b8f080379a159a.zip | |
Auto merge of #25136 - alexcrichton:drop-the-two, r=aturon
* Remove the 2-suffix from some modules * Remove some unused files * Remove double-boxing for `ReentrantMutex`
Diffstat (limited to 'src/libstd/net/mod.rs')
| -rw-r--r-- | src/libstd/net/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/mod.rs b/src/libstd/net/mod.rs index bf444ce671d..bff9774bcd0 100644 --- a/src/libstd/net/mod.rs +++ b/src/libstd/net/mod.rs @@ -15,7 +15,7 @@ use prelude::v1::*; use io::{self, Error, ErrorKind}; -use sys_common::net2 as net_imp; +use sys_common::net as net_imp; pub use self::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope}; pub use self::addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs}; |