remove new_unix

Author: kouhe3

library/std/src/os/windows/net/listener.rs

@@ -8,7 +8,7 @@ use crate::os::raw::c_int;
 use crate::os::windows::io::{AsRawSocket, FromRawSocket, IntoRawSocket, RawSocket};
 use crate::os::windows::net::{SocketAddr, UnixStream, from_sockaddr_un};
 use crate::path::Path;
-use crate::sys::c::{self, bind, getsockname, listen};
+use crate::sys::c::{self, AF_UNIX, SOCK_STREAM, bind, getsockname, listen};
 use crate::sys::net::Socket;
 use crate::sys::winsock::startup;
 pub struct UnixListener(Socket);
@@ -17,7 +17,7 @@ impl UnixListener {
     pub fn bind<P: AsRef<Path>>(path: P) -> io::Result<UnixListener> {
         unsafe {
             startup();
-            let inner = Socket::new_unix()?;
+            let inner = Socket::new(AF_UNIX as i32, SOCK_STREAM)?;
             let (addr, len) = sockaddr_un(path.as_ref())?;
             if bind(inner.as_raw(), &addr as *const _ as *const _, len) != 0 {
                 panic!("err: {}", io::Error::last_os_error())

library/std/src/os/windows/net/stream.rs

@@ -10,15 +10,17 @@ use crate::os::windows::io::{
 };
 use crate::os::windows::net::{SocketAddr, sockaddr_un};
 use crate::path::Path;
-use crate::sys::c::{SO_RCVTIMEO, SO_SNDTIMEO, connect, getpeername, getsockname};
+use crate::sys::c::{
+    AF_UNIX, SO_RCVTIMEO, SO_SNDTIMEO, SOCK_STREAM, connect, getpeername, getsockname,
+};
 use crate::sys::net::Socket;
 use crate::sys::winsock::startup;
 pub struct UnixStream(pub Socket);
 impl UnixStream {
     pub fn connect<P: AsRef<Path>>(path: P) -> io::Result<UnixStream> {
         unsafe {
             startup();
-            let inner = Socket::new_unix()?;
+            let inner = Socket::new(AF_UNIX as i32, SOCK_STREAM)?;
             let (addr, len) = sockaddr_un(path.as_ref())?;
             if connect(inner.as_raw() as _, &addr as *const _ as *const _, len) != 0 {
                 panic!("err: {}", io::Error::last_os_error())

library/std/src/sys/net/connection/socket/windows.rs

@@ -9,7 +9,6 @@ use crate::os::windows::io::{
     AsRawSocket, AsSocket, BorrowedSocket, FromRawSocket, IntoRawSocket, OwnedSocket, RawSocket,
 };
 use crate::sys::c;
-use crate::sys::c::{AF_UNIX, INVALID_SOCKET, SOCK_STREAM, WSA_FLAG_OVERLAPPED, WSASocketW};
 use crate::sys::pal::winsock::last_error;
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::time::Duration;
@@ -118,23 +117,6 @@ pub use crate::sys::pal::winsock::{cvt, cvt_gai, cvt_r, startup as init};
 pub struct Socket(OwnedSocket);
 
 impl Socket {
-    pub fn new_unix() -> io::Result<Socket> {
-        let socket = unsafe {
-            match WSASocketW(
-                AF_UNIX as i32,
-                SOCK_STREAM,
-                0,
-                ptr::null_mut(),
-                0,
-                WSA_FLAG_OVERLAPPED,
-            ) {
-                INVALID_SOCKET => Err(last_error()),
-                n => Ok(Socket::from_raw(n)),
-            }
-        }?;
-        socket.0.set_no_inherit()?;
-        Ok(socket)
-    }
     pub fn new(family: c_int, ty: c_int) -> io::Result<Socket> {
         let socket = unsafe {
             c::WSASocketW(