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, 6 insertions, 7 deletions

diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index bb03f33b..344697e6 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -21,8 +21,7 @@ use tokio_core::reactor::{Handle, Timeout};
 use tokio_core;
 use tokio_io::io::ReadHalf;
 
-use openpgp::{self, Fingerprint};
-use openpgp::tpk::{self, TPK};
+use openpgp::{self, tpk, TPK, Fingerprint};
 use sequoia_core as core;
 use sequoia_net as net;
 use sequoia_net::ipc;
diff --git a/store/src/lib.rs b/store/src/lib.rs
index f617aa83..406c1c78 100644
--- a/store/src/lib.rs
+++ b/store/src/lib.rs
@@ -77,7 +77,7 @@ extern crate sequoia_core;
 extern crate sequoia_net;
 
 use openpgp::Fingerprint;
-use openpgp::tpk::TPK;
+use openpgp::TPK;
 use sequoia_core as core;
 use sequoia_core::Context;
 use sequoia_net::ipc;
@@ -225,7 +225,7 @@ impl Store {
     /// # extern crate openpgp;
     /// # extern crate sequoia_core;
     /// # extern crate sequoia_store;
-    /// # use openpgp::tpk::TPK;
+    /// # use openpgp::TPK;
     /// # use sequoia_core::{Context, NetworkPolicy, IPCPolicy};
     /// # use sequoia_store::{Store, Result};
     /// # fn main() { f().unwrap(); }
@@ -450,7 +450,7 @@ impl Binding {
     /// # extern crate openpgp;
     /// # #[macro_use] extern crate sequoia_core;
     /// # extern crate sequoia_store;
-    /// # use openpgp::tpk::TPK;
+    /// # use openpgp::TPK;
     /// # use sequoia_core::{Context, NetworkPolicy, IPCPolicy};
     /// # use sequoia_store::{Store, Result, Error};
     /// # fn main() { f().unwrap(); }
@@ -508,7 +508,7 @@ impl Binding {
     /// # extern crate openpgp;
     /// # #[macro_use] extern crate sequoia_core;
     /// # extern crate sequoia_store;
-    /// # use openpgp::tpk::TPK;
+    /// # use openpgp::TPK;
     /// # use sequoia_core::{Context, NetworkPolicy, IPCPolicy};
     /// # use sequoia_store::{Store, Result, Error};
     /// # fn main() { f().unwrap(); }
@@ -647,7 +647,7 @@ impl Key {
     /// # #[macro_use] extern crate sequoia_core;
     /// # extern crate sequoia_store;
     /// # use openpgp::Fingerprint;
-    /// # use openpgp::tpk::TPK;
+    /// # use openpgp::TPK;
     /// # use sequoia_core::{Context, NetworkPolicy, IPCPolicy};
     /// # use sequoia_store::{Store, Result, Error};
     /// # fn main() { f().unwrap(); }