Flatten `net` module again.

9 files changed, 7 insertions, 9 deletions

diff --git a/library/std/src/net/addr/mod.rs b/library/std/src/net/addr/mod.rs
deleted file mode 100644
index da33666a580..00000000000
--- a/library/std/src/net/addr/mod.rs
+++ /dev/null
@@ -1,5 +0,0 @@
-mod display_buffer;
-
-pub mod ip;
-pub mod parser;
-pub mod socket;
diff --git a/library/std/src/net/addr/display_buffer.rs b/library/std/src/net/display_buffer.rs
index 7aadf06e92f..7aadf06e92f 100644
--- a/library/std/src/net/addr/display_buffer.rs
+++ b/library/std/src/net/display_buffer.rs
diff --git a/library/std/src/net/addr/ip/mod.rs b/library/std/src/net/ip_addr.rs
index a670f716833..a670f716833 100644
--- a/library/std/src/net/addr/ip/mod.rs
+++ b/library/std/src/net/ip_addr.rs
diff --git a/library/std/src/net/addr/ip/tests.rs b/library/std/src/net/ip_addr/tests.rs
index 7c3430b2b21..7c3430b2b21 100644
--- a/library/std/src/net/addr/ip/tests.rs
+++ b/library/std/src/net/ip_addr/tests.rs
diff --git a/library/std/src/net/mod.rs b/library/std/src/net/mod.rs
index 3a2e1d6d24c..01e3db9de51 100644
--- a/library/std/src/net/mod.rs
+++ b/library/std/src/net/mod.rs
@@ -24,11 +24,11 @@
 use crate::io::{self, ErrorKind};
 
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use self::addr::ip::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
+pub use self::ip_addr::{IpAddr, Ipv4Addr, Ipv6Addr, Ipv6MulticastScope};
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use self::addr::parser::AddrParseError;
+pub use self::parser::AddrParseError;
 #[stable(feature = "rust1", since = "1.0.0")]
-pub use self::addr::socket::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
+pub use self::socket_addr::{SocketAddr, SocketAddrV4, SocketAddrV6, ToSocketAddrs};
 #[unstable(feature = "tcplistener_into_incoming", issue = "88339")]
 pub use self::tcp::IntoIncoming;
 #[stable(feature = "rust1", since = "1.0.0")]
@@ -36,7 +36,10 @@ pub use self::tcp::{Incoming, TcpListener, TcpStream};
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use self::udp::UdpSocket;
 
-mod addr;
+mod display_buffer;
+mod ip_addr;
+mod parser;
+mod socket_addr;
 mod tcp;
 #[cfg(test)]
 pub(crate) mod test;
diff --git a/library/std/src/net/addr/parser/mod.rs b/library/std/src/net/parser.rs
index a38031c48c8..a38031c48c8 100644
--- a/library/std/src/net/addr/parser/mod.rs
+++ b/library/std/src/net/parser.rs
diff --git a/library/std/src/net/addr/parser/tests.rs b/library/std/src/net/parser/tests.rs
index 6d2d48ecad0..6d2d48ecad0 100644
--- a/library/std/src/net/addr/parser/tests.rs
+++ b/library/std/src/net/parser/tests.rs
diff --git a/library/std/src/net/addr/socket/mod.rs b/library/std/src/net/socket_addr.rs
index 33b0dfa03e0..33b0dfa03e0 100644
--- a/library/std/src/net/addr/socket/mod.rs
+++ b/library/std/src/net/socket_addr.rs
diff --git a/library/std/src/net/addr/socket/tests.rs b/library/std/src/net/socket_addr/tests.rs
index 15211f81981..15211f81981 100644
--- a/library/std/src/net/addr/socket/tests.rs
+++ b/library/std/src/net/socket_addr/tests.rs