Miscellaneous clippy fixes. (#1331)

Author: sunfishcode

src/backend/libc/event/syscalls.rs

@@ -589,6 +589,6 @@ pub(crate) fn epoll_wait(
             events.len().try_into().unwrap_or(i32::MAX),
             timeout,
         ))
-        .map(|i| i.try_into().unwrap_or(usize::MAX))
+        .map(|i| i as usize)
     }
 }

src/backend/libc/fs/syscalls.rs

@@ -1831,7 +1831,6 @@ pub(crate) fn sendfile(
 
 /// Convert from a Linux `statx` value to rustix's `Stat`.
 #[cfg(all(linux_kernel, target_pointer_width = "32"))]
-#[allow(deprecated)] // for `st_[amc]time` u64->i64 transition
 fn statx_to_stat(x: crate::fs::Statx) -> io::Result<Stat> {
     Ok(Stat {
         st_dev: crate::fs::makedev(x.stx_dev_major, x.stx_dev_minor).into(),
@@ -1882,7 +1881,6 @@ fn statx_to_stat(x: crate::fs::Statx) -> io::Result<Stat> {
 
 /// Convert from a Linux `stat64` value to rustix's `Stat`.
 #[cfg(all(linux_kernel, target_pointer_width = "32"))]
-#[allow(deprecated)] // for `st_[amc]time` u64->i64 transition
 fn stat64_to_stat(s64: c::stat64) -> io::Result<Stat> {
     Ok(Stat {
         st_dev: s64.st_dev.try_into().map_err(|_| io::Errno::OVERFLOW)?,

src/backend/libc/net/addr.rs

@@ -2,8 +2,6 @@
 
 use crate::backend::c;
 use crate::net::AddressFamily;
-use core::mem::size_of;
-use core::slice;
 #[cfg(unix)]
 use {
     crate::ffi::CStr,
@@ -13,6 +11,7 @@ use {
     core::cmp::Ordering,
     core::fmt,
     core::hash::{Hash, Hasher},
+    core::slice,
 };
 
 /// `struct sockaddr_un`
@@ -272,16 +271,6 @@ impl SocketAddrStorage {
             )
         }
     }
-
-    /// View the storage as a byte slice.
-    pub fn as_mut_bytes(&mut self) -> &mut [u8] {
-        unsafe {
-            slice::from_raw_parts_mut(
-                crate::utils::as_mut_ptr(self).cast::<u8>(),
-                size_of::<Self>(),
-            )
-        }
-    }
 }
 
 /// Return the offset of the `sun_path` field of `sockaddr_un`.

src/backend/libc/net/sockopt.rs

@@ -82,9 +82,9 @@ use windows_sys::Win32::Foundation::BOOL;
 
 #[inline]
 fn getsockopt<T: Copy>(fd: BorrowedFd<'_>, level: i32, optname: i32) -> io::Result<T> {
-    let mut optlen = core::mem::size_of::<T>().try_into().unwrap();
+    let mut optlen = size_of::<T>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
 
@@ -125,9 +125,9 @@ fn getsockopt_raw<T>(
 
 #[inline]
 fn setsockopt<T: Copy>(fd: BorrowedFd<'_>, level: i32, optname: i32, value: T) -> io::Result<()> {
-    let optlen = core::mem::size_of::<T>().try_into().unwrap();
+    let optlen = size_of::<T>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     setsockopt_raw(fd, level, optname, &value, optlen)
@@ -1077,15 +1077,15 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
     // kernel version. This works because C will layout all struct members one
     // after the other.
 
-    let mut optlen = core::mem::size_of::<xdp_mmap_offsets>().try_into().unwrap();
+    let mut optlen = size_of::<xdp_mmap_offsets>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     let mut value = MaybeUninit::<xdp_mmap_offsets>::zeroed();
     getsockopt_raw(fd, c::SOL_XDP, c::XDP_MMAP_OFFSETS, &mut value, &mut optlen)?;
 
-    if optlen as usize == core::mem::size_of::<c::xdp_mmap_offsets_v1>() {
+    if optlen as usize == size_of::<c::xdp_mmap_offsets_v1>() {
         // Safety: All members of xdp_mmap_offsets are u64 and thus are correctly
         // initialized by `MaybeUninit::<xdp_statistics>::zeroed()`
         let xpd_mmap_offsets = unsafe { value.assume_init() };
@@ -1118,7 +1118,7 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
     } else {
         assert_eq!(
             optlen as usize,
-            core::mem::size_of::<xdp_mmap_offsets>(),
+            size_of::<xdp_mmap_offsets>(),
             "unexpected getsockopt size"
         );
         // Safety: All members of xdp_mmap_offsets are u64 and thus are correctly
@@ -1156,15 +1156,15 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
 #[cfg(target_os = "linux")]
 #[inline]
 pub(crate) fn xdp_statistics(fd: BorrowedFd<'_>) -> io::Result<XdpStatistics> {
-    let mut optlen = core::mem::size_of::<xdp_statistics>().try_into().unwrap();
+    let mut optlen = size_of::<xdp_statistics>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     let mut value = MaybeUninit::<xdp_statistics>::zeroed();
     getsockopt_raw(fd, c::SOL_XDP, c::XDP_STATISTICS, &mut value, &mut optlen)?;
 
-    if optlen as usize == core::mem::size_of::<xdp_statistics_v1>() {
+    if optlen as usize == size_of::<xdp_statistics_v1>() {
         // Safety: All members of xdp_statistics are u64 and thus are correctly
         // initialized by `MaybeUninit::<xdp_statistics>::zeroed()`
         let xdp_statistics = unsafe { value.assume_init() };
@@ -1179,7 +1179,7 @@ pub(crate) fn xdp_statistics(fd: BorrowedFd<'_>) -> io::Result<XdpStatistics> {
     } else {
         assert_eq!(
             optlen as usize,
-            core::mem::size_of::<xdp_statistics>(),
+            size_of::<xdp_statistics>(),
             "unexpected getsockopt size"
         );
         // Safety: All members of xdp_statistics are u64 and thus are correctly

src/backend/libc/pipe/types.rs

@@ -81,7 +81,7 @@ impl<'a> IoSliceRaw<'a> {
     pub fn from_slice(buf: &'a [u8]) -> Self {
         IoSliceRaw {
             _buf: c::iovec {
-                iov_base: buf.as_ptr() as *mut u8 as *mut c::c_void,
+                iov_base: (buf.as_ptr() as *mut u8).cast::<c::c_void>(),
                 iov_len: buf.len() as _,
             },
             _lifetime: PhantomData,
@@ -92,7 +92,7 @@ impl<'a> IoSliceRaw<'a> {
     pub fn from_slice_mut(buf: &'a mut [u8]) -> Self {
         IoSliceRaw {
             _buf: c::iovec {
-                iov_base: buf.as_mut_ptr() as *mut c::c_void,
+                iov_base: buf.as_mut_ptr().cast::<c::c_void>(),
                 iov_len: buf.len() as _,
             },
             _lifetime: PhantomData,

src/backend/libc/pty/syscalls.rs

@@ -85,7 +85,7 @@ pub(crate) fn ptsname(fd: BorrowedFd<'_>, mut buffer: Vec<u8>) -> io::Result<CSt
                 match c::ioctl(borrowed_fd(fd), c::TIOCPTYGNAME as _, &mut name) {
                     0 => {
                         let len = CStr::from_ptr(name.as_ptr().cast()).to_bytes().len();
-                        std::ptr::copy_nonoverlapping(name.as_ptr(), buffer.as_mut_ptr(), len + 1);
+                        core::ptr::copy_nonoverlapping(name.as_ptr(), buffer.as_mut_ptr(), len + 1);
                         0
                     }
                     _ => libc_errno::errno().0,

src/backend/linux_raw/fs/syscalls.rs

@@ -718,7 +718,6 @@ fn lstat_old(path: &CStr) -> io::Result<Stat> {
     target_arch = "mips64",
     target_arch = "mips64r6"
 ))]
-#[allow(deprecated)] // for `st_[amc]time` u64->i64 transition
 fn statx_to_stat(x: crate::fs::Statx) -> io::Result<Stat> {
     Ok(Stat {
         st_dev: crate::fs::makedev(x.stx_dev_major, x.stx_dev_minor),
@@ -742,7 +741,6 @@ fn statx_to_stat(x: crate::fs::Statx) -> io::Result<Stat> {
 
 /// Convert from a Linux `stat64` value to rustix's `Stat`.
 #[cfg(target_pointer_width = "32")]
-#[allow(deprecated)] // for `st_[amc]time` u64->i64 transition
 fn stat_to_stat(s64: linux_raw_sys::general::stat64) -> io::Result<Stat> {
     Ok(Stat {
         st_dev: s64.st_dev.try_into().map_err(|_| io::Errno::OVERFLOW)?,
@@ -945,7 +943,7 @@ fn statfs_to_statvfs(statfs: StatFs) -> StatVfs {
         f_files: statfs.f_files as u64,
         f_ffree: statfs.f_ffree as u64,
         f_favail: statfs.f_ffree as u64,
-        f_fsid: u64::from(f_fsid_val0 as u32) | u64::from(f_fsid_val1 as u32) << 32,
+        f_fsid: u64::from(f_fsid_val0 as u32) | (u64::from(f_fsid_val1 as u32) << 32),
         f_flag: StatVfsMountFlags::from_bits_retain(statfs.f_flags as u64),
         f_namemax: statfs.f_namelen as u64,
     }

src/backend/linux_raw/net/addr.rs

@@ -13,7 +13,6 @@ use crate::net::AddressFamily;
 use crate::{io, path};
 use core::cmp::Ordering;
 use core::hash::{Hash, Hasher};
-use core::mem::size_of;
 use core::{fmt, slice};
 
 /// `struct sockaddr_un`
@@ -76,12 +75,10 @@ impl SocketAddrUnix {
     ///  - [Linux]
     ///
     /// [Linux]: https://www.man7.org/linux/man-pages/man7/unix.7.html
-    #[cfg(linux_kernel)]
     #[inline]
     pub fn new_unnamed() -> Self {
         Self {
             unix: Self::init(),
-            #[cfg(not(any(bsd, target_os = "haiku")))]
             len: offsetof_sun_path() as SocketAddrLen,
         }
     }
@@ -116,7 +113,6 @@ impl SocketAddrUnix {
     }
 
     /// `true` if the socket address is unnamed.
-    #[cfg(linux_kernel)]
     #[inline]
     pub fn is_unnamed(&self) -> bool {
         self.bytes() == Some(&[])
@@ -234,16 +230,6 @@ impl SocketAddrStorage {
             )
         }
     }
-
-    /// View the storage as a byte slice.
-    pub fn as_mut_bytes(&mut self) -> &mut [u8] {
-        unsafe {
-            slice::from_raw_parts_mut(
-                crate::utils::as_mut_ptr(self).cast::<u8>(),
-                size_of::<Self>(),
-            )
-        }
-    }
 }
 
 /// Return the offset of the `sun_path` field of `sockaddr_un`.

src/backend/linux_raw/net/sockopt.rs

@@ -22,7 +22,7 @@ use crate::net::{
 use alloc::borrow::ToOwned;
 #[cfg(feature = "alloc")]
 use alloc::string::String;
-use core::mem::MaybeUninit;
+use core::mem::{size_of, 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};
@@ -37,9 +37,9 @@ use {
 
 #[inline]
 fn getsockopt<T: Copy>(fd: BorrowedFd<'_>, level: u32, optname: u32) -> io::Result<T> {
-    let mut optlen: c::socklen_t = core::mem::size_of::<T>().try_into().unwrap();
+    let mut optlen: c::socklen_t = size_of::<T>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
 
@@ -48,7 +48,7 @@ fn getsockopt<T: Copy>(fd: BorrowedFd<'_>, level: u32, optname: u32) -> io::Resu
 
     assert_eq!(
         optlen as usize,
-        core::mem::size_of::<T>(),
+        size_of::<T>(),
         "unexpected getsockopt size"
     );
 
@@ -92,9 +92,9 @@ fn getsockopt_raw<T>(
 
 #[inline]
 fn setsockopt<T: Copy>(fd: BorrowedFd<'_>, level: u32, optname: u32, value: T) -> io::Result<()> {
-    let optlen = core::mem::size_of::<T>().try_into().unwrap();
+    let optlen = size_of::<T>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     setsockopt_raw(fd, level, optname, &value, optlen)
@@ -883,15 +883,15 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
     // kernel version. This works because C will layout all struct members one
     // after the other.
 
-    let mut optlen = core::mem::size_of::<xdp_mmap_offsets>().try_into().unwrap();
+    let mut optlen = size_of::<xdp_mmap_offsets>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     let mut value = MaybeUninit::<xdp_mmap_offsets>::zeroed();
     getsockopt_raw(fd, c::SOL_XDP, c::XDP_MMAP_OFFSETS, &mut value, &mut optlen)?;
 
-    if optlen as usize == core::mem::size_of::<c::xdp_mmap_offsets_v1>() {
+    if optlen as usize == size_of::<c::xdp_mmap_offsets_v1>() {
         // Safety: All members of xdp_mmap_offsets are u64 and thus are correctly
         // initialized by `MaybeUninit::<xdp_statistics>::zeroed()`
         let xpd_mmap_offsets = unsafe { value.assume_init() };
@@ -924,7 +924,7 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
     } else {
         assert_eq!(
             optlen as usize,
-            core::mem::size_of::<xdp_mmap_offsets>(),
+            size_of::<xdp_mmap_offsets>(),
             "unexpected getsockopt size"
         );
         // Safety: All members of xdp_mmap_offsets are u64 and thus are correctly
@@ -962,15 +962,15 @@ pub(crate) fn xdp_mmap_offsets(fd: BorrowedFd<'_>) -> io::Result<XdpMmapOffsets>
 #[cfg(target_os = "linux")]
 #[inline]
 pub(crate) fn xdp_statistics(fd: BorrowedFd<'_>) -> io::Result<XdpStatistics> {
-    let mut optlen = core::mem::size_of::<xdp_statistics>().try_into().unwrap();
+    let mut optlen = size_of::<xdp_statistics>().try_into().unwrap();
     debug_assert!(
-        optlen as usize >= core::mem::size_of::<c::c_int>(),
+        optlen as usize >= size_of::<c::c_int>(),
         "Socket APIs don't ever use `bool` directly"
     );
     let mut value = MaybeUninit::<xdp_statistics>::zeroed();
     getsockopt_raw(fd, c::SOL_XDP, c::XDP_STATISTICS, &mut value, &mut optlen)?;
 
-    if optlen as usize == core::mem::size_of::<xdp_statistics_v1>() {
+    if optlen as usize == size_of::<xdp_statistics_v1>() {
         // Safety: All members of xdp_statistics are u64 and thus are correctly
         // initialized by `MaybeUninit::<xdp_statistics>::zeroed()`
         let xdp_statistics = unsafe { value.assume_init() };
@@ -985,7 +985,7 @@ pub(crate) fn xdp_statistics(fd: BorrowedFd<'_>) -> io::Result<XdpStatistics> {
     } else {
         assert_eq!(
             optlen as usize,
-            core::mem::size_of::<xdp_statistics>(),
+            size_of::<xdp_statistics>(),
             "unexpected getsockopt size"
         );
         // Safety: All members of xdp_statistics are u64 and thus are correctly

src/backend/linux_raw/param/auxv.rs

@@ -32,10 +32,6 @@ use linux_raw_sys::general::{
 #[cfg(feature = "alloc")]
 use {alloc::borrow::Cow, alloc::vec};
 
-// TODO: Fix linux-raw-sys to define EM_CURRENT for s390x.
-#[cfg(target_arch = "s390x")]
-const EM_CURRENT: u16 = 22; // EM_S390
-
 #[cfg(feature = "param")]
 #[inline]
 pub(crate) fn page_size() -> usize {
@@ -248,7 +244,7 @@ fn pr_get_auxv_dynamic(buffer: &mut [u8; 512]) -> crate::io::Result<Cow<'_, [u8]
     };
 
     // If that indicates it needs a bigger buffer, allocate one.
-    let mut buffer = vec![0u8; len];
+    let mut buffer = vec![0_u8; len];
     let len = unsafe {
         ret_usize(syscall_always_asm!(
             __NR_prctl,
@@ -282,7 +278,7 @@ fn maybe_init_auxv() {
 /// /proc/self/auxv for kernels that don't support `PR_GET_AUXV`.
 #[cold]
 fn init_auxv_impl() -> Result<(), ()> {
-    let mut buffer = [0u8; 512];
+    let mut buffer = [0_u8; 512];
 
     // If we don't have "alloc", just try to read into our statically-sized
     // buffer. This might fail due to the buffer being insufficient; we're