Move SocketAddrArg, SocketAddrOpaque to net::addr

Author: kevinmehall

src/backend/libc/net/msghdr.rs

@@ -7,7 +7,7 @@ use crate::backend::c;
 use crate::backend::conv::{msg_control_len, msg_iov_len};
 
 use crate::io::{self, IoSlice, IoSliceMut};
-use crate::net::{RecvAncillaryBuffer, SendAncillaryBuffer, SocketAddrArg};
+use crate::net::{addr::SocketAddrArg, RecvAncillaryBuffer, SendAncillaryBuffer};
 
 use core::mem::{size_of, zeroed, MaybeUninit};
 

src/backend/libc/net/syscalls.rs

@@ -4,7 +4,7 @@ use crate::backend::c;
 use crate::backend::conv::{borrowed_fd, ret, ret_owned_fd, ret_send_recv, send_recv_len};
 use crate::fd::{BorrowedFd, OwnedFd};
 use crate::io;
-use crate::net::{SocketAddrAny, SocketAddrArg};
+use crate::net::{addr::SocketAddrArg, SocketAddrAny};
 use crate::utils::as_ptr;
 use core::mem::{size_of, MaybeUninit};
 #[cfg(not(any(

src/backend/linux_raw/net/msghdr.rs

@@ -8,7 +8,7 @@
 use crate::backend::c;
 
 use crate::io::{self, IoSlice, IoSliceMut};
-use crate::net::{RecvAncillaryBuffer, SendAncillaryBuffer, SocketAddrArg};
+use crate::net::{addr::SocketAddrArg, RecvAncillaryBuffer, SendAncillaryBuffer};
 
 use core::mem::{size_of, MaybeUninit};
 use core::ptr::null_mut;

src/backend/linux_raw/net/syscalls.rs

@@ -17,8 +17,8 @@ use crate::backend::reg::raw_arg;
 use crate::fd::{BorrowedFd, OwnedFd};
 use crate::io::{self, IoSlice, IoSliceMut};
 use crate::net::{
-    AddressFamily, Protocol, RecvAncillaryBuffer, RecvMsgReturn, SendAncillaryBuffer, Shutdown,
-    SocketAddrAny, SocketAddrArg, SocketFlags, SocketType,
+    addr::SocketAddrArg, AddressFamily, Protocol, RecvAncillaryBuffer, RecvMsgReturn,
+    SendAncillaryBuffer, Shutdown, SocketAddrAny, SocketFlags, SocketType,
 };
 use c::{sockaddr_storage, socklen_t};
 use core::mem::MaybeUninit;

src/net/socket_address.rs renamed to src/net/addr.rs

@@ -1,3 +1,5 @@
+//! Socket address types.
+
 #![allow(unsafe_code)]
 use core::mem::size_of;
 

src/net/mod.rs

@@ -7,10 +7,10 @@
 //! [`wsa_startup`]: https://docs.rs/rustix/*/x86_64-pc-windows-msvc/rustix/net/fn.wsa_startup.html
 //! [`wsa_cleanup`]: https://docs.rs/rustix/*/x86_64-pc-windows-msvc/rustix/net/fn.wsa_cleanup.html
 
+pub mod addr;
 mod send_recv;
 mod socket;
 mod socket_addr_any;
-mod socket_address;
 #[cfg(not(any(windows, target_os = "wasi")))]
 mod socketpair;
 mod types;
@@ -27,7 +27,6 @@ pub use crate::maybe_polyfill::net::{
 pub use send_recv::*;
 pub use socket::*;
 pub use socket_addr_any::{SocketAddrAny, SocketAddrStorage};
-pub use socket_address::{SocketAddrArg, SocketAddrOpaque};
 #[cfg(not(any(windows, target_os = "wasi")))]
 pub use socketpair::socketpair;
 pub use types::*;

src/net/send_recv/mod.rs

@@ -7,7 +7,7 @@ use crate::buffer::split_init;
 use crate::net::xdp::SocketAddrXdp;
 #[cfg(unix)]
 use crate::net::SocketAddrUnix;
-use crate::net::{SocketAddrAny, SocketAddrV4, SocketAddrV6};
+use crate::net::{addr::SocketAddrArg, SocketAddrAny, SocketAddrV4, SocketAddrV6};
 use crate::{backend, io};
 use backend::fd::AsFd;
 use core::cmp::min;
@@ -33,8 +33,6 @@ mod msg;
 )))]
 pub use msg::*;
 
-use super::SocketAddrArg;
-
 /// `recv(fd, buf, flags)`—Reads data from a socket.
 ///
 /// This takes a `&mut [u8]` which Rust requires to contain initialized memory.

src/net/send_recv/msg.rs

@@ -5,7 +5,7 @@
 use crate::backend::{self, c};
 use crate::fd::{AsFd, BorrowedFd, OwnedFd};
 use crate::io::{self, IoSlice, IoSliceMut};
-use crate::net::SocketAddrArg;
+use crate::net::addr::SocketAddrArg;
 #[cfg(linux_kernel)]
 use crate::net::UCred;
 #[cfg(feature = "std")]

src/net/socket.rs

@@ -1,5 +1,5 @@
 use crate::fd::OwnedFd;
-use crate::net::{SocketAddrAny, SocketAddrV4, SocketAddrV6};
+use crate::net::{addr::SocketAddrArg, SocketAddrAny, SocketAddrV4, SocketAddrV6};
 use crate::{backend, io};
 use backend::fd::AsFd;
 
@@ -9,8 +9,6 @@ pub use crate::net::{AddressFamily, Protocol, Shutdown, SocketFlags, SocketType}
 #[cfg(unix)]
 pub use backend::net::addr::SocketAddrUnix;
 
-use super::SocketAddrArg;
-
 /// `socket(domain, type_, protocol)`—Creates a socket.
 ///
 /// POSIX guarantees that `socket` will use the lowest unused file descriptor,

src/net/socket_addr_any.rs

@@ -16,7 +16,8 @@ use crate::net::xdp::SocketAddrXdp;
 #[cfg(unix)]
 use crate::net::SocketAddrUnix;
 use crate::net::{
-    AddressFamily, SocketAddr, SocketAddrArg, SocketAddrOpaque, SocketAddrV4, SocketAddrV6,
+    addr::{SocketAddrArg, SocketAddrOpaque},
+    AddressFamily, SocketAddr, SocketAddrV4, SocketAddrV6,
 };
 use crate::{backend, io};
 #[cfg(feature = "std")]

src/net/types.rs

@@ -945,7 +945,7 @@ pub mod netlink {
     use {
         super::{new_raw_protocol, Protocol},
         crate::backend::c,
-        crate::net::{socket_address::call_with_sockaddr, SocketAddrArg, SocketAddrOpaque},
+        crate::net::addr::{call_with_sockaddr, SocketAddrArg, SocketAddrOpaque},
         core::mem,
     };
 
@@ -1543,7 +1543,7 @@ bitflags! {
 /// `AF_XDP` related types and constants.
 #[cfg(target_os = "linux")]
 pub mod xdp {
-    use crate::net::{socket_address::call_with_sockaddr, SocketAddrArg, SocketAddrOpaque};
+    use crate::net::addr::{call_with_sockaddr, SocketAddrArg, SocketAddrOpaque};
 
     use super::{bitflags, c};