Merge pull request #1265 from mintlayer/fix/clippy_173

Appease clippy 1.73
mintlayer · Oct 9, 2023 · f6d3f44 · f6d3f44
2 parents e135879 + 0b87b3f
commit f6d3f44
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 12 deletions.
diff --git a/common/src/chain/block/block_body/mod.rs b/common/src/chain/block/block_body/mod.rs
@@ -95,8 +95,7 @@ mod tests {
     }
 
     fn generate_random_bytes(rng: &mut impl Rng, length: usize) -> Vec<u8> {
-        let mut bytes = Vec::new();
-        bytes.resize(length, 0);
+        let mut bytes = vec![0; length];
         rng.fill_bytes(&mut bytes);
         bytes
     }

diff --git a/common/src/chain/transaction/transaction_index/tests.rs b/common/src/chain/transaction/transaction_index/tests.rs
@@ -212,8 +212,7 @@ fn generate_random_h256(rng: &mut impl Rng) -> H256 {
 }
 
 fn generate_random_bytes(rng: &mut impl Rng, length: usize) -> Vec<u8> {
-    let mut bytes = Vec::new();
-    bytes.resize(length, 0);
+    let mut bytes = vec![0; length];
     rng.fill_bytes(&mut bytes);
     bytes
 }

diff --git a/common/src/primitives/id/mod.rs b/common/src/primitives/id/mod.rs
@@ -46,7 +46,15 @@ impl H256 {
     /// are viewed as a byte-array (as is the case with H256), then serializing the type will result in whatever that
     /// byte-array is with no regard to endianness, which is done as big-endian in H256 if seen as a number.
     pub fn as_bitcoin_uint256_hex(&self) -> String {
-        self.as_bytes().iter().rev().map(|b| format!("{:02x}", b)).collect()
+        let hex_length = self.0.len() * 2;
+        self.as_bytes()
+            .iter()
+            .rev()
+            .fold(String::with_capacity(hex_length), |mut current, b| {
+                use std::fmt::Write;
+                let _ = write!(current, "{b:02x}");
+                current
+            })
     }
 
     pub fn into_arith_uint256(self) -> Uint256 {
@@ -132,7 +140,7 @@ impl<T: Eq> Ord for Id<T> {
 // We implement PartialOrd manually to avoid it getting inherited to T through PhantomData, because Id having PartialOrd doesn't mean T requiring Ord
 impl<T: Eq> PartialOrd for Id<T> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.hash.partial_cmp(&other.hash)
+        Some(self.cmp(other))
     }
 }
 

diff --git a/mempool/src/pool/tests/utils.rs b/mempool/src/pool/tests/utils.rs
@@ -99,7 +99,7 @@ pub struct ValuedOutPoint {
 
 impl PartialOrd for ValuedOutPoint {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        other.value.partial_cmp(&self.value)
+        Some(self.cmp(other))
     }
 }
 

diff --git a/merkletree/src/merkle/proof/multi/ordered_node.rs b/merkletree/src/merkle/proof/multi/ordered_node.rs
@@ -48,7 +48,7 @@ impl<T, H> Eq for NodeWithAbsOrder<'_, T, H> {}
 
 impl<T, H> PartialOrd for NodeWithAbsOrder<'_, T, H> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.node.abs_index().partial_cmp(&other.node.abs_index())
+        Some(self.cmp(other))
     }
 }
 

diff --git a/storage/src/database/raw.rs b/storage/src/database/raw.rs
@@ -95,7 +95,7 @@ impl<Sch> Ord for DbMapId<Sch> {
 
 impl<Sch> PartialOrd for DbMapId<Sch> {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.idx.partial_cmp(&other.idx)
+        Some(self.cmp(other))
     }
 }
 

diff --git a/wallet/src/account/utxo_selector/mod.rs b/wallet/src/account/utxo_selector/mod.rs
@@ -177,9 +177,7 @@ impl PartialEq for OutputGroupOrd {
 
 impl PartialOrd for OutputGroupOrd {
     fn partial_cmp(&self, other: &Self) -> Option<std::cmp::Ordering> {
-        self.0
-            .get_effective_value(PayFee::PayFeeWithThisCurrency)
-            .partial_cmp(&other.0.get_effective_value(PayFee::PayFeeWithThisCurrency))
+        Some(self.cmp(other))
     }
 }