diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2019-08-30 13:03:17 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2019-08-30 16:52:39 +0200 |
commit | a06338a6b54d2104f485ae2f113b8cdced7a275a (patch) | |
tree | 8ee1d25642d272bd6f7f17f13759e04c8e9b3c71 | |
parent | 1922a36df75f1713a07f6c4c4bdfb5c8dffd5a1b (diff) |
openpgp: Simplify.
-rw-r--r-- | openpgp/src/serialize/stream.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index 7d3eee84..afefcb34 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -516,11 +516,7 @@ impl<'a, R> writer::Stackable<'a, Cookie> for Signer<'a, R> } } fn inner_ref(&self) -> Option<&writer::Stackable<'a, Cookie>> { - if let Some(ref i) = self.inner { - Some(i) - } else { - None - } + self.inner.as_ref().map(|r| r.as_ref()) } fn into_inner(mut self: Box<Self>) -> Result<Option<writer::BoxStack<'a, Cookie>>> { @@ -1174,11 +1170,7 @@ impl<'a> writer::Stackable<'a, Cookie> for Encryptor<'a> { unreachable!("Only implemented by Signer") } fn inner_ref(&self) -> Option<&writer::Stackable<'a, Cookie>> { - if let Some(ref i) = self.inner { - Some(i) - } else { - None - } + self.inner.as_ref().map(|r| r.as_ref()) } fn inner_mut(&mut self) -> Option<&mut writer::Stackable<'a, Cookie>> { if let Some(ref mut i) = self.inner { |