Merge pull request #2055 from mintlayer/appease_clippy_1.95

Fix clippy 1.95 errors

Author: ImplOfAnImpl

api-server/api-server-common/src/storage/impls/in_memory/mod.rs

@@ -190,7 +190,7 @@ impl ApiServerInMemoryStorage {
             .address_transactions_table
             .get(address)
             .map_or_else(Vec::new, |transactions| {
-                transactions.iter().flat_map(|(_, txs)| txs.iter()).cloned().collect()
+                transactions.values().flat_map(|txs| txs.iter()).cloned().collect()
             }))
     }
 

blockprod/src/detail/tests.rs

@@ -1364,7 +1364,7 @@ mod produce_block {
                             let origin = LocalTxOrigin::Mempool;
                             let options = TxOptions::default_for(origin.into());
 
-                            for tx in std::iter::once(main_tx).chain(dependent_txs.into_iter()) {
+                            for tx in std::iter::once(main_tx).chain(dependent_txs) {
                                 mp.add_transaction_local(tx, origin, options.clone()).unwrap();
                             }
                         }

chainstate/db-dumper/src/dumper_lib/tests/mod.rs

@@ -266,7 +266,7 @@ fn dump_blocks_random(
             }
 
             infos.shuffle(&mut rng);
-            infos.sort_by(|b1, b2| b1.input_info.height.cmp(&b2.input_info.height));
+            infos.sort_by_key(|b| b.input_info.height);
         }
 
         infos

chainstate/src/detail/block_invalidation/best_chain_candidates_tests.rs

@@ -367,7 +367,7 @@ mod test_framework {
                     }
                 })
                 .collect();
-            ids_heights.sort_by(|(_, height1), (_, height2)| height1.cmp(height2));
+            ids_heights.sort_by_key(|(_, height)| *height);
             Ok(ids_heights.iter().map(|(id, _)| *id).collect())
         }
 

chainstate/src/detail/chainstateref/mod.rs

@@ -1002,10 +1002,7 @@ impl<'a, S: BlockchainStorageRead, V: TransactionVerificationStrategy> Chainstat
         start_from: BlockHeight,
     ) -> Result<Vec<Id<Block>>, PropertyQueryError> {
         let block_tree_map = self.db_tx.get_block_tree_by_height(start_from)?;
-        let result = block_tree_map
-            .into_iter()
-            .flat_map(|(_height, ids_per_height)| ids_per_height)
-            .collect();
+        let result = block_tree_map.into_values().flatten().collect();
         Ok(result)
     }
 

common/src/chain/config/regtest_options.rs

@@ -168,9 +168,10 @@ pub fn regtest_chain_config_builder(options: &ChainConfigOptions) -> Result<Buil
     update_builder!(max_block_size_with_standard_txs);
     update_builder!(max_block_size_with_smart_contracts);
 
-    let chain_initial_difficulty = chain_initial_difficulty
-        .map(primitives::Compact)
-        .unwrap_or(pos_initial_difficulty(ChainType::Regtest).into());
+    let chain_initial_difficulty = chain_initial_difficulty.map_or(
+        pos_initial_difficulty(ChainType::Regtest).into(),
+        primitives::Compact,
+    );
 
     if let Some(upgrade_height) = chain_pos_netupgrades {
         builder = builder

node-gui/src/widgets/esc_handler.rs

@@ -124,16 +124,14 @@ where
         viewport: &Rectangle,
     ) -> event::Status {
         let event_captured = match &event {
-            Event::Keyboard(keyboard::Event::KeyPressed { key, .. }) => {
-                if *key == keyboard::Key::Named(keyboard::key::Named::Escape) {
-                    if let Some(msg) = &self.msg_to_emit {
-                        shell.publish(msg.clone());
-                    }
-
-                    true
-                } else {
-                    false
+            Event::Keyboard(keyboard::Event::KeyPressed { key, .. })
+                if *key == keyboard::Key::Named(keyboard::key::Named::Escape) =>
+            {
+                if let Some(msg) = &self.msg_to_emit {
+                    shell.publish(msg.clone());
                 }
+
+                true
             }
             _ => false,
         };

p2p/src/peer_manager/tests/connections.rs

@@ -1912,7 +1912,7 @@ async fn feeler_connections_test_impl(seed: Seed) {
         10,
         &mut rng,
     );
-    let mut addresses = BTreeSet::from_iter(addresses.into_iter());
+    let mut addresses = BTreeSet::from_iter(addresses);
     for addr in &addresses {
         peer_mgr.peerdb.peer_discovered(*addr);
     }

p2p/src/sync/peer/block_manager.rs

@@ -585,7 +585,7 @@ where
         // two versions of incoming.requested_blocks, one for the most recent request and
         // another one for the previous request(s), so that it can distinguish previously
         // requested blocks that were "cancelled" in-flight from unsolicited ones.
-        self.outgoing.blocks_queue.extend(block_ids.into_iter());
+        self.outgoing.blocks_queue.extend(block_ids);
 
         Ok(())
     }

p2p/src/tests/helpers/test_node.rs

@@ -394,7 +394,7 @@ where
                 .peers()
                 .values()
                 .map(|ctx| ctx.peer_address)
-                .chain(peer_mgr.pending_outbound_conn_addrs().into_iter())
+                .chain(peer_mgr.pending_outbound_conn_addrs())
                 .collect()
         })
         .await