summaryrefslogtreecommitdiffstats
path: root/openpgp/src/cert
diff options
context:
space:
mode:
Diffstat (limited to 'openpgp/src/cert')
-rw-r--r--openpgp/src/cert/mod.rs4
-rw-r--r--openpgp/src/cert/parser/mod.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs
index 4ce0811b..2bd2e635 100644
--- a/openpgp/src/cert/mod.rs
+++ b/openpgp/src/cert/mod.rs
@@ -518,7 +518,7 @@ use super::*;
/// ```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::*;
///
/// # fn main() { f().unwrap(); }
@@ -593,7 +593,7 @@ use super::*;
/// # extern crate sequoia_openpgp as openpgp;
/// # use std::convert::TryFrom;
/// # use openpgp::Result;
-/// # use openpgp::parse::{Parse, PacketParser};
+/// # use openpgp::parse::{Parse, PacketParserResult, PacketParser};
/// use openpgp::Cert;
///
/// # fn main() { f().unwrap(); }
diff --git a/openpgp/src/cert/parser/mod.rs b/openpgp/src/cert/parser/mod.rs
index da0194bc..50cc7e5a 100644
--- a/openpgp/src/cert/parser/mod.rs
+++ b/openpgp/src/cert/parser/mod.rs
@@ -394,7 +394,7 @@ enum PacketSource<'a, I: Iterator<Item=Packet>> {
/// ```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::*;
///
/// # fn main() { f().unwrap(); }
@@ -441,7 +441,7 @@ impl<'a> From<PacketParserResult<'a>> for CertParser<'a, vec::IntoIter<Packet>>
/// Initializes a `CertParser` from a `PacketParser`.
fn from(ppr: PacketParserResult<'a>) -> Self {
let mut parser : Self = Default::default();
- if let Ok(pp) = ppr {
+ if let PacketParserResult::Some(pp) = ppr {
parser.source = PacketSource::PacketParser(pp);
}
parser
@@ -731,7 +731,7 @@ impl<'a, I: Iterator<Item=Packet>> Iterator for CertParser<'a, I> {
match pp.next() {
Ok((packet, ppr)) => {
- if let Ok(pp) = ppr {
+ if let PacketParserResult::Some(pp) = ppr {
self.source = PacketSource::PacketParser(pp);
}