Skip to content

Commit 2dca9dc

Browse files
bors[bot]asomers
andauthored
Merge #2022
2022: Quiet Clippy::manual_slice_size_calculation lints r=asomers a=asomers Co-authored-by: Alan Somers <[email protected]>
2 parents 1bfbb03 + c7d03bc commit 2dca9dc

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/sys/ioctl/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ macro_rules! ioctl_read_buf {
712712
pub unsafe fn $name(fd: $crate::libc::c_int,
713713
data: &mut [$ty])
714714
-> $crate::Result<$crate::libc::c_int> {
715-
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_read!($ioty, $nr, data.len() * ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::ioctl_num_type, data))
715+
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_read!($ioty, $nr, ::std::mem::size_of_val(data)) as $crate::sys::ioctl::ioctl_num_type, data))
716716
}
717717
)
718718
}
@@ -751,7 +751,7 @@ macro_rules! ioctl_write_buf {
751751
pub unsafe fn $name(fd: $crate::libc::c_int,
752752
data: &[$ty])
753753
-> $crate::Result<$crate::libc::c_int> {
754-
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_write!($ioty, $nr, data.len() * ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::ioctl_num_type, data))
754+
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_write!($ioty, $nr, ::std::mem::size_of_val(data)) as $crate::sys::ioctl::ioctl_num_type, data))
755755
}
756756
)
757757
}
@@ -780,7 +780,7 @@ macro_rules! ioctl_readwrite_buf {
780780
pub unsafe fn $name(fd: $crate::libc::c_int,
781781
data: &mut [$ty])
782782
-> $crate::Result<$crate::libc::c_int> {
783-
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_readwrite!($ioty, $nr, data.len() * ::std::mem::size_of::<$ty>()) as $crate::sys::ioctl::ioctl_num_type, data))
783+
convert_ioctl_res!($crate::libc::ioctl(fd, request_code_readwrite!($ioty, $nr, ::std::mem::size_of_val(data)) as $crate::sys::ioctl::ioctl_num_type, data))
784784
}
785785
)
786786
}

src/sys/ptrace/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
///! Provides helpers for making ptrace system calls
1+
//! Provides helpers for making ptrace system calls
22
33
#[cfg(any(target_os = "android", target_os = "linux"))]
44
mod linux;

0 commit comments

Comments
 (0)