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.

3 files changed, 3 insertions, 3 deletions

diff --git a/net/src/async.rs b/net/src/async.rs
index 27b5b44b..9ee962e2 100644
--- a/net/src/async.rs
+++ b/net/src/async.rs
@@ -16,7 +16,7 @@ use std::io::Cursor;
 use tokio_core::reactor::Handle;
 use url::Url;
 
-use openpgp::tpk::TPK;
+use openpgp::TPK;
 use openpgp::{KeyID, armor};
 use sequoia_core::{Context, NetworkPolicy};
 
diff --git a/net/src/lib.rs b/net/src/lib.rs
index 94baaa05..d01aa93d 100644
--- a/net/src/lib.rs
+++ b/net/src/lib.rs
@@ -56,7 +56,7 @@ use tokio_core::reactor::Core;
 use url::Url;
 
 use openpgp::KeyID;
-use openpgp::tpk::TPK;
+use openpgp::TPK;
 use sequoia_core::Context;
 
 pub mod async;
diff --git a/net/tests/hkp.rs b/net/tests/hkp.rs
index a3ee9c89..d3da0f93 100644
--- a/net/tests/hkp.rs
+++ b/net/tests/hkp.rs
@@ -21,7 +21,7 @@ extern crate sequoia_core;
 extern crate sequoia_net;
 
 use openpgp::armor::{Reader, Kind};
-use openpgp::tpk::TPK;
+use openpgp::TPK;
 use openpgp::{Fingerprint, KeyID};
 use sequoia_core::{Context, NetworkPolicy};
 use sequoia_net::KeyServer;