Refactor the From implementations

Now uses a single from! macro for all conversions.

Author: Thomasdezeeuw

src/lib.rs

@@ -101,6 +101,24 @@ macro_rules! impl_debug {
     };
 }
 
+/// Macro to convert from one network type to another.
+macro_rules! from {
+    ($from: ty, $for: ty) => {
+        impl From<$from> for $for {
+            fn from(socket: $from) -> $for {
+                #[cfg(unix)]
+                unsafe {
+                    <$for>::from_raw_fd(socket.into_raw_fd())
+                }
+                #[cfg(windows)]
+                unsafe {
+                    <$for>::from_raw_socket(socket.into_raw_socket())
+                }
+            }
+        }
+    };
+}
+
 mod sockaddr;
 mod socket;
 mod sockref;

src/socket.rs

@@ -1303,55 +1303,12 @@ impl fmt::Debug for Socket {
     }
 }
 
-/// Macro to convert from one network type to another.
-macro_rules! from_raw {
-    ($ty: ty, $socket: expr) => {{
-        #[cfg(unix)]
-        unsafe {
-            <$ty>::from_raw_fd($socket.into_raw_fd())
-        }
-        #[cfg(windows)]
-        unsafe {
-            <$ty>::from_raw_socket($socket.into_raw_socket())
-        }
-    }};
-}
-
-impl From<net::TcpStream> for Socket {
-    fn from(socket: net::TcpStream) -> Socket {
-        from_raw!(Socket, socket)
-    }
-}
-
-impl From<net::TcpListener> for Socket {
-    fn from(socket: net::TcpListener) -> Socket {
-        from_raw!(Socket, socket)
-    }
-}
-
-impl From<net::UdpSocket> for Socket {
-    fn from(socket: net::UdpSocket) -> Socket {
-        from_raw!(Socket, socket)
-    }
-}
-
-impl From<Socket> for net::TcpStream {
-    fn from(socket: Socket) -> net::TcpStream {
-        from_raw!(net::TcpStream, socket)
-    }
-}
-
-impl From<Socket> for net::TcpListener {
-    fn from(socket: Socket) -> net::TcpListener {
-        from_raw!(net::TcpListener, socket)
-    }
-}
-
-impl From<Socket> for net::UdpSocket {
-    fn from(socket: Socket) -> net::UdpSocket {
-        from_raw!(net::UdpSocket, socket)
-    }
-}
+from!(net::TcpStream, Socket);
+from!(net::TcpListener, Socket);
+from!(net::UdpSocket, Socket);
+from!(Socket, net::TcpStream);
+from!(Socket, net::TcpListener);
+from!(Socket, net::UdpSocket);
 
 impl Drop for Socket {
     fn drop(&mut self) {

src/sys/unix.rs

@@ -966,52 +966,17 @@ impl FromRawFd for crate::Socket {
 }
 
 #[cfg(feature = "all")]
-impl From<crate::Socket> for UnixStream {
-    fn from(socket: crate::Socket) -> UnixStream {
-        unsafe { UnixStream::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
+from!(UnixStream, crate::Socket);
 #[cfg(feature = "all")]
-impl From<crate::Socket> for UnixListener {
-    fn from(socket: crate::Socket) -> UnixListener {
-        unsafe { UnixListener::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
+from!(UnixListener, crate::Socket);
 #[cfg(feature = "all")]
-impl From<crate::Socket> for UnixDatagram {
-    fn from(socket: crate::Socket) -> UnixDatagram {
-        unsafe { UnixDatagram::from_raw_fd(socket.into_raw_fd()) }
-    }
-}
-
+from!(UnixDatagram, crate::Socket);
 #[cfg(feature = "all")]
-impl From<UnixStream> for crate::Socket {
-    fn from(socket: UnixStream) -> crate::Socket {
-        crate::Socket {
-            inner: socket.into_raw_fd(),
-        }
-    }
-}
-
+from!(crate::Socket, UnixStream);
 #[cfg(feature = "all")]
-impl From<UnixListener> for crate::Socket {
-    fn from(socket: UnixListener) -> crate::Socket {
-        crate::Socket {
-            inner: socket.into_raw_fd(),
-        }
-    }
-}
-
+from!(crate::Socket, UnixListener);
 #[cfg(feature = "all")]
-impl From<UnixDatagram> for crate::Socket {
-    fn from(socket: UnixDatagram) -> crate::Socket {
-        crate::Socket {
-            inner: socket.into_raw_fd(),
-        }
-    }
-}
+from!(crate::Socket, UnixDatagram);
 
 #[test]
 fn test_ip() {