From 1ae54e560a7cf6021a28d2addc6253ae8baab96f Mon Sep 17 00:00:00 2001
From: LinkTed <LinkTed@users.noreply.github.com>
Date: Sun, 27 Sep 2020 22:29:02 +0200
Subject: [PATCH] Change imports for `cfg(doc)`

---
 library/std/src/sys/unix/ext/net/addr.rs      |  2 +-
 library/std/src/sys/unix/ext/net/ancillary.rs |  4 +--
 library/std/src/sys/unix/ext/net/datagram.rs  | 30 +++++++++----------
 library/std/src/sys/unix/ext/net/listener.rs  |  5 ++--
 library/std/src/sys/unix/ext/net/stream.rs    | 26 ++++++++--------
 library/std/src/sys/unix/ext/net/tests.rs     |  2 +-
 6 files changed, 34 insertions(+), 35 deletions(-)

diff --git a/library/std/src/sys/unix/ext/net/addr.rs b/library/std/src/sys/unix/ext/net/addr.rs
index 15fc5bb5b4e..1f9036242eb 100644
--- 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
index 547c9c7dcbe..9e8da6306ca 100644
--- 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
index 9d9df6959b2..ce91b403efd 100644
--- a/library/std/src/sys/unix/ext/net/datagram.rs
+++ b/library/std/src/sys/unix/ext/net/datagram.rs
@@ -7,25 +7,25 @@
     target_os = "netbsd",
     target_os = "openbsd",
 ))]
+use super::{
+    recv_vectored_with_ancillary_from, send_vectored_with_ancillary_to, sockaddr_un, SocketAddr,
+    SocketAncillary,
+};
+#[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::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};
-#[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::unix::net::Socket;
+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
index 2bedfb74dcb..9803c6e2746 100644
--- 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
index 8337487ff47..e13c863bdbb 100644
--- 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
index cb04de18828..bf114bbe6e5 100644
--- 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;