openpgp: Move the TPK type definition to openpgp proper.

  - We define all types in the root of the openpgp crate, and their
    implementations in separate modules.  This makes using these types
    much simpler, yet keeps the root from getting too crowded.

  - Also fix all users accordingly.

2 files changed, 2 insertions, 2 deletions

diff --git a/examples/guide-exploring-openpgp.rs b/examples/guide-exploring-openpgp.rs
index af4b7a7d..bc05a7e1 100644
--- a/examples/guide-exploring-openpgp.rs
+++ b/examples/guide-exploring-openpgp.rs
@@ -49,7 +49,7 @@ fn main() {
     println!();
 
     // Parse into TPK.
-    let tpk = openpgp::tpk::TPK::from_message(message).unwrap();
+    let tpk = openpgp::TPK::from_message(message).unwrap();
     println!("Fingerprint: {}", tpk.fingerprint());
 
     // List userids.
diff --git a/examples/guide-the-keystore.rs b/examples/guide-the-keystore.rs
index 0baa8a05..91f049f0 100644
--- a/examples/guide-the-keystore.rs
+++ b/examples/guide-the-keystore.rs
@@ -43,7 +43,7 @@ fn main() {
     let ctx = core::Context::new("org.sequoia-pgp.guide").unwrap();
 
     // Parse TPK.
-    let tpk = openpgp::tpk::TPK::from_reader(&mut reader).unwrap();
+    let tpk = openpgp::TPK::from_reader(&mut reader).unwrap();
 
     // Open a store.
     let store = store::Store::open(&ctx, "default").unwrap();