Flatten net module again.

rust-lang · Aug 24, 2022 · d61ecec · d61ecec
1 parent 89c74e8
commit d61ecec
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 9 deletions.
diff --git a/library/std/src/net/addr/mod.rs b/library/std/src/net/addr/mod.rs
diff --git a/library/std/src/net/addr/display_buffer.rs → library/std/src/net/display_buffer.rs b/library/std/src/net/addr/display_buffer.rs → library/std/src/net/display_buffer.rs
diff --git a/library/std/src/net/addr/ip/mod.rs → library/std/src/net/ip_addr.rs b/library/std/src/net/addr/ip/mod.rs → library/std/src/net/ip_addr.rs
diff --git a/library/std/src/net/addr/ip/tests.rs → library/std/src/net/ip_addr/tests.rs b/library/std/src/net/addr/ip/tests.rs → library/std/src/net/ip_addr/tests.rs
diff --git a/library/std/src/net/mod.rs b/library/std/src/net/mod.rs
@@ -24,19 +24,22 @@
 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")]
 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)]
 mod test;

diff --git a/library/std/src/net/addr/parser/mod.rs → library/std/src/net/parser.rs b/library/std/src/net/addr/parser/mod.rs → library/std/src/net/parser.rs
diff --git a/library/std/src/net/addr/parser/tests.rs → library/std/src/net/parser/tests.rs b/library/std/src/net/addr/parser/tests.rs → library/std/src/net/parser/tests.rs
diff --git a/library/std/src/net/addr/socket/mod.rs → library/std/src/net/socket_addr.rs b/library/std/src/net/addr/socket/mod.rs → library/std/src/net/socket_addr.rs
diff --git a/library/std/src/net/addr/socket/tests.rs → library/std/src/net/socket_addr/tests.rs b/library/std/src/net/addr/socket/tests.rs → library/std/src/net/socket_addr/tests.rs