Move SocketAddrStorage to crate::net::addr

Author: kevinmehall

src/backend/libc/net/sockopt.rs

@@ -47,9 +47,9 @@ use crate::net::Protocol;
     target_env = "newlib"
 ))]
 use crate::net::RawProtocol;
-use crate::net::{Ipv4Addr, Ipv6Addr, SocketType};
 #[cfg(any(linux_kernel, target_os = "fuchsia"))]
-use crate::net::{SocketAddrAny, SocketAddrStorage, SocketAddrV4};
+use crate::net::{addr::SocketAddrStorage, SocketAddrAny, SocketAddrV4};
+use crate::net::{Ipv4Addr, Ipv6Addr, SocketType};
 #[cfg(linux_kernel)]
 use crate::net::{SocketAddrV6, UCred};
 use crate::utils::as_mut_ptr;

src/backend/linux_raw/net/sockopt.rs

@@ -15,8 +15,8 @@ use crate::net::sockopt::Timeout;
 #[cfg(target_os = "linux")]
 use crate::net::xdp::{XdpMmapOffsets, XdpOptionsFlags, XdpRingOffset, XdpStatistics, XdpUmemReg};
 use crate::net::{
-    AddressFamily, Ipv4Addr, Ipv6Addr, Protocol, RawProtocol, SocketAddrAny, SocketAddrStorage,
-    SocketAddrV4, SocketAddrV6, SocketType, UCred,
+    addr::SocketAddrStorage, AddressFamily, Ipv4Addr, Ipv6Addr, Protocol, RawProtocol,
+    SocketAddrAny, SocketAddrV4, SocketAddrV6, SocketType, UCred,
 };
 #[cfg(feature = "alloc")]
 use alloc::borrow::ToOwned;

src/net/addr.rs

@@ -10,6 +10,8 @@ use crate::backend::{
 
 use super::{SocketAddr, SocketAddrV4, SocketAddrV6};
 
+pub use crate::backend::net::addr::SocketAddrStorage;
+
 #[cfg(unix)]
 use super::SocketAddrUnix;
 

src/net/mod.rs

@@ -26,7 +26,7 @@ pub use crate::maybe_polyfill::net::{
 };
 pub use send_recv::*;
 pub use socket::*;
-pub use socket_addr_any::{SocketAddrAny, SocketAddrStorage};
+pub use socket_addr_any::SocketAddrAny;
 #[cfg(not(any(windows, target_os = "wasi")))]
 pub use socketpair::socketpair;
 pub use types::*;

src/net/socket_addr_any.rs

@@ -16,16 +16,14 @@ use crate::net::xdp::SocketAddrXdp;
 #[cfg(unix)]
 use crate::net::SocketAddrUnix;
 use crate::net::{
-    addr::{SocketAddrArg, SocketAddrOpaque},
+    addr::{SocketAddrArg, SocketAddrOpaque, SocketAddrStorage},
     AddressFamily, SocketAddr, SocketAddrV4, SocketAddrV6,
 };
 use crate::{backend, io};
 #[cfg(feature = "std")]
 use core::fmt;
 use core::ptr::copy_nonoverlapping;
 
-pub use backend::net::addr::SocketAddrStorage;
-
 /// `struct sockaddr_storage` as a Rust enum.
 #[derive(Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
 #[doc(alias = "sockaddr")]

src/net/types.rs

@@ -1868,7 +1868,7 @@ fn test_sizes() {
     #[cfg(target_os = "linux")]
     use crate::backend::c;
     use crate::ffi::c_int;
-    use crate::net::SocketAddrStorage;
+    use crate::net::addr::SocketAddrStorage;
     use core::mem::transmute;
 
     // Backend code needs to cast these to `c_int` so make sure that cast isn't

tests/net/addr.rs

@@ -3,7 +3,7 @@ fn encode_decode() {
     #[cfg(unix)]
     use rustix::net::SocketAddrUnix;
     use rustix::net::{
-        Ipv4Addr, Ipv6Addr, SocketAddrAny, SocketAddrStorage, SocketAddrV4, SocketAddrV6,
+        addr::SocketAddrStorage, Ipv4Addr, Ipv6Addr, SocketAddrAny, SocketAddrV4, SocketAddrV6,
     };
 
     unsafe {