summaryrefslogtreecommitdiffstats
path: root/tool/src/commands
diff options
context:
space:
mode:
authorWiktor Kwapisiewicz <wiktor@metacode.biz>2020-04-27 10:26:07 +0200
committerWiktor Kwapisiewicz <wiktor@metacode.biz>2020-04-28 11:39:13 +0200
commit9d4b91098d37549347fdfff9513b629fcd3d973f (patch)
treeca57b1ef8d2bc7702da081ed6938364859ab7693 /tool/src/commands
parentc72e1b0855795d2fcd914157e1bd64c66bd6b997 (diff)
openpgp: Convert `Cert::from_packet_pile` into `TryFrom`
- Drop `Cert::from_packet_pile`. - Fixes #462.
Diffstat (limited to 'tool/src/commands')
-rw-r--r--tool/src/commands/inspect.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index e76b680b..b6f96662 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -1,3 +1,4 @@
+use std::convert::TryFrom;
use std::io::{self, Read};
use clap;
@@ -43,7 +44,7 @@ pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::W
}
let pp = openpgp::PacketPile::from(
::std::mem::replace(&mut packets, Vec::new()));
- let cert = openpgp::Cert::from_packet_pile(pp)?;
+ let cert = openpgp::Cert::try_from(pp)?;
inspect_cert(policy, output, &cert, print_keygrips,
print_certifications)?;
}
@@ -102,7 +103,7 @@ pub fn inspect(m: &clap::ArgMatches, policy: &dyn Policy, output: &mut dyn io::W
} else if is_cert.is_ok() || is_keyring.is_ok() {
let pp = openpgp::PacketPile::from(packets);
- let cert = openpgp::Cert::from_packet_pile(pp)?;
+ let cert = openpgp::Cert::try_from(pp)?;
inspect_cert(policy, output, &cert,
print_keygrips, print_certifications)?;
} else if packets.is_empty() && ! sigs.is_empty() {