From b7ebecb5e98c2eb2103f8dab0bc609e2aeb63632 Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Mon, 27 Sep 2021 14:55:07 +0300 Subject: Simplify tests for OK Instead of this: if let Some(()) = key.secret_mut().decrypt_in_place(algo, &p).ok() { ... } use this: if key.secret_mut().decrypt_in_place(algo, &p).is_ok() { ... } It's more to the point and easier to understand. --- sq/src/commands/decrypt.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sq/src/commands/decrypt.rs b/sq/src/commands/decrypt.rs index 45e2b4e7..0d874a3b 100644 --- a/sq/src/commands/decrypt.rs +++ b/sq/src/commands/decrypt.rs @@ -171,8 +171,7 @@ impl<'a> DecryptionHelper for Helper<'a> { self.key_hints.get(&keyid).unwrap())))?.into(); let algo = key.pk_algo(); - if let Some(()) = - key.secret_mut().decrypt_in_place(algo, &p).ok() { + if key.secret_mut().decrypt_in_place(algo, &p).is_ok() { break key.clone().into_keypair().unwrap() } else { eprintln!("Bad password."); @@ -230,8 +229,7 @@ impl<'a> DecryptionHelper for Helper<'a> { self.key_hints.get(&keyid).unwrap())))?.into(); let algo = key.pk_algo(); - if let Some(()) = - key.secret_mut().decrypt_in_place(algo, &p).ok() { + if key.secret_mut().decrypt_in_place(algo, &p).is_ok() { break key.clone().into_keypair().unwrap() } else { eprintln!("Bad password."); -- cgit v1.2.3