Merge pull request #5 from sfackler/into-unix

Add conversions to/from Unix sockets

Author: alexcrichton

src/socket.rs

@@ -12,6 +12,8 @@ use std::fmt;
 use std::io::{self, Read, Write};
 use std::net::{self, Ipv4Addr, Ipv6Addr, Shutdown};
 use std::time::Duration;
+#[cfg(all(unix, feature = "unix"))]
+use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
 
 #[cfg(unix)]
 use libc as c;
@@ -66,6 +68,33 @@ impl Socket {
         self.into()
     }
 
+    /// Consumes this `Socket`, converting it into a `UnixStream`.
+    ///
+    /// This function is only available on Unix when the `unix` feature is
+    /// enabled.
+    #[cfg(all(unix, feature = "unix"))]
+    pub fn into_unix_stream(self) -> UnixStream {
+        self.into()
+    }
+
+    /// Consumes this `Socket`, converting it into a `UnixListener`.
+    ///
+    /// This function is only available on Unix when the `unix` feature is
+    /// enabled.
+    #[cfg(all(unix, feature = "unix"))]
+    pub fn into_unix_listener(self) -> UnixListener {
+        self.into()
+    }
+
+    /// Consumes this `Socket`, converting it into a `UnixDatagram`.
+    ///
+    /// This function is only available on Unix when the `unix` feature is
+    /// enabled.
+    #[cfg(all(unix, feature = "unix"))]
+    pub fn into_unix_datagram(self) -> UnixDatagram {
+        self.into()
+    }
+
     /// Initiate a connection on this socket to the specified address.
     ///
     /// This function directly corresponds to the connect(2) function on Windows
@@ -614,6 +643,27 @@ impl From<net::UdpSocket> for Socket {
     }
 }
 
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixStream> for Socket {
+    fn from(socket: UnixStream) -> Socket {
+        Socket { inner: socket.into() }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixListener> for Socket {
+    fn from(socket: UnixListener) -> Socket {
+        Socket { inner: socket.into() }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixDatagram> for Socket {
+    fn from(socket: UnixDatagram) -> Socket {
+        Socket { inner: socket.into() }
+    }
+}
+
 impl From<Socket> for net::TcpStream {
     fn from(socket: Socket) -> net::TcpStream {
         socket.inner.into()
@@ -632,6 +682,27 @@ impl From<Socket> for net::UdpSocket {
     }
 }
 
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixStream {
+    fn from(socket: Socket) -> UnixStream {
+        socket.inner.into()
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixListener {
+    fn from(socket: Socket) -> UnixListener {
+        socket.inner.into()
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixDatagram {
+    fn from(socket: Socket) -> UnixDatagram {
+        socket.inner.into()
+    }
+}
+
 impl Domain {
     /// Domain for IPv4 communication, corresponding to `AF_INET`.
     pub fn ipv4() -> Domain {

src/sys/unix/mod.rs

@@ -19,6 +19,8 @@ use std::ops::Neg;
 use std::os::unix::prelude::*;
 use std::sync::atomic::{AtomicBool, Ordering, ATOMIC_BOOL_INIT};
 use std::time::{Duration, Instant};
+#[cfg(feature = "unix")]
+use std::os::unix::net::{UnixDatagram, UnixListener, UnixStream};
 
 use libc::{self, c_void, c_int};
 use libc::{sockaddr, socklen_t, ssize_t};
@@ -830,6 +832,27 @@ impl From<Socket> for net::UdpSocket {
     }
 }
 
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixStream {
+    fn from(socket: Socket) -> UnixStream {
+        unsafe { UnixStream::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixListener {
+    fn from(socket: Socket) -> UnixListener {
+        unsafe { UnixListener::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<Socket> for UnixDatagram {
+    fn from(socket: Socket) -> UnixDatagram {
+        unsafe { UnixDatagram::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
 impl From<net::TcpStream> for Socket {
     fn from(socket: net::TcpStream) -> Socket {
         unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
@@ -848,6 +871,27 @@ impl From<net::UdpSocket> for Socket {
     }
 }
 
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixStream> for Socket {
+    fn from(socket: UnixStream) -> Socket {
+        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixListener> for Socket {
+    fn from(socket: UnixListener) -> Socket {
+        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
+#[cfg(all(unix, feature = "unix"))]
+impl From<UnixDatagram> for Socket {
+    fn from(socket: UnixDatagram) -> Socket {
+        unsafe { Socket::from_raw_fd(socket.into_raw_fd()) }
+    }
+}
+
 fn max_len() -> usize {
     // The maximum read limit on most posix-like systems is `SSIZE_MAX`,
     // with the man page quoting that if the count of bytes to read is