clippy: fix explicit-iter-loop and explicit-into-iter-loop lints

apoelstra · apoelstra · commit d2b998bb0bc0 · 2025-06-26T02:24:48.000Z
diff --git a/src/address.rs b/src/address.rs
@@ -692,7 +692,7 @@ impl FromStr for Address {
         let net_arr = [liq, ele, liq_test];
 
         let prefix = find_prefix(s);
-        for net in net_arr.iter() {
+        for net in &net_arr {
             // Bech32.
             if match_prefix(prefix, net.bech_hrp) {
                 return Address::from_bech32(s, false, net);
@@ -712,7 +712,7 @@ impl FromStr for Address {
         }
 
         let p = data[0];
-        for net in net_arr.iter() {
+        for net in &net_arr {
             if p == net.p2pkh_prefix || p == net.p2sh_prefix || p == net.blinded_prefix {
                 return Address::from_base58(&data, net);
             }
diff --git a/src/blind.rs b/src/blind.rs
@@ -1002,7 +1002,7 @@ impl Transaction {
                     (inp.asset_issuance.amount, asset_id),
                     (inp.asset_issuance.inflation_keys, token_id),
                 ];
-                for (amt, asset) in arr.iter() {
+                for (amt, asset) in &arr {
                     match amt {
                         Value::Null => continue,
                         Value::Explicit(v) => {
diff --git a/src/confidential.rs b/src/confidential.rs
@@ -598,7 +598,7 @@ impl fmt::Display for Nonce {
         match *self {
             Nonce::Null => f.write_str("null"),
             Nonce::Explicit(n) => {
-                for b in n.iter() {
+                for b in &n {
                     write!(f, "{:02x}", b)?;
                 }
                 Ok(())
diff --git a/src/pset/map/global.rs b/src/pset/map/global.rs
@@ -276,14 +276,14 @@ impl Map for Global {
             rv.push_prop(self.elements_tx_modifiable_flag as <PSBT_ELEMENTS_GLOBAL_TX_MODIFIABLE, _>)
         }
 
-        for (key, value) in self.proprietary.iter() {
+        for (key, value) in &self.proprietary {
             rv.push(raw::Pair {
                 key: key.to_key(),
                 value: value.clone(),
             });
         }
 
-        for (key, value) in self.unknown.iter() {
+        for (key, value) in &self.unknown {
             rv.push(raw::Pair {
                 key: key.clone(),
                 value: value.clone(),
diff --git a/src/pset/map/input.rs b/src/pset/map/input.rs
@@ -1029,14 +1029,14 @@ impl Map for Input {
             rv.push_prop(self.blinded_issuance as <PSBT_ELEMENTS_IN_BLINDED_ISSUANCE, _>)
         }
 
-        for (key, value) in self.proprietary.iter() {
+        for (key, value) in &self.proprietary {
             rv.push(raw::Pair {
                 key: key.to_key(),
                 value: value.clone(),
             });
         }
 
-        for (key, value) in self.unknown.iter() {
+        for (key, value) in &self.unknown {
             rv.push(raw::Pair {
                 key: key.clone(),
                 value: value.clone(),
diff --git a/src/pset/map/output.rs b/src/pset/map/output.rs
@@ -488,14 +488,14 @@ impl Map for Output {
             rv.push_prop(self.blind_asset_proof as <PSBT_ELEMENTS_OUT_BLIND_ASSET_PROOF, _>)
         }
 
-        for (key, value) in self.proprietary.iter() {
+        for (key, value) in &self.proprietary {
             rv.push(raw::Pair {
                 key: key.to_key(),
                 value: value.clone(),
             });
         }
 
-        for (key, value) in self.unknown.iter() {
+        for (key, value) in &self.unknown {
             rv.push(raw::Pair {
                 key: key.clone(),
                 value: value.clone(),
diff --git a/src/pset/mod.rs b/src/pset/mod.rs
@@ -257,7 +257,7 @@ impl PartiallySignedTransaction {
         // changed by Updaters and Combiners, the sequence number in this unsigned
         // transaction must be set to 0 (not final, nor the sequence in PSBT_IN_SEQUENCE).
         // The lock time in this unsigned transaction must be computed as described previously.
-        for inp in tx.input.iter_mut() {
+        for inp in &mut tx.input {
             inp.sequence = Sequence::from_height(0);
         }
         Ok(tx.txid())
@@ -283,7 +283,7 @@ impl PartiallySignedTransaction {
         let mut inputs = vec![];
         let mut outputs = vec![];
 
-        for psetin in self.inputs.iter() {
+        for psetin in &self.inputs {
             let txin = TxIn {
                 previous_output: OutPoint::new(psetin.previous_txid, psetin.previous_output_index),
                 is_pegin: psetin.is_pegin(),
@@ -308,7 +308,7 @@ impl PartiallySignedTransaction {
             inputs.push(txin);
         }
 
-        for out in self.outputs.iter() {
+        for out in &self.outputs {
             let txout = TxOut {
                 asset: match (out.asset_comm, out.asset) {
                     (Some(gen), _) => confidential::Asset::Confidential(gen),
@@ -634,7 +634,7 @@ impl PartiallySignedTransaction {
             ValueBlindingFactor::last(secp, value, out_abf, &inp_secrets, &exp_out_secrets);
 
         // Add all the scalars
-        for value_diff in self.global.scalars.iter() {
+        for value_diff in &self.global.scalars {
             final_vbf += ValueBlindingFactor(*value_diff);
         }
 
diff --git a/src/pset/serialize.rs b/src/pset/serialize.rs
@@ -166,7 +166,7 @@ impl Serialize for KeySource {
 
         rv.append(&mut self.0.to_bytes().to_vec());
 
-        for cnum in self.1.into_iter() {
+        for cnum in &self.1 {
             rv.append(&mut serialize(&u32::from(*cnum)))
         }
 
@@ -438,7 +438,7 @@ impl Serialize for TapTree {
         match (self.0.branch().len(), self.0.branch().last()) {
             (1, Some(Some(root))) => {
                 let mut buf = Vec::new();
-                for leaf_info in root.leaves.iter() {
+                for leaf_info in &root.leaves {
                     // # Cast Safety:
                     //
                     // TaprootMerkleBranch can only have len atmost 128(TAPROOT_CONTROL_MAX_NODE_COUNT).
diff --git a/src/script.rs b/src/script.rs
@@ -1080,8 +1080,8 @@ mod test {
         assert_eq!(build_scriptint(256), vec![0, 1]);
         assert_eq!(build_scriptint(257), vec![1, 1]);
         assert_eq!(build_scriptint(511), vec![255, 1]);
-        for &i in [10, 100, 255, 256, 1000, 10000, 25000, 200000, 5000000, 1000000000,
-                             (1 << 31) - 1, -((1 << 31) - 1)].iter() {
+        for &i in &[10, 100, 255, 256, 1000, 10000, 25000, 200000, 5000000, 1000000000,
+                             (1 << 31) - 1, -((1 << 31) - 1)] {
             assert_eq!(Ok(i), read_scriptint(&build_scriptint(i)));
             assert_eq!(Ok(-i), read_scriptint(&build_scriptint(-i)));
         }
diff --git a/src/serde_utils.rs b/src/serde_utils.rs
@@ -22,7 +22,7 @@ pub mod btreemap_byte_values {
             serde::Serialize::serialize(v, s)
         } else {
             let mut map = s.serialize_map(Some(v.len()))?;
-            for (key, value) in v.iter() {
+            for (key, value) in v {
                 map.serialize_entry(key, &value.to_hex())?;
             }
             map.end()
@@ -89,7 +89,7 @@ pub mod btreemap_as_seq {
             serde::Serialize::serialize(v, s)
         } else {
             let mut seq = s.serialize_seq(Some(v.len()))?;
-            for pair in v.iter() {
+            for pair in v {
                 seq.serialize_element(&pair)?;
             }
             seq.end()
@@ -175,7 +175,7 @@ pub mod btreemap_as_seq_byte_values {
             serde::Serialize::serialize(v, s)
         } else {
             let mut seq = s.serialize_seq(Some(v.len()))?;
-            for (key, value) in v.iter() {
+            for (key, value) in v {
                 seq.serialize_element(&BorrowedPair(key, value))?;
             }
             seq.end()
diff --git a/src/sighash.rs b/src/sighash.rs
@@ -711,7 +711,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
         common_cache.get_or_insert_with(|| {
             let mut enc_prevouts = sha256::Hash::engine();
             let mut enc_sequences = sha256::Hash::engine();
-            for txin in tx.input.iter() {
+            for txin in &tx.input {
                 txin.previous_output
                     .consensus_encode(&mut enc_prevouts)
                     .unwrap();
@@ -722,14 +722,14 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
                 sequences: sha256::Hash::from_engine(enc_sequences),
                 outputs: {
                     let mut enc = sha256::Hash::engine();
-                    for txout in tx.output.iter() {
+                    for txout in &tx.output {
                         txout.consensus_encode(&mut enc).unwrap();
                     }
                     sha256::Hash::from_engine(enc)
                 },
                 issuances: {
                     let mut enc = sha256::Hash::engine();
-                    for txin in tx.input.iter() {
+                    for txin in &tx.input {
                         if txin.has_issuance() {
                             txin.asset_issuance.consensus_encode(&mut enc).unwrap();
                         } else {
@@ -789,7 +789,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
                     .consensus_encode(&mut enc_script_pubkeys)
                     .unwrap();
             }
-            for inp in tx.input.iter() {
+            for inp in &tx.input {
                 inp.outpoint_flag()
                     .consensus_encode(&mut enc_outpoint_flags).unwrap();
                 inp.witness.amount_rangeproof
@@ -798,7 +798,7 @@ impl<R: Deref<Target = Transaction>> SighashCache<R> {
                     .consensus_encode(&mut enc_issuance_rangeproofs).unwrap();
             }
 
-            for out in tx.output.iter() {
+            for out in &tx.output {
                 out.witness.surjection_proof.consensus_encode(&mut enc_output_witnesses).unwrap();
                 out.witness.rangeproof.consensus_encode(&mut enc_output_witnesses).unwrap();
             }
diff --git a/src/taproot.rs b/src/taproot.rs
@@ -563,7 +563,7 @@ impl TaprootMerkleBranch {
     /// Serialize to a writer. Returns the number of bytes written
     pub fn encode<Write: io::Write>(&self, mut writer: Write) -> io::Result<usize> {
         let mut written = 0;
-        for hash in self.0.iter() {
+        for hash in &self.0 {
             written += writer.write(hash.as_ref())?;
         }
         Ok(written)
diff --git a/src/transaction.rs b/src/transaction.rs
@@ -935,7 +935,7 @@ impl Transaction {
     pub fn discount_weight(&self) -> usize {
         let mut weight = self.scaled_size(4);
 
-        for out in self.output.iter() {
+        for out in &self.output {
             let rp_len = out.witness.rangeproof_len();
             let sp_len = out.witness.surjectionproof_len();
             let witness_weight = VarInt(sp_len as u64).size() + sp_len + VarInt(rp_len as u64).size() + rp_len;

Original file line number	Diff line number	Diff line change
`@@ -598,7 +598,7 @@ impl fmt::Display for Nonce {`
`598`	`598`	`match *self {`
`599`	`599`	`Nonce::Null => f.write_str("null"),`
`600`	`600`	`Nonce::Explicit(n) => {`
`601`		`- for b in n.iter() {`
	`601`	`+ for b in &n {`
`602`	`602`	`write!(f, "{:02x}", b)?;`
`603`	`603`	`}`
`604`	`604`	`Ok(())`