clippy: minor things

Also fixes a bunch of unused imports that are detected by the latest
rustc nightly. (One is a wildcard import that actually imports nothing;
the other are prelude things in a private prelude module.)

Author: apoelstra

src/descriptor/key.rs

@@ -589,7 +589,7 @@ impl DescriptorPublicKey {
                 };
                 xpub.derivation_paths
                     .paths()
-                    .into_iter()
+                    .iter()
                     .map(|p| origin_path.extend(p))
                     .collect()
             }

src/descriptor/tr.rs

@@ -737,7 +737,7 @@ where
             wit.push(Placeholder::TapScript(leaf_script.0));
             wit.push(Placeholder::TapControlBlock(control_block));
 
-            let wit_size = witness_size(&wit);
+            let wit_size = witness_size(wit);
             if min_wit_len.is_some() && Some(wit_size) > min_wit_len {
                 continue;
             } else {

src/iter/mod.rs

@@ -82,7 +82,7 @@ impl<'a, Pk: MiniscriptKey> TreeLike for &'a policy::Concrete<Pk> {
     }
 }
 
-impl<'a, Pk: MiniscriptKey> TreeLike for Arc<policy::Concrete<Pk>> {
+impl<Pk: MiniscriptKey> TreeLike for Arc<policy::Concrete<Pk>> {
     fn as_node(&self) -> Tree<Self> {
         use policy::Concrete::*;
         match self.as_ref() {

src/lib.rs

@@ -116,7 +116,6 @@ mod macros;
 mod pub_macros;
 
 use internals::hex::exts::DisplayHex;
-pub use pub_macros::*;
 
 pub mod descriptor;
 pub mod expression;
@@ -812,6 +811,8 @@ mod tests {
     }
 }
 
+
+#[allow(unused_imports)] // this is an internal prelude module; not all imports are used with every feature combination
 mod prelude {
     // Mutex implementation from LDK
     // https://github.com/lightningdevkit/rust-lightning/blob/9bdce47f0e0516e37c89c09f1975dfc06b5870b1/lightning-invoice/src/sync.rs

src/plan.rs

@@ -255,13 +255,13 @@ impl Plan {
             // scriptSig len (1) + OP_0 (1) + OP_PUSHBYTES_32 (1) + <script hash> (32)
             (_, DescriptorType::ShWsh) | (_, DescriptorType::ShWshSortedMulti) => 1 + 1 + 1 + 32,
             // Native Segwit v0 (scriptSig len (1))
-            __ => 1,
+            _ => 1,
         }
     }
 
     /// The size in bytes of the witness that satisfies this plan
     pub fn witness_size(&self) -> usize {
-        if let Some(_) = self.descriptor.desc_type().segwit_version() {
+        if self.descriptor.desc_type().segwit_version().is_some() {
             witness_size(self.template.as_ref())
         } else {
             0 // should be 1 if there's at least one segwit input in the tx, but that's out of
@@ -397,17 +397,14 @@ impl Plan {
             }
         } else {
             for item in &self.template {
-                match item {
-                    Placeholder::EcdsaSigPk(pk) => {
-                        let public_key = pk.to_public_key().inner;
-                        let master_fingerprint = pk.master_fingerprint();
-                        for derivation_path in pk.full_derivation_paths() {
-                            input
-                                .bip32_derivation
-                                .insert(public_key, (master_fingerprint, derivation_path));
-                        }
+                if let Placeholder::EcdsaSigPk(pk) = item {
+                    let public_key = pk.to_public_key().inner;
+                    let master_fingerprint = pk.master_fingerprint();
+                    for derivation_path in pk.full_derivation_paths() {
+                        input
+                            .bip32_derivation
+                            .insert(public_key, (master_fingerprint, derivation_path));
                     }
-                    _ => {}
                 }
             }
 

src/psbt/finalizer.rs

@@ -428,7 +428,7 @@ pub(super) fn finalize_input<C: secp256k1::Verification>(
     // Now mutate the psbt input. Note that we cannot error after this point.
     // If the input is mutated, it means that the finalization succeeded.
     {
-        let original = mem::replace(&mut psbt.inputs[index], Default::default());
+        let original = mem::take(&mut psbt.inputs[index]);
         let input = &mut psbt.inputs[index];
         input.non_witness_utxo = original.non_witness_utxo;
         input.witness_utxo = original.witness_utxo;