From 48bfaf48284a856976035cc392a28510c19feac0 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Fri, 19 Feb 2021 14:03:02 +0100
Subject: openpgp: Simplify code.

---
 openpgp/src/cert/revoke.rs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/openpgp/src/cert/revoke.rs b/openpgp/src/cert/revoke.rs
index c0f321db..7cc5ca60 100644
--- a/openpgp/src/cert/revoke.rs
+++ b/openpgp/src/cert/revoke.rs
@@ -454,11 +454,9 @@ impl SubkeyRevocationBuilder {
         where H: Into<Option<HashAlgorithm>>,
               P: key::KeyParts,
     {
-        let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512);
+        self.builder = self.builder
+            .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512));
 
-        if let Some(algo) = hash_algo.into() {
-            self.builder = self.builder.set_hash_algo(algo);
-        }
         key.bind(signer, cert, self.builder)
     }
 }
@@ -692,11 +690,9 @@ impl UserIDRevocationBuilder {
         -> Result<Signature>
         where H: Into<Option<HashAlgorithm>>
     {
-        let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512);
+        self.builder = self.builder
+            .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512));
 
-        if let Some(algo) = hash_algo.into() {
-            self.builder = self.builder.set_hash_algo(algo);
-        }
         userid.bind(signer, cert, self.builder)
     }
 }
@@ -944,11 +940,9 @@ impl UserAttributeRevocationBuilder {
         -> Result<Signature>
         where H: Into<Option<HashAlgorithm>>
     {
-        let hash_algo = hash_algo.into().unwrap_or(HashAlgorithm::SHA512);
+        self.builder = self.builder
+            .set_hash_algo(hash_algo.into().unwrap_or(HashAlgorithm::SHA512));
 
-        if let Some(algo) = hash_algo.into() {
-            self.builder = self.builder.set_hash_algo(algo);
-        }
         ua.bind(signer, cert, self.builder)
     }
 }
-- 
cgit v1.2.3