From 0f875ef5489c9db2753b810181bae7785fd99c9d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 31 Jan 2025 09:36:11 -0800
Subject: [PATCH] cleanup

---
 src/rust/src/backend/keys.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/rust/src/backend/keys.rs b/src/rust/src/backend/keys.rs
index 526c3010a14e..072b3cf4bdea 100644
--- a/src/rust/src/backend/keys.rs
+++ b/src/rust/src/backend/keys.rs
@@ -35,18 +35,12 @@ pub(crate) fn load_der_private_key_bytes<'p>(
     password: Option<&[u8]>,
     unsafe_skip_rsa_key_validation: bool,
 ) -> CryptographyResult<pyo3::Bound<'p, pyo3::PyAny>> {
-    let pkey = if let Ok(pkey) = cryptography_key_parsing::pkcs8::parse_private_key(data) {
-        Some(pkey)
-    } else if let Ok(pkey) = cryptography_key_parsing::dsa::parse_pkcs1_private_key(data) {
-        Some(pkey)
-    } else if let Ok(pkey) = cryptography_key_parsing::ec::parse_pkcs1_private_key(data, None) {
-        Some(pkey)
-    } else if let Ok(pkey) = cryptography_key_parsing::rsa::parse_pkcs1_private_key(data) {
-        Some(pkey)
-    } else {
-        None
-    };
-    if let Some(pkey) = pkey {
+    let pkey = cryptography_key_parsing::pkcs8::parse_private_key(data)
+        .or_else(|_| cryptography_key_parsing::dsa::parse_pkcs1_private_key(data))
+        .or_else(|_| cryptography_key_parsing::ec::parse_pkcs1_private_key(data, None))
+        .or_else(|_| cryptography_key_parsing::rsa::parse_pkcs1_private_key(data));
+
+    if let Ok(pkey) = pkey {
         if password.is_some() {
             return Err(CryptographyError::from(
                 pyo3::exceptions::PyTypeError::new_err(