From 9945bfee8a3f282c9c8df139cee833752480b232 Mon Sep 17 00:00:00 2001 From: Hatter Jiang Date: Sun, 12 Apr 2020 15:15:12 +0800 Subject: [PATCH] use ok_or_else --- src/pgp_util.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pgp_util.rs b/src/pgp_util.rs index e7458e8..06af070 100644 --- a/src/pgp_util.rs +++ b/src/pgp_util.rs @@ -54,13 +54,11 @@ impl OpenPGPTool { return Err(new_box_error(&format!("To file exists: {}", to_file))); } - let recipient: Recipient = match self.tpk.keys_valid() + let recipient: Recipient = self.tpk.keys_valid() .key_flags(KeyFlags::default().set_encrypt_at_rest(true).set_encrypt_for_transport(true)) .map(|(_, _, key)| key.into()) - .nth(0) { - None => return Err(new_box_error("Encryption key not found in TPK")), - Some(r) => r, - }; + .nth(0) + .ok_or_else(|| new_box_error("Encryption key not found in TPK"))?; let bw = BufWriter::new(File::create(to_file)?); let message = if armor { Message::new(armor::Writer::new(bw, armor::Kind::Message, &[])?)