Refactor: Put mod unix & windows into separate files

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

Author: NobodyXu

library/std/src/sys/anonymous_pipe/mod.rs

@@ -88,213 +88,10 @@ forward_io_write_traits!(PipeWriter);
 forward_io_write_traits!(&PipeWriter);
 
 #[cfg(unix)]
-mod unix {
-    use super::*;
-
-    use crate::{
-        fs::File,
-        os::{
-            fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
-            unix::fs::FileTypeExt,
-        },
-        sys::{
-            fd::FileDesc,
-            pipe::{anon_pipe, AnonPipe},
-        },
-        sys_common::{FromInner, IntoInner},
-    };
-
-    #[inline]
-    pub(super) fn pipe() -> io::Result<(PipeReader, PipeWriter)> {
-        anon_pipe().map(|(rx, tx)| (PipeReader(rx), PipeWriter(tx)))
-    }
-
-    macro_rules! impl_traits {
-        ($name:ty) => {
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl AsFd for $name {
-                fn as_fd(&self) -> BorrowedFd<'_> {
-                    self.0.as_fd()
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl AsRawFd for $name {
-                fn as_raw_fd(&self) -> RawFd {
-                    self.0.as_raw_fd()
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl From<$name> for OwnedFd {
-                fn from(pipe: $name) -> Self {
-                    FileDesc::into_inner(AnonPipe::into_inner(pipe.0))
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl FromRawFd for $name {
-                unsafe fn from_raw_fd(raw_fd: RawFd) -> Self {
-                    Self(AnonPipe::from_raw_fd(raw_fd))
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl IntoRawFd for $name {
-                fn into_raw_fd(self) -> RawFd {
-                    self.0.into_raw_fd()
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl From<$name> for Stdio {
-                fn from(pipe: $name) -> Self {
-                    Self::from(OwnedFd::from(pipe))
-                }
-            }
-        };
-    }
-    impl_traits!(PipeReader);
-    impl_traits!(PipeWriter);
-
-    fn convert_to_pipe(owned_fd: OwnedFd) -> io::Result<AnonPipe> {
-        let file = File::from(owned_fd);
-        if file.metadata()?.file_type().is_fifo() {
-            Ok(AnonPipe::from_inner(FileDesc::from_inner(OwnedFd::from(file))))
-        } else {
-            Err(io::Error::new(io::ErrorKind::InvalidInput, "Not a pipe"))
-        }
-    }
-
-    #[unstable(feature = "anonymous_pipe", issue = "127154")]
-    impl TryFrom<OwnedFd> for PipeReader {
-        type Error = io::Error;
-
-        fn try_from(owned_fd: OwnedFd) -> Result<Self, Self::Error> {
-            convert_to_pipe(owned_fd)
-                .and_then(|pipe| {
-                    if pipe.as_file_desc().get_access_mode()?.readable {
-                        Ok(pipe)
-                    } else {
-                        Err(io::Error::new(
-                            io::ErrorKind::InvalidInput,
-                            format!("Pipe {} is not readable", pipe.as_raw_fd()),
-                        ))
-                    }
-                })
-                .map(Self)
-        }
-    }
-
-    #[unstable(feature = "anonymous_pipe", issue = "127154")]
-    impl TryFrom<OwnedFd> for PipeWriter {
-        type Error = io::Error;
-
-        fn try_from(owned_fd: OwnedFd) -> Result<Self, Self::Error> {
-            convert_to_pipe(owned_fd)
-                .and_then(|pipe| {
-                    if pipe.as_file_desc().get_access_mode()?.writable {
-                        Ok(pipe)
-                    } else {
-                        Err(io::Error::new(
-                            io::ErrorKind::InvalidInput,
-                            format!("Pipe {} is not writable", pipe.as_raw_fd()),
-                        ))
-                    }
-                })
-                .map(Self)
-        }
-    }
-}
+mod unix;
 
 #[cfg(windows)]
-mod windows {
-    use super::*;
-
-    use crate::{
-        os::windows::io::{
-            AsHandle, AsRawHandle, BorrowedHandle, FromRawHandle, IntoRawHandle, OwnedHandle,
-            RawHandle,
-        },
-        sys::{
-            c::{GetFileType, FILE_TYPE_PIPE},
-            handle::Handle,
-            pipe::{anon_pipe, AnonPipe, Pipes},
-        },
-        sys_common::{FromInner, IntoInner},
-    };
-
-    #[inline]
-    pub(super) fn pipe() -> io::Result<(PipeReader, PipeWriter)> {
-        anon_pipe(true, false).map(|Pipes { ours, theirs }| (PipeReader(ours), PipeWriter(theirs)))
-    }
-
-    macro_rules! impl_traits {
-        ($name:ty) => {
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl AsHandle for $name {
-                fn as_handle(&self) -> BorrowedHandle<'_> {
-                    self.0.handle().as_handle()
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl AsRawHandle for $name {
-                fn as_raw_handle(&self) -> RawHandle {
-                    self.0.handle().as_raw_handle()
-                }
-            }
-
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl FromRawHandle for $name {
-                unsafe fn from_raw_handle(raw_handle: RawHandle) -> Self {
-                    Self(AnonPipe::from_inner(Handle::from_raw_handle(raw_handle)))
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl IntoRawHandle for $name {
-                fn into_raw_handle(self) -> RawHandle {
-                    self.0.into_handle().into_raw_handle()
-                }
-            }
-
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl From<$name> for OwnedHandle {
-                fn from(pipe: $name) -> Self {
-                    Handle::into_inner(AnonPipe::into_inner(pipe.0))
-                }
-            }
-            #[unstable(feature = "anonymous_pipe", issue = "127154")]
-            impl From<$name> for Stdio {
-                fn from(pipe: $name) -> Self {
-                    Self::from(OwnedHandle::from(pipe))
-                }
-            }
-        };
-    }
-    impl_traits!(PipeReader);
-    impl_traits!(PipeWriter);
-
-    fn convert_to_pipe(owned_handle: OwnedHandle) -> io::Result<AnonPipe> {
-        if unsafe { GetFileType(owned_handle.as_raw_handle()) } == FILE_TYPE_PIPE {
-            Ok(AnonPipe::from_inner(Handle::from_inner(owned_handle)))
-        } else {
-            Err(io::Error::new(io::ErrorKind::InvalidInput, "Not a pipe"))
-        }
-    }
-
-    #[unstable(feature = "anonymous_pipe", issue = "127154")]
-    impl TryFrom<OwnedHandle> for PipeReader {
-        type Error = io::Error;
-
-        fn try_from(owned_handle: OwnedHandle) -> Result<Self, Self::Error> {
-            convert_to_pipe(owned_handle).map(Self)
-        }
-    }
-
-    #[unstable(feature = "anonymous_pipe", issue = "127154")]
-    impl TryFrom<OwnedHandle> for PipeWriter {
-        type Error = io::Error;
-
-        fn try_from(owned_handle: OwnedHandle) -> Result<Self, Self::Error> {
-            convert_to_pipe(owned_handle).map(Self)
-        }
-    }
-}
+mod windows;
 
 #[cfg(test)]
 mod tests;

library/std/src/sys/anonymous_pipe/unix.rs

@@ -0,0 +1,111 @@
+use super::*;
+
+use crate::{
+    fs::File,
+    os::{
+        fd::{AsFd, AsRawFd, BorrowedFd, FromRawFd, IntoRawFd, OwnedFd, RawFd},
+        unix::fs::FileTypeExt,
+    },
+    sys::{
+        fd::FileDesc,
+        pipe::{anon_pipe, AnonPipe},
+    },
+    sys_common::{FromInner, IntoInner},
+};
+
+#[inline]
+pub(super) fn pipe() -> io::Result<(PipeReader, PipeWriter)> {
+    anon_pipe().map(|(rx, tx)| (PipeReader(rx), PipeWriter(tx)))
+}
+
+macro_rules! impl_traits {
+    ($name:ty) => {
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl AsFd for $name {
+            fn as_fd(&self) -> BorrowedFd<'_> {
+                self.0.as_fd()
+            }
+        }
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl AsRawFd for $name {
+            fn as_raw_fd(&self) -> RawFd {
+                self.0.as_raw_fd()
+            }
+        }
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl From<$name> for OwnedFd {
+            fn from(pipe: $name) -> Self {
+                FileDesc::into_inner(AnonPipe::into_inner(pipe.0))
+            }
+        }
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl FromRawFd for $name {
+            unsafe fn from_raw_fd(raw_fd: RawFd) -> Self {
+                Self(AnonPipe::from_raw_fd(raw_fd))
+            }
+        }
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl IntoRawFd for $name {
+            fn into_raw_fd(self) -> RawFd {
+                self.0.into_raw_fd()
+            }
+        }
+        #[unstable(feature = "anonymous_pipe", issue = "127154")]
+        impl From<$name> for Stdio {
+            fn from(pipe: $name) -> Self {
+                Self::from(OwnedFd::from(pipe))
+            }
+        }
+    };
+}
+impl_traits!(PipeReader);
+impl_traits!(PipeWriter);
+
+fn convert_to_pipe(owned_fd: OwnedFd) -> io::Result<AnonPipe> {
+    let file = File::from(owned_fd);
+    if file.metadata()?.file_type().is_fifo() {
+        Ok(AnonPipe::from_inner(FileDesc::from_inner(OwnedFd::from(file))))
+    } else {
+        Err(io::Error::new(io::ErrorKind::InvalidInput, "Not a pipe"))
+    }
+}
+
+#[unstable(feature = "anonymous_pipe", issue = "127154")]
+impl TryFrom<OwnedFd> for PipeReader {
+    type Error = io::Error;
+
+    fn try_from(owned_fd: OwnedFd) -> Result<Self, Self::Error> {
+        convert_to_pipe(owned_fd)
+            .and_then(|pipe| {
+                if pipe.as_file_desc().get_access_mode()?.readable {
+                    Ok(pipe)
+                } else {
+                    Err(io::Error::new(
+                        io::ErrorKind::InvalidInput,
+                        format!("Pipe {} is not readable", pipe.as_raw_fd()),
+                    ))
+                }
+            })
+            .map(Self)
+    }
+}
+
+#[unstable(feature = "anonymous_pipe", issue = "127154")]
+impl TryFrom<OwnedFd> for PipeWriter {
+    type Error = io::Error;
+
+    fn try_from(owned_fd: OwnedFd) -> Result<Self, Self::Error> {
+        convert_to_pipe(owned_fd)
+            .and_then(|pipe| {
+                if pipe.as_file_desc().get_access_mode()?.writable {
+                    Ok(pipe)
+                } else {
+                    Err(io::Error::new(
+                        io::ErrorKind::InvalidInput,
+                        format!("Pipe {} is not writable", pipe.as_raw_fd()),
+                    ))
+                }
+            })
+            .map(Self)
+    }
+}