Join nested if statements with logical and into one statement

Instead of this:

    if foo {
        if bar {
           ...
        }
    }

do this:

    if foo && bar {
        ...
    }

Nesting statements implies a more complicated code structure than it
really is. Thus it's arguably simpler to write a combined condition by
joining the two conditions with a logical and operation.

Found by clippy lint collapsible_if:
https://rust-lang.github.io/rust-clippy/master/index.html#collapsible_if

1 files changed, 4 insertions, 6 deletions

diff --git a/openpgp/src/parse.rs b/openpgp/src/parse.rs
index 8a323b89..5cf7c5f5 100644
--- a/openpgp/src/parse.rs
+++ b/openpgp/src/parse.rs
@@ -2229,12 +2229,10 @@ impl Key4<key::UnspecifiedParts, key::UnspecifiedRole>
                     format!("Unexpected secret key found in {:?} packet", tag)
                 ).into());
             }
-        } else {
-            if tag == Tag::SecretKey || tag == Tag::SecretSubkey {
-                return php.error(Error::MalformedPacket(
-                    format!("Expected secret key in {:?} packet", tag)
-                ).into());
-            }
+        } else if tag == Tag::SecretKey || tag == Tag::SecretSubkey {
+            return php.error(Error::MalformedPacket(
+                format!("Expected secret key in {:?} packet", tag)
+            ).into());
         }
 
         fn k<R>(creation_time: u32,