Move the ASCII Armor module to 'sequoia::openpgp'.

4 files changed, 3 insertions, 4 deletions

diff --git a/src/lib.rs b/src/lib.rs
index c5821007..0c16e711 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -18,7 +18,6 @@ pub mod keys;
 pub mod store;
 pub mod net;
 pub mod ffi;
-pub mod armor;
 
 mod buffered_reader;
 
diff --git a/src/net/mod.rs b/src/net/mod.rs
index 139530af..c8cf597a 100644
--- a/src/net/mod.rs
+++ b/src/net/mod.rs
@@ -41,10 +41,9 @@ use std::io::{Cursor, Read};
 use std::io;
 
 use super::Context;
-use super::armor;
 use super::keys::TPK;
 use super::openpgp::types::KeyId;
-use super::openpgp;
+use super::openpgp::{self, armor};
 
 define_encode_set! {
     /// Encoding used for submitting keys.
diff --git a/src/armor.rs b/src/openpgp/armor.rs
index 7f3ded74..60b24542 100644
--- a/src/armor.rs
+++ b/src/openpgp/armor.rs
@@ -23,7 +23,7 @@
 //!
 //! ```rust,no_run
 //! use std::fs::File;
-//! use sequoia::armor::{Reader, Kind};
+//! use sequoia::openpgp::armor::{Reader, Kind};
 //!
 //! let mut file = File::open("somefile.asc").unwrap();
 //! let mut r = Reader::new(&mut file, Kind::File);
diff --git a/src/openpgp/mod.rs b/src/openpgp/mod.rs
index 683b8448..46081fbe 100644
--- a/src/openpgp/mod.rs
+++ b/src/openpgp/mod.rs
@@ -3,6 +3,7 @@
 // an included file confuses rust (it looks for the module in the
 // wrong place).  Hence, that here as well.
 
+pub mod armor;
 pub mod parse;
 pub mod types;