Use struct field shorthand

Clippy emits:

    warning: redundant field names in struct initialization

As suggested, use the field init shorthand.

Author: tcharding

src/descriptor/bare.rs

@@ -49,7 +49,7 @@ impl<Pk: MiniscriptKey> Bare<Pk> {
     pub fn new(ms: Miniscript<Pk, BareCtx>) -> Result<Self, Error> {
         // do the top-level checks
         BareCtx::top_level_checks(&ms)?;
-        Ok(Self { ms: ms })
+        Ok(Self { ms })
     }
 
     /// get the inner
@@ -241,7 +241,7 @@ impl<Pk: MiniscriptKey> Pkh<Pk> {
     /// Create a new Pkh descriptor
     pub fn new(pk: Pk) -> Self {
         // do the top-level checks
-        Self { pk: pk }
+        Self { pk }
     }
 
     /// Get a reference to the inner key

src/descriptor/segwitv0.rs

@@ -313,7 +313,7 @@ where
             WshInner::SortedMulti(ref smv) => WshInner::SortedMulti(smv.translate_pk(&mut fpk)?),
             WshInner::Ms(ref ms) => WshInner::Ms(ms.translate_pk(&mut fpk, &mut fpkh)?),
         };
-        Ok(Wsh { inner: inner })
+        Ok(Wsh { inner })
     }
 }
 
@@ -333,7 +333,7 @@ impl<Pk: MiniscriptKey> Wpkh<Pk> {
                 pk.to_string(),
             )))
         } else {
-            Ok(Self { pk: pk })
+            Ok(Self { pk })
         }
     }
 

src/descriptor/sh.rs

@@ -112,7 +112,7 @@ where
                     ShInner::Ms(sub)
                 }
             };
-            Ok(Sh { inner: inner })
+            Ok(Sh { inner })
         } else {
             Err(Error::Unexpected(format!(
                 "{}({} args) while parsing sh descriptor",
@@ -439,6 +439,6 @@ where
             ShInner::SortedMulti(ref smv) => ShInner::SortedMulti(smv.translate_pk(&mut fpk)?),
             ShInner::Ms(ref ms) => ShInner::Ms(ms.translate_pk(&mut fpk, &mut fpkh)?),
         };
-        Ok(Sh { inner: inner })
+        Ok(Sh { inner })
     }
 }

src/interpreter/mod.rs

@@ -192,7 +192,7 @@ impl<'txin> Interpreter<'txin> {
         verify_sig: Box<dyn FnMut(&KeySigPair) -> bool + 'iter>,
     ) -> Iter<'txin, 'iter> {
         Iter {
-            verify_sig: verify_sig,
+            verify_sig,
             public_key: if let inner::Inner::PublicKey(ref pk, _) = self.inner {
                 Some(pk)
             } else {

src/interpreter/stack.rs

@@ -209,7 +209,7 @@ impl<'txin> Stack<'txin> {
                                         self.push(Element::Satisfied);
                                         Some(Ok(SatisfiedConstraint::PublicKeyHash {
                                             keyhash: pkh.hash160(),
-                                            key_sig: key_sig,
+                                            key_sig,
                                         }))
                                     }
                                     Err(e) => return Some(Err(e)),

src/miniscript/decode.rs

@@ -224,8 +224,8 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> TerminalStack<Pk, Ctx> {
         let ext = ExtData::type_check(&ms, return_none)?;
         let ms = Miniscript {
             node: ms,
-            ty: ty,
-            ext: ext,
+            ty,
+            ext,
             phantom: PhantomData,
         };
         Ctx::check_global_validity(&ms)?;
@@ -245,8 +245,8 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> TerminalStack<Pk, Ctx> {
         let ext = ExtData::type_check(&wrapped_ms, return_none)?;
         let ms = Miniscript {
             node: wrapped_ms,
-            ty: ty,
-            ext: ext,
+            ty,
+            ext,
             phantom: PhantomData,
         };
         Ctx::check_global_validity(&ms)?;
@@ -268,8 +268,8 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> TerminalStack<Pk, Ctx> {
         let ext = ExtData::type_check(&wrapped_ms, return_none)?;
         let ms = Miniscript {
             node: wrapped_ms,
-            ty: ty,
-            ext: ext,
+            ty,
+            ext,
             phantom: PhantomData,
         };
         Ctx::check_global_validity(&ms)?;
@@ -558,8 +558,8 @@ pub fn parse<Ctx: ScriptContext>(
 
                 term.0.push(Miniscript {
                     node: wrapped_ms,
-                    ty: ty,
-                    ext: ext,
+                    ty,
+                    ext,
                     phantom: PhantomData,
                 });
             }

src/psbt/mod.rs

@@ -249,10 +249,7 @@ impl<'psbt> PsbtInputSatisfier<'psbt> {
     /// create a new PsbtInputsatisfier from
     /// psbt and index
     pub fn new(psbt: &'psbt Psbt, index: usize) -> Self {
-        Self {
-            psbt: psbt,
-            index: index,
-        }
+        Self { psbt, index }
     }
 }
 
@@ -639,7 +636,7 @@ impl PsbtExt for Psbt {
         if index >= self.inputs.len() {
             return Err(Error::InputIdxOutofBounds {
                 psbt_inp: self.inputs.len(),
-                index: index,
+                index,
             });
         }
         finalizer::finalize_input(self, index, secp, /*allow_mall*/ false)
@@ -664,7 +661,7 @@ impl PsbtExt for Psbt {
         if index >= self.inputs.len() {
             return Err(Error::InputIdxOutofBounds {
                 psbt_inp: self.inputs.len(),
-                index: index,
+                index,
             });
         }
         finalizer::finalize_input(self, index, secp, /*allow_mall*/ false)