Change imports for cfg(doc)

Dylan-DPC-zz · Sep 27, 2020 · 7eea071 · 7eea071
1 parent 20c88dd
commit 7eea071
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 30 deletions.
diff --git a/library/std/src/sys/unix/ext/net/addr.rs b/library/std/src/sys/unix/ext/net/addr.rs
@@ -1,7 +1,7 @@
 use crate::ffi::OsStr;
 use crate::os::unix::ffi::OsStrExt;
 use crate::path::Path;
-use crate::sys::unix::cvt;
+use crate::sys::cvt;
 use crate::{ascii, fmt, io, mem};
 
 // FIXME(#43348): Make libc adapt #[doc(cfg(...))] so we don't need these fake definitions here?

diff --git a/library/std/src/sys/unix/ext/net/ancillary.rs b/library/std/src/sys/unix/ext/net/ancillary.rs
@@ -1,3 +1,4 @@
+use super::{sockaddr_un, SocketAddr};
 use crate::convert::TryFrom;
 use crate::io::{self, IoSliceMut};
 use crate::marker::PhantomData;
@@ -6,8 +7,7 @@ use crate::os::unix::io::RawFd;
 use crate::path::Path;
 use crate::ptr::read_unaligned;
 use crate::slice::from_raw_parts;
-use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
-use crate::sys::unix::net::Socket;
+use crate::sys::net::Socket;
 
 #[cfg(any(target_os = "android", target_os = "linux",))]
 use libc::{gid_t, pid_t, uid_t};

diff --git a/library/std/src/sys/unix/ext/net/datagram.rs b/library/std/src/sys/unix/ext/net/datagram.rs
@@ -7,12 +7,10 @@
     target_os = "netbsd",
     target_os = "openbsd",
 ))]
-use crate::io::IoSliceMut;
-use crate::net::Shutdown;
-use crate::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
-use crate::path::Path;
-use crate::sys::unix::cvt;
-use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
+use super::{
+    recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, sockaddr_un, SocketAddr,
+    SocketAncillary,
+};
 #[cfg(any(
     target_os = "android",
     target_os = "dragonfly",
@@ -22,10 +20,12 @@ use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
     target_os = "netbsd",
     target_os = "openbsd",
 ))]
-use crate::sys::unix::ext::net::ancillary::{
-    recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, SocketAncillary,
-};
-use crate::sys::unix::net::Socket;
+use crate::io::IoSliceMut;
+use crate::net::Shutdown;
+use crate::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
+use crate::path::Path;
+use crate::sys::cvt;
+use crate::sys::net::Socket;
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::time::Duration;
 use crate::{fmt, io};

diff --git a/library/std/src/sys/unix/ext/net/listener.rs b/library/std/src/sys/unix/ext/net/listener.rs
@@ -1,9 +1,8 @@
+use super::{sockaddr_un, SocketAddr, UnixStream};
 use crate::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd, RawFd};
 use crate::path::Path;
+use crate::sys::cvt;
 use crate::sys::net::Socket;
-use crate::sys::unix::cvt;
-use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
-use crate::sys::unix::ext::net::stream::UnixStream;
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::{fmt, io, mem};
 

diff --git a/library/std/src/sys/unix/ext/net/stream.rs b/library/std/src/sys/unix/ext/net/stream.rs
@@ -1,3 +1,16 @@
+#[cfg(any(
+    target_os = "android",
+    target_os = "dragonfly",
+    target_os = "emscripten",
+    target_os = "freebsd",
+    target_os = "linux",
+    target_os = "netbsd",
+    target_os = "openbsd",
+))]
+use super::{
+    recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, sockaddr_un, SocketAddr,
+    SocketAncillary,
+};
 use crate::fmt;
 use crate::io::{self, Initializer, IoSlice, IoSliceMut};
 use crate::net::Shutdown;
@@ -15,19 +28,6 @@ use crate::os::unix::ucred;
 use crate::path::Path;
 use crate::sys::cvt;
 use crate::sys::net::Socket;
-use crate::sys::unix::ext::net::addr::{sockaddr_un, SocketAddr};
-#[cfg(any(
-    target_os = "android",
-    target_os = "dragonfly",
-    target_os = "emscripten",
-    target_os = "freebsd",
-    target_os = "linux",
-    target_os = "netbsd",
-    target_os = "openbsd",
-))]
-use crate::sys::unix::ext::net::ancillary::{
-    recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, SocketAncillary,
-};
 use crate::sys_common::{AsInner, FromInner, IntoInner};
 use crate::time::Duration;
 

diff --git a/library/std/src/sys/unix/ext/net/tests.rs b/library/std/src/sys/unix/ext/net/tests.rs
@@ -2,7 +2,7 @@ use super::*;
 use crate::io::prelude::*;
 use crate::io::{self, ErrorKind, IoSlice, IoSliceMut};
 use crate::iter::FromIterator;
-use crate::sys::unix::ext::io::AsRawFd;
+use crate::os::unix::io::AsRawFd;
 use crate::sys_common::io::test::tmpdir;
 use crate::thread;
 use crate::time::Duration;