From ffb15aa4567af3152633d07a4598444659a8fbd8 Mon Sep 17 00:00:00 2001 From: "Neal H. Walfield" Date: Wed, 26 Feb 2020 14:13:19 +0100 Subject: openpgp: Add a prelude file to import things related to certificates - Add `openpgp/src/cert/prelude.rs` to import most types and traits related to certificates. - Use it instead of using the types and traits individually. --- openpgp/examples/decrypt-with.rs | 2 +- openpgp/examples/generate-encrypt-decrypt.rs | 3 ++- openpgp/examples/generate-sign-verify.rs | 3 ++- openpgp/examples/web-of-trust.rs | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) (limited to 'openpgp/examples') diff --git a/openpgp/examples/decrypt-with.rs b/openpgp/examples/decrypt-with.rs index e74bcac2..3c380a91 100644 --- a/openpgp/examples/decrypt-with.rs +++ b/openpgp/examples/decrypt-with.rs @@ -8,7 +8,7 @@ use std::io; extern crate failure; extern crate sequoia_openpgp as openpgp; -use crate::openpgp::cert::components::Amalgamation; +use crate::openpgp::cert::prelude::*; use crate::openpgp::crypto::{KeyPair, SessionKey}; use crate::openpgp::types::SymmetricAlgorithm; use crate::openpgp::parse::{ diff --git a/openpgp/examples/generate-encrypt-decrypt.rs b/openpgp/examples/generate-encrypt-decrypt.rs index 55669c72..4b0d3ff2 100644 --- a/openpgp/examples/generate-encrypt-decrypt.rs +++ b/openpgp/examples/generate-encrypt-decrypt.rs @@ -3,6 +3,7 @@ use std::io::{self, Write}; extern crate sequoia_openpgp as openpgp; +use crate::openpgp::cert::prelude::*; use crate::openpgp::crypto::SessionKey; use crate::openpgp::types::SymmetricAlgorithm; use crate::openpgp::serialize::stream::*; @@ -31,7 +32,7 @@ fn main() { /// Generates an encryption-capable key. fn generate() -> openpgp::Result { - let (cert, _revocation) = openpgp::cert::CertBuilder::new() + let (cert, _revocation) = CertBuilder::new() .add_userid("someone@example.org") .add_transport_encryption_subkey() .generate()?; diff --git a/openpgp/examples/generate-sign-verify.rs b/openpgp/examples/generate-sign-verify.rs index e5f21505..0e9ab2d1 100644 --- a/openpgp/examples/generate-sign-verify.rs +++ b/openpgp/examples/generate-sign-verify.rs @@ -4,6 +4,7 @@ use std::io::{self, Write}; extern crate failure; extern crate sequoia_openpgp as openpgp; +use crate::openpgp::cert::prelude::*; use crate::openpgp::serialize::stream::*; use crate::openpgp::parse::stream::*; use crate::openpgp::policy::Policy; @@ -30,7 +31,7 @@ fn main() { /// Generates an signing-capable key. fn generate() -> openpgp::Result { - let (cert, _revocation) = openpgp::cert::CertBuilder::new() + let (cert, _revocation) = CertBuilder::new() .add_userid("someone@example.org") .add_signing_subkey() .generate()?; diff --git a/openpgp/examples/web-of-trust.rs b/openpgp/examples/web-of-trust.rs index 123d4a53..ac0ef3db 100644 --- a/openpgp/examples/web-of-trust.rs +++ b/openpgp/examples/web-of-trust.rs @@ -11,7 +11,7 @@ use std::env; extern crate sequoia_openpgp as openpgp; use crate::openpgp::KeyID; -use crate::openpgp::cert::CertParser; +use crate::openpgp::cert::prelude::*; use crate::openpgp::parse::Parse; fn main() { -- cgit v1.2.3