aboutsummaryrefslogtreecommitdiff
path: root/src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs
diff options
context:
space:
mode:
authorAndreas Grois <andi@grois.info>2022-11-04 20:51:12 +0100
committerAndreas Grois <andi@grois.info>2022-11-04 20:51:12 +0100
commit36b7ec5ea805196749c7f10f1d8e03ae03564f2b (patch)
tree03956189a30c9cce9be403074ab3ce506d629760 /src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs
parent344264e03d7635b9bd2688390100d3b9f623c58a (diff)
More Clippy lints.
Now Clippy is happy.
Diffstat (limited to 'src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs')
-rw-r--r--src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs b/src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs
index 3d5351a..b805272 100644
--- a/src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs
+++ b/src/passwordmaker/base_conversion/iterative_conversion_impl/mod.rs
@@ -476,7 +476,7 @@ impl<const N : usize> ArbitraryBytes<N>{
}
fn find_first_nonzero_digit(&self) -> usize{
- self.0.iter().enumerate().skip_while(|(_,v)| **v == 0).next().map(|(x,_)| x).unwrap_or(N)
+ self.0.iter().enumerate().find(|(_,v)| **v != 0).map_or(N,|(x,_)| x)
}
fn get_digit_from_right(&self, i : usize) -> u32{
@@ -504,7 +504,7 @@ impl<const N : usize> ArbitraryBytes<N>{
fn slice_overflowing_sub_assign(lhs : &mut [u32], rhs: &[u32]) -> bool{
debug_assert_eq!(lhs.len(), rhs.len());
lhs.iter_mut().zip(rhs.iter()).rev().fold(false,|carry,(a,b)| {
- let r = b.overflowing_add(carry as u32);
+ let r = b.overflowing_add(u32::from(carry));
let s = a.overflowing_sub(r.0);
*a = s.0;
r.1 || s.1
@@ -514,7 +514,7 @@ fn slice_overflowing_sub_assign(lhs : &mut [u32], rhs: &[u32]) -> bool{
fn slice_overflowing_add_assign(lhs : &mut [u32], rhs : &[u32]) -> bool {
debug_assert_eq!(lhs.len(), rhs.len());
lhs.iter_mut().zip(rhs.iter()).rev().fold(false, |carry, (a, b)| {
- let r = b.overflowing_add(carry as u32);
+ let r = b.overflowing_add(u32::from(carry));
let s = a.overflowing_add(r.0);
*a = s.0;
r.1 || s.1
@@ -522,8 +522,8 @@ fn slice_overflowing_add_assign(lhs : &mut [u32], rhs : &[u32]) -> bool {
}
fn u64_from_u32s(m : u32, l : u32) -> u64{
- let m = m as u64;
- let l = l as u64;
+ let m = u64::from(m);
+ let l = u64::from(l);
(m << 32) | l
}