commit a68ba133238ba39a9209838ce867a55146c9084a
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jul 21 23:31:14 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 21 23:31:14 2021 +0000
tree 64a1202de4ef5af1f09351c7ab516cceffcf53cb
parent 339e3c3e89a80932bc3c9ca517ea969cc88faadb
parent fe0abfe4eaadd42dd9477f98f7bfb542ea0d1660

Merge "Replace if statement with call to Option::map"

keystore2/src/super_key.rs

diff --git a/keystore2/src/super_key.rs b/keystore2/src/super_key.rs
index e02d9bc..bae18b0 100644
--- a/keystore2/src/super_key.rs
+++ b/keystore2/src/super_key.rs
@@ -126,10 +126,8 @@
     fn from_metadata(metadata: &BlobMetaData) -> Option<Self> {
         if let Some(EncryptedBy::KeyId(key_id)) = metadata.encrypted_by() {
             Some(SuperKeyIdentifier::DatabaseId(*key_id))
-        } else if let Some(boot_level) = metadata.max_boot_level() {
-            Some(SuperKeyIdentifier::BootLevel(*boot_level))
         } else {
-            None
+            metadata.max_boot_level().map(|boot_level| SuperKeyIdentifier::BootLevel(*boot_level))
         }
     }