Fix compilation on wasm32-wasip1

Signed-off-by: Jiahao XU <[email protected]>

Author: NobodyXu

library/std/src/os/fd/owned.rs

@@ -7,7 +7,7 @@ use super::raw::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use crate::marker::PhantomData;
 use crate::mem::ManuallyDrop;
 #[cfg(not(any(target_arch = "wasm32", target_env = "sgx", target_os = "hermit")))]
-use crate::sys::{cvt, fd::FileDesc};
+use crate::sys::cvt;
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::{fmt, fs, io};
 
@@ -495,7 +495,7 @@ impl AsFd for io::PipeReader {
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl From<io::PipeReader> for OwnedFd {
     fn from(pipe: io::PipeReader) -> Self {
-        FileDesc::into_inner(pipe.0)
+        pipe.0.into_inner()
     }
 }
 
@@ -509,20 +509,20 @@ impl AsFd for io::PipeWriter {
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl From<io::PipeWriter> for OwnedFd {
     fn from(pipe: io::PipeWriter) -> Self {
-        FileDesc::into_inner(pipe.0)
+        pipe.0.into_inner()
     }
 }
 
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl From<OwnedFd> for io::PipeReader {
     fn from(owned_fd: OwnedFd) -> Self {
-        Self(FileDesc::from_inner(owned_fd))
+        Self(FromInner::from_inner(owned_fd))
     }
 }
 
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl From<OwnedFd> for io::PipeWriter {
     fn from(owned_fd: OwnedFd) -> Self {
-        Self(FileDesc::from_inner(owned_fd))
+        Self(FromInner::from_inner(owned_fd))
     }
 }

library/std/src/os/fd/raw.rs

@@ -15,8 +15,7 @@ use crate::os::unix::io::AsFd;
 use crate::os::unix::io::OwnedFd;
 #[cfg(target_os = "wasi")]
 use crate::os::wasi::io::OwnedFd;
-use crate::sys::fd::FileDesc;
-use crate::sys_common::{AsInner, IntoInner};
+use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::{fs, io};
 
 /// Raw file descriptors.
@@ -288,7 +287,7 @@ impl AsRawFd for io::PipeReader {
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl FromRawFd for io::PipeReader {
     unsafe fn from_raw_fd(raw_fd: RawFd) -> Self {
-        unsafe { Self(FileDesc::from_raw_fd(raw_fd)) }
+        Self::from_inner(unsafe { FromRawFd::from_raw_fd(raw_fd) })
     }
 }
 
@@ -309,7 +308,7 @@ impl AsRawFd for io::PipeWriter {
 #[stable(feature = "anonymous_pipe", since = "CURRENT_RUSTC_VERSION")]
 impl FromRawFd for io::PipeWriter {
     unsafe fn from_raw_fd(raw_fd: RawFd) -> Self {
-        unsafe { Self(FileDesc::from_raw_fd(raw_fd)) }
+        Self::from_inner(unsafe { FromRawFd::from_raw_fd(raw_fd) })
     }
 }
 

library/std/src/sys/pal/unsupported/pipe.rs

@@ -58,7 +58,7 @@ pub fn read2(p1: AnonPipe, _v1: &mut Vec<u8>, _p2: AnonPipe, _v2: &mut Vec<u8>)
 
 impl FromInner<!> for AnonPipe {
     fn from_inner(inner: !) -> Self {
-        Self(inner)
+        inner
     }
 }
 
@@ -67,3 +67,41 @@ impl IntoInner<!> for AnonPipe {
         self.0
     }
 }
+
+#[cfg(any(unix, target_os = "hermit", target_os = "wasi"))]
+mod unix_traits {
+    use super::AnonPipe;
+    use crate::os::fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd};
+    use crate::sys_common::FromInner;
+
+    impl AsRawFd for AnonPipe {
+        #[inline]
+        fn as_raw_fd(&self) -> RawFd {
+            self.0
+        }
+    }
+
+    impl AsFd for AnonPipe {
+        fn as_fd(&self) -> BorrowedFd<'_> {
+            self.0
+        }
+    }
+
+    impl IntoRawFd for AnonPipe {
+        fn into_raw_fd(self) -> RawFd {
+            self.0
+        }
+    }
+
+    impl FromRawFd for AnonPipe {
+        unsafe fn from_raw_fd(_: RawFd) -> Self {
+            panic!("creating pipe on this platform is unsupported!")
+        }
+    }
+
+    impl FromInner<OwnedFd> for AnonPipe {
+        fn from_inner(_: OwnedFd) -> Self {
+            panic!("creating pipe on this platform is unsupported!")
+        }
+    }
+}