Auto merge of #109 - CryZe:clippy, r=japaric

Fix a few clippy warnings
This commit is contained in:
bors 2016-10-16 10:21:06 -07:00 committed by GitHub
commit c8589a315b
2 changed files with 40 additions and 41 deletions

View File

@ -175,7 +175,8 @@ macro_rules! add {
// correct result in that case. // correct result in that case.
if round_guard_sticky > 0x4 { result += one; } if round_guard_sticky > 0x4 { result += one; }
if round_guard_sticky == 0x4 { result += result & one; } if round_guard_sticky == 0x4 { result += result & one; }
return (<$ty>::from_repr(result.0));
<$ty>::from_repr(result.0)
} }
} }
} }

View File

@ -191,8 +191,7 @@ pub extern "C" fn __udivmoddi4(n: u64, d: u64, rem: Option<&mut u64>) -> u64 {
// 1 <= sr <= u32::bits() - 1 // 1 <= sr <= u32::bits() - 1
q = n << (u64::bits() - sr); q = n << (u64::bits() - sr);
r = n >> sr; r = n >> sr;
} else { } else if d.high() == 0 {
if d.high() == 0 {
// K X // K X
// --- // ---
// 0 K // 0 K
@ -234,7 +233,6 @@ pub extern "C" fn __udivmoddi4(n: u64, d: u64, rem: Option<&mut u64>) -> u64 {
q = n << (u64::bits() - sr); q = n << (u64::bits() - sr);
r = n >> sr; r = n >> sr;
} }
}
// Not a special case // Not a special case
// q and r are initialized with // q and r are initialized with