Minor formating cleanups (#1330)

Author: sunfishcode

src/backend/libc/net/addr.rs

@@ -79,8 +79,9 @@ impl SocketAddrUnix {
 
     /// Construct a new unnamed address.
     ///
-    /// The kernel will assign an abstract Unix-domain address to the socket when you call
-    /// [`bind_unix()`][crate::net::bind_unix]. You can inspect the assigned name with
+    /// The kernel will assign an abstract Unix-domain address to the socket
+    /// when you call [`bind_unix()`][crate::net::bind_unix]. You can
+    /// inspect the assigned name with
     /// [`getsockname`][crate::net::getsockname].
     ///
     /// # References

src/backend/libc/net/msghdr.rs

@@ -6,8 +6,8 @@
 use crate::backend::c;
 
 use crate::io::{self, IoSlice, IoSliceMut};
-use crate::net::SocketAddrBuf;
-use crate::net::{addr::SocketAddrArg, RecvAncillaryBuffer, SendAncillaryBuffer};
+use crate::net::addr::SocketAddrArg;
+use crate::net::{RecvAncillaryBuffer, SendAncillaryBuffer, SocketAddrBuf};
 
 use core::mem::zeroed;
 

src/backend/libc/net/syscalls.rs

@@ -8,11 +8,11 @@ use crate::backend::conv::ret_u32;
 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::addr::SocketAddrArg;
 #[cfg(target_os = "linux")]
 use crate::net::MMsgHdr;
-use crate::net::SocketAddrBuf;
 use crate::net::{
-    addr::SocketAddrArg, AddressFamily, Protocol, Shutdown, SocketAddrAny, SocketFlags, SocketType,
+    AddressFamily, Protocol, Shutdown, SocketAddrAny, SocketAddrBuf, SocketFlags, SocketType,
 };
 use crate::utils::as_ptr;
 use core::mem::{size_of, MaybeUninit};
@@ -225,7 +225,7 @@ pub(crate) fn sendmsg(
     }
 }
 
-#[cfg(not(any(windows, target_os = "espidf", target_os = "redox", target_os = "vita",)))]
+#[cfg(not(any(windows, target_os = "espidf", target_os = "redox", target_os = "vita")))]
 pub(crate) fn sendmsg_addr(
     sockfd: BorrowedFd<'_>,
     addr: &impl SocketAddrArg,

src/backend/libc/shm/syscalls.rs

@@ -4,8 +4,7 @@ use crate::backend::c;
 use crate::backend::conv::{c_str, ret, ret_owned_fd};
 use crate::fd::OwnedFd;
 use crate::fs::Mode;
-use crate::io;
-use crate::shm;
+use crate::{io, shm};
 
 pub(crate) fn shm_open(name: &CStr, oflags: shm::OFlags, mode: Mode) -> io::Result<OwnedFd> {
     // On this platforms, `mode_t` is `u16` and can't be passed directly to a

src/backend/linux_raw/net/addr.rs

@@ -67,8 +67,9 @@ impl SocketAddrUnix {
 
     /// Construct a new unnamed address.
     ///
-    /// The kernel will assign an abstract Unix-domain address to the socket when you call
-    /// [`bind_unix()`][crate::net::bind_unix]. You can inspect the assigned name with
+    /// The kernel will assign an abstract Unix-domain address to the socket
+    /// when you call [`bind_unix()`][crate::net::bind_unix]. You can
+    /// inspect the assigned name with
     /// [`getsockname`][crate::net::getsockname].
     ///
     /// # References

src/backend/linux_raw/net/msghdr.rs

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

src/backend/linux_raw/net/read_sockaddr.rs

@@ -8,8 +8,9 @@ use crate::net::addr::SocketAddrLen;
 use crate::net::netlink::SocketAddrNetlink;
 #[cfg(target_os = "linux")]
 use crate::net::xdp::{SockaddrXdpFlags, SocketAddrXdp};
-use crate::net::{AddressFamily, SocketAddrAny};
-use crate::net::{Ipv4Addr, Ipv6Addr, SocketAddrUnix, SocketAddrV4, SocketAddrV6};
+use crate::net::{
+    AddressFamily, Ipv4Addr, Ipv6Addr, SocketAddrAny, SocketAddrUnix, SocketAddrV4, SocketAddrV6,
+};
 use core::mem::size_of;
 use core::slice;
 

src/backend/linux_raw/net/sockopt.rs

@@ -14,23 +14,20 @@ use crate::io;
 use crate::net::sockopt::Timeout;
 #[cfg(target_os = "linux")]
 use crate::net::xdp::{XdpMmapOffsets, XdpOptionsFlags, XdpRingOffset, XdpStatistics, XdpUmemReg};
-use crate::net::SocketAddrBuf;
 use crate::net::{
-    AddressFamily, Ipv4Addr, Ipv6Addr, Protocol, RawProtocol, SocketAddrV4, SocketAddrV6,
-    SocketType, UCred,
+    AddressFamily, Ipv4Addr, Ipv6Addr, Protocol, RawProtocol, SocketAddrBuf, SocketAddrV4,
+    SocketAddrV6, SocketType, UCred,
 };
 #[cfg(feature = "alloc")]
 use alloc::borrow::ToOwned;
 #[cfg(feature = "alloc")]
 use alloc::string::String;
 use core::mem::MaybeUninit;
 use core::time::Duration;
+use linux_raw_sys::general::{__kernel_old_timeval, __kernel_sock_timeval};
+use linux_raw_sys::net::{IPV6_MTU, IPV6_MULTICAST_IF, IP_MTU, IP_MULTICAST_IF};
 #[cfg(target_os = "linux")]
 use linux_raw_sys::xdp::{xdp_mmap_offsets, xdp_statistics, xdp_statistics_v1};
-use linux_raw_sys::{
-    general::{__kernel_old_timeval, __kernel_sock_timeval},
-    net::{IPV6_MTU, IPV6_MULTICAST_IF, IP_MTU, IP_MULTICAST_IF},
-};
 #[cfg(target_arch = "x86")]
 use {
     crate::backend::conv::{slice_just_addr, x86_sys},

src/backend/linux_raw/net/syscalls.rs

@@ -18,12 +18,12 @@ use crate::backend::conv::{
 use crate::backend::reg::raw_arg;
 use crate::fd::{BorrowedFd, OwnedFd};
 use crate::io::{self, IoSlice, IoSliceMut};
+use crate::net::addr::SocketAddrArg;
 #[cfg(target_os = "linux")]
 use crate::net::MMsgHdr;
-use crate::net::SocketAddrBuf;
 use crate::net::{
-    addr::SocketAddrArg, AddressFamily, Protocol, RecvAncillaryBuffer, RecvMsg,
-    SendAncillaryBuffer, Shutdown, SocketAddrAny, SocketFlags, SocketType,
+    AddressFamily, Protocol, RecvAncillaryBuffer, RecvMsg, SendAncillaryBuffer, Shutdown,
+    SocketAddrAny, SocketAddrBuf, SocketFlags, SocketType,
 };
 use core::mem::MaybeUninit;
 #[cfg(target_arch = "x86")]

src/backend/linux_raw/process/syscalls.rs

@@ -404,10 +404,16 @@ fn _waitid_pidfd(fd: BorrowedFd<'_>, options: WaitIdOptions) -> io::Result<Optio
 /// The caller must ensure that `status` is initialized and that `waitid`
 /// returned successfully.
 #[inline]
-#[rustfmt::skip]
 unsafe fn cvt_waitid_status(status: MaybeUninit<c::siginfo_t>) -> Option<WaitIdStatus> {
     let status = status.assume_init();
-    if status.__bindgen_anon_1.__bindgen_anon_1._sifields._sigchld._pid == 0 {
+    if status
+        .__bindgen_anon_1
+        .__bindgen_anon_1
+        ._sifields
+        ._sigchld
+        ._pid
+        == 0
+    {
         None
     } else {
         Some(WaitIdStatus(status))