Skip to content

Rename std::io::net::unix to std::io::net::pipe. #17297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 17, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/libstd/io/net/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions src/libstd/io/net/unix.rs → src/libstd/io/net/pipe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/io/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ macro_rules! iotest (
use io::net::ip::*;
use io::net::udp::*;
#[cfg(unix)]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this cfg(unix) needed still, @alexcrichton? (Not related to this PR.)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No this is implemented for windows so shouldn't be necessary. The name UnixStream and friends isn't the best name, however.

use io::net::unix::*;
use io::net::pipe::*;
use io::timer::*;
use io::process::*;
use rt::running_on_valgrind;
Expand Down