From: 志宇 Date: Fri, 1 May 2026 10:33:08 +0000 (+0000) Subject: feat(chain,electrum): Make clippy happy X-Git-Url: http://internal-gitweb-vhost/%22bdk_chain/psbt/hashes/serde/static/gitweb.js?a=commitdiff_plain;h=08d1bdee2fae549610abed2db705586305231e0c;p=bdk feat(chain,electrum): Make clippy happy --- diff --git a/crates/chain/src/indexer/keychain_txout.rs b/crates/chain/src/indexer/keychain_txout.rs index 38222fb6..7973a025 100644 --- a/crates/chain/src/indexer/keychain_txout.rs +++ b/crates/chain/src/indexer/keychain_txout.rs @@ -953,8 +953,8 @@ impl KeychainTxOutIndex { /// a [`TxOut`] with it's script pubkey. pub fn last_used_indices(&self) -> BTreeMap { self.keychain_to_descriptor_id - .iter() - .filter_map(|(keychain, _)| { + .keys() + .filter_map(|keychain| { self.last_used_index(keychain.clone()) .map(|index| (keychain.clone(), index)) }) diff --git a/crates/core/tests/test_merge.rs b/crates/core/tests/test_merge.rs index 8bfd6a24..14e9c94b 100644 --- a/crates/core/tests/test_merge.rs +++ b/crates/core/tests/test_merge.rs @@ -9,7 +9,7 @@ fn test_btree_map_merge() { let mut map2: BTreeMap = BTreeMap::new(); map2.insert(2, "b"); - map1.merge(map2); + Merge::merge(&mut map1, map2); let expected: BTreeMap = BTreeMap::from([(1, "a"), (2, "b")]); assert_eq!(map1, expected); @@ -89,7 +89,7 @@ fn test_btree_map_merge_conflict() { let mut map2: BTreeMap = BTreeMap::new(); map2.insert(1, "b"); - map1.merge(map2); + Merge::merge(&mut map1, map2); let expected: BTreeMap = BTreeMap::from([(1, "b")]); assert_eq!(map1, expected); diff --git a/crates/electrum/src/bdk_electrum_client.rs b/crates/electrum/src/bdk_electrum_client.rs index 39dec6da..a7c94315 100644 --- a/crates/electrum/src/bdk_electrum_client.rs +++ b/crates/electrum/src/bdk_electrum_client.rs @@ -378,7 +378,7 @@ impl BdkElectrumClient { .inner .batch_script_get_history(unique_spks.iter().map(|spk| spk.as_script()))?; let mut spk_map = HashMap::new(); - for (spk, history) in unique_spks.into_iter().zip(histories.into_iter()) { + for (spk, history) in unique_spks.into_iter().zip(histories) { spk_map.insert(spk, history); } @@ -571,7 +571,7 @@ impl BdkElectrumClient { let proofs = self.inner.batch_transaction_get_merkle(to_fetch.iter())?; // Validate each proof, retrying once for each stale header. - for ((txid, height), proof) in to_fetch.into_iter().zip(proofs.into_iter()) { + for ((txid, height), proof) in to_fetch.into_iter().zip(proofs) { let mut header = { let cache = self.block_header_cache.lock().unwrap(); cache