From 29eb8fd77bb83349fabf47eb1eee1af427e9b80c Mon Sep 17 00:00:00 2001 From: nicoo Date: Sun, 24 May 2020 17:06:19 +0200 Subject: [PATCH] format: Make clippy happy --- src/uu/factor/src/factor.rs | 2 +- src/uu/factor/src/miller_rabin.rs | 6 +++--- src/uu/factor/src/rho.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/uu/factor/src/factor.rs b/src/uu/factor/src/factor.rs index 5a458a143..493d60912 100644 --- a/src/uu/factor/src/factor.rs +++ b/src/uu/factor/src/factor.rs @@ -87,7 +87,7 @@ fn factor(mut n: u64) -> Factors { let z = n.trailing_zeros(); if z > 0 { factors.add(2, z as u8); - n = n >> z; + n >>= z; } if n == 1 { diff --git a/src/uu/factor/src/miller_rabin.rs b/src/uu/factor/src/miller_rabin.rs index 42c19b24f..9f9dfc913 100644 --- a/src/uu/factor/src/miller_rabin.rs +++ b/src/uu/factor/src/miller_rabin.rs @@ -2,6 +2,7 @@ use crate::numeric::*; // Small set of bases for the Miller-Rabin prime test, valid for all 64b integers; // discovered by Jim Sinclair on 2011-04-20, see miller-rabin.appspot.com +#[allow(clippy::unreadable_literal)] const BASIS: [u64; 7] = [2, 325, 9375, 28178, 450775, 9780504, 1795265022]; #[derive(Eq, PartialEq)] @@ -13,7 +14,7 @@ pub(crate) enum Result { impl Result { pub(crate) fn is_prime(&self) -> bool { - return *self == Result::Prime; + *self == Result::Prime } } @@ -29,8 +30,7 @@ pub(crate) fn test(n: u64) -> Result { return if n == 2 { Prime } else { Composite(2) }; } - let d = (n - 1).trailing_zeros(); - let r = (n - 1) >> d; + let r = (n - 1) >> (n - 1).trailing_zeros(); let mul = if n < 1 << 63 { sm_mul as fn(u64, u64, u64) -> u64 diff --git a/src/uu/factor/src/rho.rs b/src/uu/factor/src/rho.rs index e1a009810..acd07e2da 100644 --- a/src/uu/factor/src/rho.rs +++ b/src/uu/factor/src/rho.rs @@ -53,7 +53,7 @@ pub(crate) fn factor(mut num: u64) -> Factors { } Composite(d) => { - num = num / d; + num /= d; factors *= factor(d); }