openpgp: Move the padding module to serialize::stream.

5 files changed, 10 insertions, 10 deletions

diff --git a/openpgp/examples/pad.rs b/openpgp/examples/pad.rs
index 6f49cbf3..4a762b58 100644
--- a/openpgp/examples/pad.rs
+++ b/openpgp/examples/pad.rs
@@ -10,9 +10,8 @@ use crate::openpgp::KeyID;
 use crate::openpgp::types::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::stream::{
-    Message, LiteralWriter, Encryptor, Recipient,
+    Message, LiteralWriter, Encryptor, Recipient, padding::*,
 };
-use crate::openpgp::serialize::padding::*;
 use crate::openpgp::policy::StandardPolicy as P;
 
 fn main() {
diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs
index 7049f421..246f3bdd 100644
--- a/openpgp/src/serialize.rs
+++ b/openpgp/src/serialize.rs
@@ -27,8 +27,6 @@ mod cert_armored;
 use self::partial_body::PartialBodyFilter;
 pub mod writer;
 pub mod stream;
-#[cfg(feature = "compression-deflate")]
-pub mod padding;
 use crate::crypto::S2K;
 use crate::packet::header::{
     BodyLength,
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 9ff26434..c347d29e 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -45,6 +45,9 @@ use crate::types::{
     SymmetricAlgorithm,
 };
 
+#[cfg(feature = "compression-deflate")]
+pub mod padding;
+
 /// Cookie must be public because the writers are.
 #[doc(hidden)]
 #[derive(Debug)]
diff --git a/openpgp/src/serialize/padding.rs b/openpgp/src/serialize/stream/padding.rs
index e484dc8a..516e1a47 100644
--- a/openpgp/src/serialize/padding.rs
+++ b/openpgp/src/serialize/stream/padding.rs
@@ -46,7 +46,7 @@ use crate::{
     packet::prelude::*,
 };
 use crate::packet::header::CTB;
-use super::{
+use crate::serialize::{
     PartialBodyFilter,
     Marshal,
     writer,
@@ -94,7 +94,7 @@ use crate::types::{
 /// extern crate sequoia_openpgp as openpgp;
 /// use std::io::Write;
 /// use openpgp::serialize::stream::{Message, LiteralWriter};
-/// use openpgp::serialize::padding::{Padder, padme};
+/// use openpgp::serialize::stream::padding::{Padder, padme};
 /// use openpgp::types::CompressionAlgorithm;
 /// # use openpgp::Result;
 /// # f().unwrap();
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index 6e5b029e..1cc6651b 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -30,10 +30,10 @@ use crate::openpgp::parse::stream::{
 use crate::openpgp::serialize::stream::{
     Message, Signer, LiteralWriter, Encryptor, Recipient,
     Compressor,
-};
-use crate::openpgp::serialize::padding::{
-    Padder,
-    padme,
+    padding::{
+        Padder,
+        padme,
+    },
 };
 use crate::openpgp::policy::Policy;
 extern crate sequoia_store as store;