Rollup merge of #131449 - nickrum:wasip2-net-decouple-fd, r=alexcrichton

Decouple WASIp2 sockets from WasiFd
This is a follow up to #129638, decoupling WASIp2's socket implementation from WASIp1's `WasiFd` as discussed with `@alexcrichton.`
Quite a few trait implementations in `std::os::fd` rely on the fact that there is an additional layer of abstraction between `Socket` and `OwnedFd`. I thus had to add a thin `WasiSocket` wrapper struct that just "forwards" to `OwnedFd`. Alternatively, I could have added a lot of conditional compilation to `std::os::fd`, which feels even worse.
Since `WasiFd::sock_accept` is no longer accessible from `TcpListener` and since WASIp2 has proper support for accepting sockets through `Socket::accept`, the `std::os::wasi::net` module has been removed from WASIp2, which only contains a single `TcpListenerExt` trait with a `sock_accept` method as well as an implementation for `TcpListener`. Let me know if this is an acceptable solution.

Author: matthiaskrgr

library/std/src/os/wasi/mod.rs

@@ -36,6 +36,8 @@
 pubmod ffi;
 pubmod fs;
 pubmod io;
+
+#[cfg(all(target_os = "wasi", target_env = "p1"))]
 pubmod net;
 
 /// A prelude for conveniently writing platform-specific code.

library/std/src/sys/pal/wasip2/net.rs

@@ -2,13 +2,12 @@
 
 use libc::{c_int, c_void, size_t};
 
-usesuper::fd::WasiFd;
 usecrate::ffi::CStr;
 usecrate::io::{self,BorrowedBuf,BorrowedCursor,IoSlice,IoSliceMut};
 usecrate::net::{Shutdown,SocketAddr};
-usecrate::os::wasi::io::{AsFd,AsRawFd,BorrowedFd,FromRawFd,IntoRawFd,RawFd};
+usecrate::os::wasi::io::{AsFd,AsRawFd,BorrowedFd,FromRawFd,IntoRawFd,OwnedFd,RawFd};
 usecrate::sys::unsupported;
-usecrate::sys_common::net::{TcpListener,getsockopt, setsockopt, sockaddr_to_addr};
+usecrate::sys_common::net::{getsockopt, setsockopt, sockaddr_to_addr};
 usecrate::sys_common::{AsInner,FromInner,IntoInner};
 usecrate::time::{Duration,Instant};
 usecrate::{cmp, mem, str};
@@ -71,7 +70,9 @@ pub fn cvt_gai(err: c_int) -> io::Result<()> {
 
 pubfninit(){}
 
-pubstructSocket(WasiFd);
+pubstructWasiSocket(OwnedFd);
+
+pubstructSocket(WasiSocket);
 
 implSocket{
 pubfnnew(addr:&SocketAddr,ty:c_int) -> io::Result<Socket>{
@@ -327,53 +328,90 @@ impl Socket {
 }
 }
 
-implAsInner<WasiFd>forSocket{
+implAsInner<OwnedFd>forWasiSocket{
 #[inline]
-fnas_inner(&self) -> &WasiFd{
+fnas_inner(&self) -> &OwnedFd{
 &self.0
 }
 }
 
-implIntoInner<WasiFd>forSocket{
-fninto_inner(self) -> WasiFd{
+implIntoInner<OwnedFd>forWasiSocket{
+fninto_inner(self) -> OwnedFd{
 self.0
 }
 }
 
-implFromInner<WasiFd>forSocket{
-fnfrom_inner(inner:WasiFd) -> Socket{
-Socket(inner)
+implFromInner<OwnedFd>forWasiSocket{
+fnfrom_inner(owned_fd:OwnedFd) -> Self{
+Self(owned_fd)
 }
 }
 
-implAsFdforSocket{
+implAsFdforWasiSocket{
 fnas_fd(&self) -> BorrowedFd<'_>{
 self.0.as_fd()
 }
 }
 
-implAsRawFdforSocket{
+implAsRawFdforWasiSocket{
 #[inline]
 fnas_raw_fd(&self) -> RawFd{
 self.0.as_raw_fd()
 }
 }
 
-implIntoRawFdforSocket{
+implIntoRawFdforWasiSocket{
 fninto_raw_fd(self) -> RawFd{
 self.0.into_raw_fd()
 }
 }
 
-implFromRawFdforSocket{
+implFromRawFdforWasiSocket{
 unsafefnfrom_raw_fd(raw_fd:RawFd) -> Self{
 unsafe{Self(FromRawFd::from_raw_fd(raw_fd))}
 }
 }
 
-implAsInner<Socket>forTcpListener{
+implAsInner<WasiSocket>forSocket{
+#[inline]
+fnas_inner(&self) -> &WasiSocket{
+&self.0
+}
+}
+
+implIntoInner<WasiSocket>forSocket{
+fninto_inner(self) -> WasiSocket{
+self.0
+}
+}
+
+implFromInner<WasiSocket>forSocket{
+fnfrom_inner(sock:WasiSocket) -> Socket{
+Socket(sock)
+}
+}
+
+implAsFdforSocket{
+fnas_fd(&self) -> BorrowedFd<'_>{
+self.0.as_fd()
+}
+}
+
+implAsRawFdforSocket{
 #[inline]
-fnas_inner(&self) -> &Socket{
-&self.socket()
+fnas_raw_fd(&self) -> RawFd{
+self.0.as_raw_fd()
+}
+}
+
+implIntoRawFdforSocket{
+fninto_raw_fd(self) -> RawFd{
+self.0.into_raw_fd()
+}
+}
+
+implFromRawFdforSocket{
+unsafefnfrom_raw_fd(raw_fd:RawFd) -> Self{
+unsafe{Self(FromRawFd::from_raw_fd(raw_fd))}
 }
 }