Skip to content

Commit 430c0b4

Browse files
committed
fix some clippy warnings
1 parent 96eafff commit 430c0b4

File tree

4 files changed

+8
-13
lines changed

4 files changed

+8
-13
lines changed

src/mem/impls.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
1-
use super::c_int;
2-
31
#[inline(always)]
42
pub unsafe fn copy_forward(dest: *mut u8, src: *const u8, n: usize) {
53
let mut i = 0;
64
while i < n {
7-
*dest.offset(i as isize) = *src.offset(i as isize);
5+
*dest.add(i) = *src.add(i);
86
i += 1;
97
}
108
}
@@ -15,15 +13,15 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, n: usize) {
1513
let mut i = n;
1614
while i != 0 {
1715
i -= 1;
18-
*dest.offset(i as isize) = *src.offset(i as isize);
16+
*dest.add(i) = *src.add(i);
1917
}
2018
}
2119

2220
#[inline(always)]
2321
pub unsafe fn set_bytes(s: *mut u8, c: u8, n: usize) {
2422
let mut i = 0;
2523
while i < n {
26-
*s.offset(i as isize) = c;
24+
*s.add(i) = c;
2725
i += 1;
2826
}
2927
}

src/mem/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ pub unsafe extern "C" fn memset(s: *mut u8, c: c_int, n: usize) -> *mut u8 {
4545
pub unsafe extern "C" fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32 {
4646
let mut i = 0;
4747
while i < n {
48-
let a = *s1.offset(i as isize);
49-
let b = *s2.offset(i as isize);
48+
let a = *s1.add(i);
49+
let b = *s2.add(i);
5050
if a != b {
5151
return a as i32 - b as i32;
5252
}

src/mem/x86_64.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, count: usize) {
5959
"cld",
6060
byte_count = in(reg) byte_count,
6161
inout("rcx") qword_count => _,
62-
inout("rdi") dest.offset(count as isize).wrapping_sub(8) => _,
63-
inout("rsi") src.offset(count as isize).wrapping_sub(8) => _,
62+
inout("rdi") dest.add(count).wrapping_sub(8) => _,
63+
inout("rsi") src.add(count).wrapping_sub(8) => _,
6464
options(nostack)
6565
);
6666
}

testcrate/build.rs

+1-4
Original file line numberDiff line numberDiff line change
@@ -648,10 +648,7 @@ fn main() {
648648
return None;
649649
}
650650
let c = a.0 / b.0;
651-
if a.0.is_nan()
652-
|| b.0.is_nan()
653-
|| c.is_nan()
654-
|| c.abs() <= f32::from_bits(16777215u32)
651+
if a.0.is_nan() || b.0.is_nan() || c.is_nan() || c.abs() <= f32::from_bits(16777215u32)
655652
{
656653
None
657654
} else {

0 commit comments

Comments
 (0)