clippy warnings

Author: sanket1729

src/descriptor/bare.rs

@@ -192,7 +192,7 @@ where
     where
         T: Translator<P, Q, E>,
     {
-        Ok(Bare::new(self.ms.translate_pk(t)?).map_err(TranslateErr::OuterError)?)
+        Bare::new(self.ms.translate_pk(t)?).map_err(TranslateErr::OuterError)
     }
 }
 

src/descriptor/key.rs

@@ -999,13 +999,13 @@ impl MiniscriptKey for DescriptorPublicKey {
     }
 
     fn is_x_only_key(&self) -> bool {
-        match self {
+        matches!(
+            self,
             DescriptorPublicKey::Single(SinglePub {
                 key: SinglePubKey::XOnly(ref _key),
                 ..
-            }) => true,
-            _ => false,
-        }
+            })
+        )
     }
 
     fn num_der_paths(&self) -> usize {

src/descriptor/sh.rs

@@ -348,13 +348,13 @@ impl<Pk: MiniscriptKey + ToPublicKey> Sh<Pk> {
                 let witness_script = wsh.inner_script().to_v0_p2wsh();
                 let push_bytes = <&PushBytes>::try_from(witness_script.as_bytes())
                     .expect("Witness script is not too large");
-                script::Builder::new().push_slice(&push_bytes).into_script()
+                script::Builder::new().push_slice(push_bytes).into_script()
             }
             ShInner::Wpkh(ref wpkh) => {
                 let redeem_script = wpkh.script_pubkey();
                 let push_bytes: &PushBytes =
                     <&PushBytes>::try_from(redeem_script.as_bytes()).expect("Script not too large");
-                script::Builder::new().push_slice(&push_bytes).into_script()
+                script::Builder::new().push_slice(push_bytes).into_script()
             }
             ShInner::SortedMulti(..) | ShInner::Ms(..) => ScriptBuf::new(),
         }

src/descriptor/tr.rs

@@ -350,7 +350,7 @@ impl<Pk: MiniscriptKey + ToPublicKey> Tr<Pk> {
         let builder = bitcoin::blockdata::script::Builder::new();
         builder
             .push_opcode(opcodes::all::OP_PUSHNUM_1)
-            .push_slice(&output_key.serialize())
+            .push_slice(output_key.serialize())
             .into_script()
     }
 
@@ -405,8 +405,7 @@ where
     type Item = (u8, &'a Miniscript<Pk, Tap>);
 
     fn next(&mut self) -> Option<Self::Item> {
-        while !self.stack.is_empty() {
-            let (depth, last) = self.stack.pop().expect("Size checked above");
+        while let Some((depth, last)) = self.stack.pop() {
             match *last {
                 TapTree::Tree(ref l, ref r) => {
                     self.stack.push((depth + 1, r));

src/interpreter/inner.rs

@@ -43,7 +43,7 @@ fn script_from_stack_elem<Ctx: ScriptContext>(
 ) -> Result<Miniscript<Ctx::Key, Ctx>, Error> {
     match *elem {
         stack::Element::Push(sl) => {
-            Miniscript::parse_with_ext(&bitcoin::Script::from_bytes(sl), &ExtParams::allow_all())
+            Miniscript::parse_with_ext(bitcoin::Script::from_bytes(sl), &ExtParams::allow_all())
                 .map_err(Error::from)
         }
         stack::Element::Satisfied => {

src/iter/tree.rs

@@ -220,7 +220,7 @@ impl<T: TreeLike> Iterator for PreOrderIter<T> {
                 self.stack.push(left);
             }
             Tree::Nary(children) => {
-                self.stack.extend(children.into_iter().rev().cloned());
+                self.stack.extend(children.iter().rev().cloned());
             }
         }
         Some(top)

src/miniscript/analyzable.rs

@@ -221,10 +221,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Miniscript<Pk, Ctx> {
 
     /// Whether the given miniscript contains a raw pkh fragment
     pub fn contains_raw_pkh(&self) -> bool {
-        self.iter().any(|ms| match ms.node {
-            Terminal::RawPkH(_) => true,
-            _ => false,
-        })
+        self.iter().any(|ms| matches!(ms.node, Terminal::RawPkH(_)))
     }
 
     /// Check whether the underlying Miniscript is safe under the current context

src/miniscript/astelem.rs

@@ -465,7 +465,7 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> Terminal<Pk, Ctx> {
             Terminal::RawPkH(ref hash) => builder
                 .push_opcode(opcodes::all::OP_DUP)
                 .push_opcode(opcodes::all::OP_HASH160)
-                .push_slice(&hash.to_byte_array())
+                .push_slice(hash.to_byte_array())
                 .push_opcode(opcodes::all::OP_EQUALVERIFY),
             Terminal::After(t) => builder
                 .push_int(absolute::LockTime::from(t).to_consensus_u32() as i64)

src/miniscript/context.rs

@@ -430,9 +430,7 @@ impl ScriptContext for Legacy {
                 }
                 Ok(())
             }
-            Terminal::MultiA(..) => {
-                return Err(ScriptContextError::MultiANotAllowed);
-            }
+            Terminal::MultiA(..) => Err(ScriptContextError::MultiANotAllowed),
             _ => Ok(()),
         }
     }

src/miniscript/decode.rs

@@ -651,13 +651,12 @@ pub fn parse<Ctx: ScriptContext>(
 }
 
 fn is_and_v(tokens: &mut TokenIter) -> bool {
-    match tokens.peek() {
-        None
-        | Some(&Tk::If)
-        | Some(&Tk::NotIf)
-        | Some(&Tk::Else)
-        | Some(&Tk::ToAltStack)
-        | Some(&Tk::Swap) => false,
-        _ => true,
-    }
+    !matches!(
+        tokens.peek(),
+        None | Some(&Tk::If)
+            | Some(&Tk::NotIf)
+            | Some(&Tk::Else)
+            | Some(&Tk::ToAltStack)
+            | Some(&Tk::Swap)
+    )
 }