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.

2 files changed, 16 insertions, 8 deletions

diff --git a/guide/src/chapter_01.md b/guide/src/chapter_01.md
index 75bc6896..b6c05d21 100644
--- a/guide/src/chapter_01.md
+++ b/guide/src/chapter_01.md
@@ -14,6 +14,7 @@ use std::convert::TryInto;
 
 extern crate failure;
 extern crate sequoia_openpgp as openpgp;
+use openpgp::cert::prelude::*;
 use openpgp::serialize::stream::*;
 use openpgp::packet::prelude::*;
 use openpgp::parse::stream::*;
@@ -41,7 +42,7 @@ fn main() {
 #
 # /// Generates an signing-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_signing_subkey()
 #         .generate()?;
@@ -162,6 +163,7 @@ create it:
 #
 # extern crate failure;
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::serialize::stream::*;
 # use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
@@ -189,7 +191,7 @@ create it:
 #
 /// Generates an signing-capable key.
 fn generate() -> openpgp::Result<openpgp::Cert> {
-    let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+    let (cert, _revocation) = CertBuilder::new()
         .add_userid("someone@example.org")
         .add_signing_subkey()
         .generate()?;
@@ -310,6 +312,7 @@ implements [`io::Write`], and we simply write the plaintext to it.
 #
 # extern crate failure;
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::serialize::stream::*;
 # use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
@@ -337,7 +340,7 @@ implements [`io::Write`], and we simply write the plaintext to it.
 #
 # /// Generates an signing-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_signing_subkey()
 #         .generate()?;
@@ -469,6 +472,7 @@ Verified data can be read from this using [`io::Read`].
 #
 # extern crate failure;
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::serialize::stream::*;
 # use openpgp::packet::prelude::*;
 # use openpgp::parse::stream::*;
@@ -496,7 +500,7 @@ Verified data can be read from this using [`io::Read`].
 # 
 # /// Generates an signing-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_signing_subkey()
 #         .generate()?;
diff --git a/guide/src/chapter_02.md b/guide/src/chapter_02.md
index 1d55e6d9..3b95e516 100644
--- a/guide/src/chapter_02.md
+++ b/guide/src/chapter_02.md
@@ -12,6 +12,7 @@ fragments yields the [`openpgp/examples/generate-encrypt-decrypt.rs`].
 use std::io::{self, Write};
 
 extern crate sequoia_openpgp as openpgp;
+use openpgp::cert::prelude::*;
 use openpgp::crypto::SessionKey;
 use openpgp::types::SymmetricAlgorithm;
 use openpgp::serialize::stream::*;
@@ -40,7 +41,7 @@ fn main() {
 #
 # /// Generates an encryption-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_transport_encryption_subkey()
 #         .generate()?;
@@ -162,6 +163,7 @@ create it:
 # use std::io::{self, Write};
 #
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::crypto::SessionKey;
 # use openpgp::types::SymmetricAlgorithm;
 # use openpgp::serialize::stream::*;
@@ -190,7 +192,7 @@ create it:
 #
 /// Generates an encryption-capable key.
 fn generate() -> openpgp::Result<openpgp::Cert> {
-    let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+    let (cert, _revocation) = CertBuilder::new()
         .add_userid("someone@example.org")
         .add_transport_encryption_subkey()
         .generate()?;
@@ -312,6 +314,7 @@ implements [`io::Write`], and we simply write the plaintext to it.
 # use std::io::{self, Write};
 #
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::crypto::SessionKey;
 # use openpgp::types::SymmetricAlgorithm;
 # use openpgp::serialize::stream::*;
@@ -340,7 +343,7 @@ implements [`io::Write`], and we simply write the plaintext to it.
 #
 # /// Generates an encryption-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_transport_encryption_subkey()
 #         .generate()?;
@@ -476,6 +479,7 @@ Decrypted data can be read from this using [`io::Read`].
 # use std::io::{self, Write};
 #
 # extern crate sequoia_openpgp as openpgp;
+# use openpgp::cert::prelude::*;
 # use openpgp::crypto::SessionKey;
 # use openpgp::types::SymmetricAlgorithm;
 # use openpgp::serialize::stream::*;
@@ -504,7 +508,7 @@ Decrypted data can be read from this using [`io::Read`].
 #
 # /// Generates an encryption-capable key.
 # fn generate() -> openpgp::Result<openpgp::Cert> {
-#     let (cert, _revocation) = openpgp::cert::CertBuilder::new()
+#     let (cert, _revocation) = CertBuilder::new()
 #         .add_userid("someone@example.org")
 #         .add_transport_encryption_subkey()
 #         .generate()?;