From 87119f9758780340f36ec37ec991c781f934f806 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <Hinton@users.noreply.github.com>
Date: Thu, 25 Sep 2025 13:31:22 +0200
Subject: [PATCH] Remove allow(clippy::question_mark) (#16565)

Remove the allow(clippy::question_mark) exception by reworking the code to use ?.
---
 .../bitwarden_chromium_importer/src/crypto.rs            | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
index ce10b27b83f..e6442e21742 100644
--- a/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
+++ b/apps/desktop/desktop_native/bitwarden_chromium_importer/src/crypto.rs
@@ -6,16 +6,13 @@ use aes::cipher::{
     block_padding::Pkcs7, generic_array::GenericArray, typenum::U32, BlockDecryptMut, KeyIvInit,
 };
 
-#[allow(clippy::question_mark)]
 pub fn decrypt_aes256(iv: &[u8; 16], data: &[u8], key: GenericArray<u8, U32>) -> Result<Vec<u8>> {
     let iv = GenericArray::from_slice(iv);
     let mut data = data.to_vec();
-    let result = cbc::Decryptor::<aes::Aes256>::new(&key, iv)
+    cbc::Decryptor::<aes::Aes256>::new(&key, iv)
         .decrypt_padded_mut::<Pkcs7>(&mut data)
-        .map_err(|_| anyhow!("Failed to decrypt data"));
-    if let Err(e) = result {
-        return Err(e);
-    }
+        .map_err(|_| anyhow!("Failed to decrypt data"))?;
+
     Ok(data)
 }