diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-04-16 11:58:32 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-04-16 11:58:32 +0200 |
commit | 350320a32ce569d3e86352ba5a79ee969e9595af (patch) | |
tree | 87fe70395f62566d7d7e0cef3e93d62f6288a4e4 /openpgp/src/serialize/stream.rs | |
parent | e1ae4a79ada96a97f604d3f3f172b9b02a6da8bb (diff) |
Revert "openpgp: Make PacketParserResult a std::result::Result."
This reverts commit 2e1eec5fe4157a391a13554ff7df3075cfe043cc.
Diffstat (limited to 'openpgp/src/serialize/stream.rs')
-rw-r--r-- | openpgp/src/serialize/stream.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index 8b284274..856914b3 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -2386,7 +2386,7 @@ impl<'a> writer::Stackable<'a, Cookie> for Encryptor<'a> { mod test { use std::io::Read; use crate::{Packet, PacketPile, packet::CompressedData}; - use crate::parse::{Parse, PacketParser}; + use crate::parse::{Parse, PacketParserResult, PacketParser}; use super::*; use crate::types::DataFormat::Text as T; use crate::policy::Policy; @@ -2419,7 +2419,7 @@ mod test { // Make sure it is the only packet. let (_, ppr) = pp.recurse().unwrap(); - assert!(ppr.is_err()); + assert!(ppr.is_none()); } // Create some crazy nesting structures, serialize the messages, @@ -2594,7 +2594,7 @@ mod test { let mut ppr = PacketParser::from_bytes(&o).unwrap(); let mut good = 0; - while let Ok(pp) = ppr { + while let PacketParserResult::Some(pp) = ppr { if let Packet::Signature(ref sig) = pp.packet { let key = keys.get(&sig.issuer_fingerprint().unwrap()) .unwrap(); @@ -2639,7 +2639,7 @@ mod test { for password in &passwords { let mut state = State::Start; let mut ppr = PacketParser::from_bytes(&o).unwrap(); - while let Ok(mut pp) = ppr { + while let PacketParserResult::Some(mut pp) = ppr { state = match state { // Look for the SKESK packet. State::Start => @@ -2916,7 +2916,7 @@ mod test { let mut ppr = PacketParser::from_bytes(&o).unwrap(); let mut good = 0; - while let Ok(pp) = ppr { + while let PacketParserResult::Some(pp) = ppr { if let Packet::Signature(ref sig) = pp.packet { assert_eq!(sig.signature_creation_time(), Some(timestamp)); sig.verify(ka.key()).unwrap(); |