about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorJonas Hietala <tradet.h@gmail.com>2014-09-16 10:10:56 +0200
committerJonas Hietala <tradet.h@gmail.com>2014-09-16 11:37:44 +0200
commit04f4bb429075221c951fb53a56b6455afb869917 (patch)
treea88367052c92446ea5a2da5bf13d2791fcae875e /src/libstd
parent1f5ee97184db63196713cf05fe834e6f32537e30 (diff)
downloadrust-04f4bb429075221c951fb53a56b6455afb869917.tar.gz
rust-04f4bb429075221c951fb53a56b6455afb869917.zip
Rename std::io::net::unix to std::io::net::pipe.
Renamed as we may support pipes for other platforms.

Closes #12093

[breaking-change]
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/net/mod.rs3
-rw-r--r--src/libstd/io/net/pipe.rs (renamed from src/libstd/io/net/unix.rs)4
-rw-r--r--src/libstd/io/test.rs2
3 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/io/net/mod.rs b/src/libstd/io/net/mod.rs
index 54af83462ee..4bd998d5ed9 100644
--- a/src/libstd/io/net/mod.rs
+++ b/src/libstd/io/net/mod.rs
@@ -19,8 +19,7 @@ pub mod addrinfo;
 pub mod tcp;
 pub mod udp;
 pub mod ip;
-// FIXME(#12093) - this should not be called unix
-pub mod unix;
+pub mod pipe;
 
 fn to_rtio(ip: IpAddr) -> rtio::IpAddr {
     match ip {
diff --git a/src/libstd/io/net/unix.rs b/src/libstd/io/net/pipe.rs
index ea851d44531..bdd58b07d86 100644
--- a/src/libstd/io/net/unix.rs
+++ b/src/libstd/io/net/pipe.rs
@@ -46,7 +46,7 @@ impl UnixStream {
     ///
     /// ```rust
     /// # #![allow(unused_must_use)]
-    /// use std::io::net::unix::UnixStream;
+    /// use std::io::net::pipe::UnixStream;
     ///
     /// let server = Path::new("path/to/my/socket");
     /// let mut stream = UnixStream::connect(&server);
@@ -164,7 +164,7 @@ impl UnixListener {
     /// # fn main() {}
     /// # fn foo() {
     /// # #![allow(unused_must_use)]
-    /// use std::io::net::unix::UnixListener;
+    /// use std::io::net::pipe::UnixListener;
     /// use std::io::{Listener, Acceptor};
     ///
     /// let server = Path::new("/path/to/my/socket");
diff --git a/src/libstd/io/test.rs b/src/libstd/io/test.rs
index 769ad2a8468..6c94eb4af58 100644
--- a/src/libstd/io/test.rs
+++ b/src/libstd/io/test.rs
@@ -34,7 +34,7 @@ macro_rules! iotest (
             use io::net::ip::*;
             use io::net::udp::*;
             #[cfg(unix)]
-            use io::net::unix::*;
+            use io::net::pipe::*;
             use io::timer::*;
             use io::process::*;
             use rt::running_on_valgrind;