Merge #904: Inline if statements into match arm

32ff3a0 Inline if statements into match arm (Tobin C. Harding)

Pull request description:

  Found by the imminent upgrade to nightly (PR #903).
  
  No logic change.


ACKs for top commit:
  apoelstra:
    ACK 32ff3a0; successfully ran local tests


Tree-SHA512: 5a592b0559dbd19a549ede17156213f1f648a20c74c232e723d3defb4d8ace5c920f81185807df218753144c1b4d378476924a002eeb0de00db3993fc27c77fc

Author: apoelstra

src/miniscript/mod.rs

@@ -628,27 +628,19 @@ impl<Pk: MiniscriptKey, Ctx: ScriptContext> ForEachKey<Pk> for Miniscript<Pk, Ct
     fn for_each_key<'a, F: FnMut(&'a Pk) -> bool>(&'a self, mut pred: F) -> bool {
         for ms in self.pre_order_iter() {
             match ms.node {
-                Terminal::PkK(ref p) => {
-                    if !pred(p) {
-                        return false;
-                    }
+                Terminal::PkK(ref p) if !pred(p) => {
+                    return false;
                 }
-                Terminal::PkH(ref p) => {
-                    if !pred(p) {
-                        return false;
-                    }
+                Terminal::PkH(ref p) if !pred(p) => {
+                    return false;
                 }
                 // These branches cannot be combined since technically the two `thresh`es
                 // have different types (have different maximum values).
-                Terminal::Multi(ref thresh) => {
-                    if !thresh.iter().all(&mut pred) {
-                        return false;
-                    }
+                Terminal::Multi(ref thresh) if !thresh.iter().all(&mut pred) => {
+                    return false;
                 }
-                Terminal::MultiA(ref thresh) => {
-                    if !thresh.iter().all(&mut pred) {
-                        return false;
-                    }
+                Terminal::MultiA(ref thresh) if !thresh.iter().all(&mut pred) => {
+                    return false;
                 }
                 _ => {}
             }

src/policy/concrete.rs

@@ -153,15 +153,11 @@ impl<Pk: MiniscriptKey> Policy<Pk> {
     fn check_binary_ops(&self) -> Result<(), CompilerError> {
         for policy in self.pre_order_iter() {
             match *policy {
-                Policy::And(ref subs) => {
-                    if subs.len() != 2 {
-                        return Err(CompilerError::NonBinaryArgAnd);
-                    }
+                Policy::And(ref subs) if subs.len() != 2 => {
+                    return Err(CompilerError::NonBinaryArgAnd);
                 }
-                Policy::Or(ref subs) => {
-                    if subs.len() != 2 {
-                        return Err(CompilerError::NonBinaryArgOr);
-                    }
+                Policy::Or(ref subs) if subs.len() != 2 => {
+                    return Err(CompilerError::NonBinaryArgOr);
                 }
                 _ => {}
             }