nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-20 11:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix some clippy warnings

Browse Source
This commit is contained in:
Aaron Kutch 2020-11-07 13:09:51 -06:00
parent 26681724f3
commit f61c411e2b
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/compiler-builtins/src/mem/impls.rs
View File

@ -1,10 +1,8 @@
use super::c_int;
#[inline(always)] #[inline(always)]
pub unsafe fn copy_forward(dest: *mut u8, src: *const u8, n: usize) { pub unsafe fn copy_forward(dest: *mut u8, src: *const u8, n: usize) {
let mut i = 0; let mut i = 0;
while i < n { while i < n {
*dest.offset(i as isize) = *src.offset(i as isize); *dest.add(i) = *src.add(i);
i += 1; i += 1;
} }
} }
@ -15,7 +13,7 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, n: usize) {
let mut i = n; let mut i = n;
while i != 0 { while i != 0 {
i -= 1; i -= 1;
*dest.offset(i as isize) = *src.offset(i as isize); *dest.add(i) = *src.add(i);
} }
} }
@ -23,7 +21,7 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, n: usize) {
pub unsafe fn set_bytes(s: *mut u8, c: u8, n: usize) { pub unsafe fn set_bytes(s: *mut u8, c: u8, n: usize) {
let mut i = 0; let mut i = 0;
while i < n { while i < n {
*s.offset(i as isize) = c; *s.add(i) = c;
i += 1; i += 1;
} }
} }

4
library/compiler-builtins/src/mem/mod.rs
View File

@ -45,8 +45,8 @@ pub unsafe extern "C" fn memset(s: *mut u8, c: c_int, n: usize) -> *mut u8 {
pub unsafe extern "C" fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32 { pub unsafe extern "C" fn memcmp(s1: *const u8, s2: *const u8, n: usize) -> i32 {
let mut i = 0; let mut i = 0;
while i < n { while i < n {
let a = *s1.offset(i as isize); let a = *s1.add(i);
let b = *s2.offset(i as isize); let b = *s2.add(i);
if a != b { if a != b {
return a as i32 - b as i32; return a as i32 - b as i32;
} }

4
library/compiler-builtins/src/mem/x86_64.rs
View File

@ -59,8 +59,8 @@ pub unsafe fn copy_backward(dest: *mut u8, src: *const u8, count: usize) {
"cld", "cld",
byte_count = in(reg) byte_count, byte_count = in(reg) byte_count,
inout("rcx") qword_count => _, inout("rcx") qword_count => _,
inout("rdi") dest.offset(count as isize).wrapping_sub(8) => _, inout("rdi") dest.add(count).wrapping_sub(8) => _,
inout("rsi") src.offset(count as isize).wrapping_sub(8) => _, inout("rsi") src.add(count).wrapping_sub(8) => _,
options(nostack) options(nostack)
); );
} }

5
library/compiler-builtins/testcrate/build.rs
View File

@ -648,10 +648,7 @@ fn main() {
return None; return None;
} }
let c = a.0 / b.0; let c = a.0 / b.0;
if a.0.is_nan() if a.0.is_nan() || b.0.is_nan() || c.is_nan() || c.abs() <= f32::from_bits(16777215u32)
|| b.0.is_nan()
|| c.is_nan()
|| c.abs() <= f32::from_bits(16777215u32)
{ {
None None
} else { } else {