fix some clippy

input-output-hk · Aug 11, 2020 · 5b8cb3e · 5b8cb3e
1 parent 0c8e181
commit 5b8cb3e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 36 deletions.
diff --git a/btree/src/btreeindex/mod.rs b/btree/src/btreeindex/mod.rs
@@ -80,7 +80,7 @@ where
 
         let pages = Pages::new(PagesInitializationParams {
             storage: pages_storage,
-            page_size: page_size.try_into().unwrap(),
+            page_size,
         });
 
         let first_page_id = metadata.page_manager.new_id();

diff --git a/btree/src/btreeindex/node/internal_node.rs b/btree/src/btreeindex/node/internal_node.rs
@@ -61,10 +61,7 @@ where
         let size_per_key = K::max_size() + size_of::<PageId>();
         let extra_size = LEN_SIZE - LEN_START;
 
-        let max_keys = (usize::try_from(data.as_ref().len()).unwrap()
-            - usize::try_from(extra_size).unwrap()
-            - size_of::<PageId>())
-            / size_per_key;
+        let max_keys = (data.as_ref().len() - extra_size - size_of::<PageId>()) / size_per_key;
 
         InternalNode {
             max_keys,
@@ -105,7 +102,7 @@ where
         assert!(self.keys().len() > 0);
         match self.keys().binary_search(&key) {
             Ok(_) => InternalInsertStatus::DuplicatedKey(key),
-            Err(index) => self.insert_key_child(index.try_into().unwrap(), key, node_id, allocate),
+            Err(index) => self.insert_key_child(index, key, node_id, allocate),
         }
     }
 
@@ -346,10 +343,7 @@ where
         let size_per_key = K::max_size() + size_of::<PageId>();
         let extra_size = LEN_SIZE - LEN_START;
 
-        let max_keys = (usize::try_from(data.as_ref().len()).unwrap()
-            - usize::try_from(extra_size).unwrap()
-            - size_of::<PageId>())
-            / size_per_key;
+        let max_keys = (data.as_ref().len() - extra_size - size_of::<PageId>()) / size_per_key;
 
         InternalNode {
             max_keys,

diff --git a/btree/src/btreeindex/node/leaf_node.rs b/btree/src/btreeindex/node/leaf_node.rs
@@ -62,9 +62,7 @@ where
         let size_per_key = K::max_size() + size_of::<V>();
         let extra_size = LEN_SIZE;
 
-        let max_keys = (usize::try_from(data.as_ref().len()).unwrap()
-            - usize::try_from(extra_size).unwrap())
-            / size_per_key;
+        let max_keys = (data.as_ref().len() - extra_size) / size_per_key;
 
         LeafNode {
             max_keys,
@@ -82,9 +80,7 @@ where
     ) -> LeafInsertStatus<K> {
         match self.keys().binary_search(&key) {
             Ok(_) => LeafInsertStatus::DuplicatedKey(key),
-            Err(index) => {
-                self.insert_key_value(index.try_into().unwrap(), key, value, Some(allocate))
-            }
+            Err(index) => self.insert_key_value(index, key, value, Some(allocate)),
         }
     }
 
@@ -328,9 +324,7 @@ where
         let size_per_key = K::max_size() + size_of::<V>();
         let extra_size = LEN_SIZE;
 
-        let max_keys = (usize::try_from(data.as_ref().len()).unwrap()
-            - usize::try_from(extra_size).unwrap())
-            / size_per_key;
+        let max_keys = (data.as_ref().len() - extra_size) / size_per_key;
 
         LeafNode {
             max_keys,

diff --git a/btree/src/lib.rs b/btree/src/lib.rs
@@ -19,7 +19,6 @@ use mem_page::MemPage;
 
 use crate::btreeindex::BTree;
 use std::borrow::Borrow;
-use std::convert::TryInto;
 use std::fmt::Debug;
 use std::fs::OpenOptions;
 use std::path::Path;
@@ -88,7 +87,7 @@ where
             metadata_file,
             tree_file,
             static_settings_file,
-            page_size.try_into().unwrap(),
+            page_size,
             key_buffer_size,
         )?;
 

diff --git a/chain-impl-mockchain/src/ledger/governance/parameters.rs b/chain-impl-mockchain/src/ledger/governance/parameters.rs
@@ -195,7 +195,7 @@ mod tests {
     fn some_new_governance_criteria() -> GovernanceAcceptanceCriteria {
         let mut new_governance_criteria: GovernanceAcceptanceCriteria = Default::default();
         let new_option = Choice::new(20);
-        new_governance_criteria.favorable = new_option.clone();
+        new_governance_criteria.favorable = new_option;
         new_governance_criteria
     }
 

diff --git a/chain-impl-mockchain/src/ledger/governance/treasury.rs b/chain-impl-mockchain/src/ledger/governance/treasury.rs
@@ -156,7 +156,7 @@ mod tests {
     fn some_new_governance_criteria() -> GovernanceAcceptanceCriteria {
         let mut new_governance_criteria: GovernanceAcceptanceCriteria = Default::default();
         let new_option = Choice::new(20);
-        new_governance_criteria.favorable = new_option.clone();
+        new_governance_criteria.favorable = new_option;
         new_governance_criteria
     }
 }
diff --git a/chain-impl-mockchain/src/stake/controlled.rs b/chain-impl-mockchain/src/stake/controlled.rs
@@ -168,7 +168,7 @@ impl fmt::Debug for StakeControl {
             self.assigned,
             self.control
                 .iter()
-                .map(|(id, account)| (id.clone(), account.clone()))
+                .map(|(id, account)| (id.clone(), *account))
                 .collect::<Vec<(Identifier, Stake)>>()
         )
     }
@@ -255,7 +255,7 @@ mod tests {
         let stake_to_add = Stake(100);
 
         let stake_control =
-            create_stake_control_from(&[(identifier.clone(), stake_to_add.clone())], stake_to_add);
+            create_stake_control_from(&[(identifier.clone(), stake_to_add)], stake_to_add);
 
         assert_eq!(stake_control.total(), Stake(200));
         assert_eq!(stake_control.unassigned(), stake_to_add);
@@ -274,8 +274,8 @@ mod tests {
         let stake_to_add = Stake(100);
         let stake_to_sub = Stake(50);
         let mut stake_control =
-            create_stake_control_from(&[(identifier.clone(), stake_to_add.clone())], stake_to_add);
-        stake_control = stake_control.remove_from(identifier.clone(), stake_to_sub.clone());
+            create_stake_control_from(&[(identifier.clone(), stake_to_add)], stake_to_add);
+        stake_control = stake_control.remove_from(identifier.clone(), stake_to_sub);
 
         assert_eq!(stake_control.total(), Stake(150));
         assert_eq!(stake_control.unassigned(), Stake(100));
@@ -296,7 +296,7 @@ mod tests {
         let stake_to_add = Stake(100);
 
         let stake_control =
-            create_stake_control_from(&[(existing_identifier, stake_to_add.clone())], stake_to_add);
+            create_stake_control_from(&[(existing_identifier, stake_to_add)], stake_to_add);
 
         assert_eq!(stake_control.total(), Stake(200));
         let _ = stake_control.remove_from(non_existing_identifier, stake_to_add);
@@ -308,7 +308,7 @@ mod tests {
         let stake_to_add = Stake(100);
 
         let mut stake_control =
-            create_stake_control_from(&[(identifier.clone(), stake_to_add.clone())], stake_to_add);
+            create_stake_control_from(&[(identifier.clone(), stake_to_add)], stake_to_add);
 
         assert_eq!(stake_control.total(), Stake(200));
 
@@ -333,7 +333,7 @@ mod tests {
         let stake_to_add = Stake(100);
 
         let stake_control =
-            create_stake_control_from(&[(identifier.clone(), stake_to_add.clone())], stake_to_add);
+            create_stake_control_from(&[(identifier.clone(), stake_to_add)], stake_to_add);
 
         assert_eq!(stake_control.total(), Stake(200));
         assert_eq!(stake_control.unassigned(), stake_to_add);
@@ -352,10 +352,10 @@ mod tests {
         let stake_to_add = Stake(100);
 
         let mut stake_control =
-            create_stake_control_from(&[(identifier.clone(), stake_to_add.clone())], stake_to_add);
+            create_stake_control_from(&[(identifier.clone(), stake_to_add)], stake_to_add);
 
-        stake_control = stake_control.remove_from(identifier.clone(), stake_to_add.clone());
-        stake_control = stake_control.remove_unassigned(stake_to_add.clone());
+        stake_control = stake_control.remove_from(identifier.clone(), stake_to_add);
+        stake_control = stake_control.remove_unassigned(stake_to_add);
 
         assert_eq!(stake_control.total(), Stake::zero());
         assert_eq!(stake_control.unassigned(), Stake::zero());
@@ -371,8 +371,8 @@ mod tests {
 
         let stake_control = create_stake_control_from(
             &[
-                (first_identifier.clone(), stake_to_add.clone()),
-                (second_identifier.clone(), stake_to_add.clone()),
+                (first_identifier.clone(), stake_to_add),
+                (second_identifier.clone(), stake_to_add),
             ],
             stake_to_add,
         );

diff --git a/chain-impl-mockchain/src/transaction/builder.rs b/chain-impl-mockchain/src/transaction/builder.rs
@@ -43,7 +43,7 @@ impl Default for TxBuilder {
 
 impl TxBuilder {
     /// Create a new Tx builder
-    #[allow(clippy::reverse_range_loop)]
+    #[allow(clippy::reversed_empty_ranges)]
     pub fn new() -> Self {
         let mut data = Vec::new();
         // push empty hole for fragment overhead space