diff options
Diffstat (limited to 'openpgp/src/packet')
-rw-r--r-- | openpgp/src/packet/key.rs | 2 | ||||
-rw-r--r-- | openpgp/src/packet/signature/mod.rs | 4 | ||||
-rw-r--r-- | openpgp/src/packet/signature/subpacket.rs | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/packet/key.rs b/openpgp/src/packet/key.rs index 29409ace..d06ac07e 100644 --- a/openpgp/src/packet/key.rs +++ b/openpgp/src/packet/key.rs @@ -29,7 +29,7 @@ //! ```rust //! # extern crate sequoia_openpgp as openpgp; //! # use openpgp::Result; -//! # use openpgp::parse::{Parse, PacketParser}; +//! # use openpgp::parse::{Parse, PacketParserResult, PacketParser}; //! # use openpgp::cert::prelude::*; //! use openpgp::packet::{Key, key}; //! diff --git a/openpgp/src/packet/signature/mod.rs b/openpgp/src/packet/signature/mod.rs index b294ae5a..66c0065a 100644 --- a/openpgp/src/packet/signature/mod.rs +++ b/openpgp/src/packet/signature/mod.rs @@ -1283,7 +1283,7 @@ mod test { use super::*; use crate::Cert; - use crate::parse::PacketParser; + use crate::parse::{PacketParserResult, PacketParser}; struct Test<'a> { key: &'a str, @@ -1369,7 +1369,7 @@ mod test { let mut good = 0; let mut ppr = PacketParser::from_bytes( crate::tests::message(test.data)).unwrap(); - while let Ok(pp) = ppr { + while let PacketParserResult::Some(pp) = ppr { if let Packet::Signature(ref sig) = pp.packet { let result = sig.verify(cert.primary_key().key()) .map(|_| true).unwrap_or(false); diff --git a/openpgp/src/packet/signature/subpacket.rs b/openpgp/src/packet/signature/subpacket.rs index ac000842..605d48d2 100644 --- a/openpgp/src/packet/signature/subpacket.rs +++ b/openpgp/src/packet/signature/subpacket.rs @@ -34,13 +34,13 @@ //! # extern crate sequoia_openpgp as openpgp; //! # use openpgp::Result; //! # use openpgp::Packet; -//! # use openpgp::parse::{Parse, PacketParser}; +//! # use openpgp::parse::{Parse, PacketParserResult, PacketParser}; //! # //! # f(include_bytes!("../../../tests/data/messages/signed.gpg")); //! # //! # fn f(message_data: &[u8]) -> Result<()> { //! let mut ppr = PacketParser::from_bytes(message_data)?; -//! while let Ok(mut pp) = ppr { +//! while let PacketParserResult::Some(mut pp) = ppr { //! if let Packet::Signature(ref sig) = pp.packet { //! if let Some(fp) = sig.issuer_fingerprint() { //! eprintln!("Signature issued by: {}", fp.to_string()); |