Address clippy lints

uapi-proc/src/lib.rs

@@ -270,8 +270,7 @@ pub fn sock_opt(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
     if get {
         let man = format!(
             "getsockopt(2) with level = `{}` and optname = `{}`",
-            level.to_string(),
-            optname.to_string()
+            level, optname
         );
         let fnname = Ident::new(
             &format!("getsockopt_{}", optname.to_string().to_lowercase()),
@@ -291,8 +290,7 @@ pub fn sock_opt(item: proc_macro::TokenStream) -> proc_macro::TokenStream {
     if set {
         let man = format!(
             "setsockopt(2) with level = `{}` and optname = `{}`",
-            level.to_string(),
-            optname.to_string()
+            level, optname
         );
         let fnname = Ident::new(
             &format!("setsockopt_{}", optname.to_string().to_lowercase()),

uapi-testutils/src/strace.rs

@@ -34,7 +34,7 @@ pub fn strace<T, F: FnOnce() -> T>(trace: bool, f: F) -> T {
         let mut pipe = || loop {
             let res = read(*stderr, &mut buf[..]);
             match res {
-                Ok(buf) if buf.is_empty() => break,
+                Ok([]) => break,
                 Err(Errno(c::EAGAIN)) => break,
                 Ok(buf) => {
                     // std::io::Write::write_all(&mut Fd::new(2), &buf[..n]).unwrap();

uapi/src/file/linux.rs

@@ -17,7 +17,7 @@ pub fn copy_file_range(
             off_in.map(|p| p as *mut _).unwrap_or(ptr::null_mut()) as usize,
             fd_out as usize,
             off_out.map(|p| p as *mut _).unwrap_or(ptr::null_mut()) as usize,
-            len as usize,
+            len,
             flags as usize,
         )
     };

uapi/src/ioctl/linux.rs

@@ -39,11 +39,11 @@ pub const _IOC_TYPEBITS: u64 = 8;
 /// [`_IOC_NRSHIFT`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)
 pub const _IOC_NRSHIFT: u64 = 0;
 /// [`_IOC_TYPESHIFT`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)
-pub const _IOC_TYPESHIFT: u64 = _IOC_NRSHIFT + _IOC_NRBITS as u64;
+pub const _IOC_TYPESHIFT: u64 = _IOC_NRSHIFT + _IOC_NRBITS;
 /// [`_IOC_SIZESHIFT`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)
-pub const _IOC_SIZESHIFT: u64 = _IOC_TYPESHIFT + _IOC_TYPEBITS as u64;
+pub const _IOC_SIZESHIFT: u64 = _IOC_TYPESHIFT + _IOC_TYPEBITS;
 /// [`_IOC_DIRSHIFT`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)
-pub const _IOC_DIRSHIFT: u64 = _IOC_SIZESHIFT + _IOC_SIZEBITS as u64;
+pub const _IOC_DIRSHIFT: u64 = _IOC_SIZESHIFT + _IOC_SIZEBITS;
 /// [`_IOC_NRMASK`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)
 pub const _IOC_NRMASK: u64 = (1 << _IOC_NRBITS) - 1;
 /// [`_IOC_TYPEMASK`](https://github.com/torvalds/linux/blob/v5.6/include/uapi/asm-generic/ioctl.h)

uapi/src/sched/linux.rs

@@ -7,7 +7,7 @@ pub fn sched_setaffinity(pid: c::pid_t, mask: &[usize]) -> Result<()> {
         let res = c::syscall(
             c::SYS_sched_setaffinity,
             pid as usize,
-            mem::size_of_val(mask) as usize,
+            mem::size_of_val(mask),
             mask.as_ptr() as usize,
         );
         map_err!(res).map(drop)
@@ -20,7 +20,7 @@ pub fn sched_getaffinity(pid: c::pid_t, mask: &mut [usize]) -> Result<usize> {
         let res = c::syscall(
             c::SYS_sched_getaffinity,
             pid as usize,
-            mem::size_of_val(mask) as usize,
+            mem::size_of_val(mask),
             mask.as_mut_ptr() as usize,
         );
         map_err!(res).map(|v| v as usize)

uapi/src/socket/cmsg.rs

@@ -118,6 +118,6 @@ pub fn cmsg_write<T: ?Sized>(
         ptr.add(HDR_SPACE)
             .copy_from_nonoverlapping(data as *const _ as *const _, data_size);
     }
-    *buf = &mut mem::replace(buf, &mut [])[cmsg_space..];
+    *buf = &mut mem::take(buf)[cmsg_space..];
     Ok(cmsg_space)
 }

uapi/src/ustr/mod.rs

@@ -1,6 +1,5 @@
 pub use self::{
-    as_ustr::*, bstr::*, bytes::*, eq::*, into::*, read::*, ustr::*, ustring::*,
-    ustrptr::*,
+    as_ustr::*, bstr::*, bytes::*, into::*, read::*, ustr::*, ustring::*, ustrptr::*,
 };
 
 mod as_ustr;

uapi/tests/main/fcntl/mod.rs

@@ -3,7 +3,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/file/mod.rs

@@ -7,7 +7,6 @@ use uapi::*;
 cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/ioctl/mod.rs

@@ -3,6 +3,5 @@ use cfg_if::cfg_if;
 cfg_if! {
     if #[cfg(any(target_os = "linux", target_os = "android"))] {
         mod linux;
-        pub use linux::*;
     }
 }

uapi/tests/main/mount/mod.rs

@@ -3,6 +3,5 @@ use cfg_if::cfg_if;
 cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }

uapi/tests/main/other/mod.rs

@@ -3,7 +3,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/poll/mod.rs

@@ -3,7 +3,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/process/mod.rs

@@ -3,7 +3,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/sched/mod.rs

@@ -3,7 +3,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/socket/mod.rs

@@ -11,7 +11,6 @@ use uapi::*;
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }
 

uapi/tests/main/timer/mod.rs

@@ -1,6 +1,5 @@
 cfg_if::cfg_if! {
     if #[cfg(target_os = "linux")] {
         mod linux;
-        pub use linux::*;
     }
 }