diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-04-02 16:19:47 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-04-02 16:23:40 +0200 |
commit | 80f359aa53f5672bca64030535cb5afae080acce (patch) | |
tree | bb74dcc5759dc9de1f55490364b490e13dc36d2e /openpgp | |
parent | caeb69d5988b7877e2ebfa7dbd90191b2c586785 (diff) |
openpgp: Move the writer module to serialize::stream.
Diffstat (limited to 'openpgp')
-rw-r--r-- | openpgp/src/serialize.rs | 1 | ||||
-rw-r--r-- | openpgp/src/serialize/partial_body.rs | 6 | ||||
-rw-r--r-- | openpgp/src/serialize/stream.rs | 2 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/padding.rs | 6 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/writer/compression_common.rs (renamed from openpgp/src/serialize/writer/compression_common.rs) | 0 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/writer/mod.rs (renamed from openpgp/src/serialize/writer/mod.rs) | 0 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/writer/writer_bzip2.rs (renamed from openpgp/src/serialize/writer/writer_bzip2.rs) | 0 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/writer/writer_deflate.rs (renamed from openpgp/src/serialize/writer/writer_deflate.rs) | 0 |
8 files changed, 10 insertions, 5 deletions
diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs index 246f3bdd..9f1eda4f 100644 --- a/openpgp/src/serialize.rs +++ b/openpgp/src/serialize.rs @@ -25,7 +25,6 @@ mod cert; pub use self::cert::TSK; mod cert_armored; use self::partial_body::PartialBodyFilter; -pub mod writer; pub mod stream; use crate::crypto::S2K; use crate::packet::header::{ diff --git a/openpgp/src/serialize/partial_body.rs b/openpgp/src/serialize/partial_body.rs index 47c0e8b9..f6e62280 100644 --- a/openpgp/src/serialize/partial_body.rs +++ b/openpgp/src/serialize/partial_body.rs @@ -8,7 +8,11 @@ use std::cmp; use crate::Error; use crate::Result; use crate::packet::header::BodyLength; -use super::{writer, write_byte, Marshal}; +use super::{ + stream::writer, + write_byte, + Marshal, +}; pub struct PartialBodyFilter<'a, C: 'a> { // The underlying writer. diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index c347d29e..3c810a14 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -35,7 +35,6 @@ use crate::packet::header::BodyLength; use super::{ PartialBodyFilter, Marshal, - writer, }; use crate::types::{ AEADAlgorithm, @@ -45,6 +44,7 @@ use crate::types::{ SymmetricAlgorithm, }; +pub mod writer; #[cfg(feature = "compression-deflate")] pub mod padding; diff --git a/openpgp/src/serialize/stream/padding.rs b/openpgp/src/serialize/stream/padding.rs index 516e1a47..02bbe7ff 100644 --- a/openpgp/src/serialize/stream/padding.rs +++ b/openpgp/src/serialize/stream/padding.rs @@ -49,8 +49,10 @@ use crate::packet::header::CTB; use crate::serialize::{ PartialBodyFilter, Marshal, - writer, - stream::Cookie, + stream::{ + writer, + Cookie, + }, }; use crate::types::{ CompressionAlgorithm, diff --git a/openpgp/src/serialize/writer/compression_common.rs b/openpgp/src/serialize/stream/writer/compression_common.rs index 7ac32d31..7ac32d31 100644 --- a/openpgp/src/serialize/writer/compression_common.rs +++ b/openpgp/src/serialize/stream/writer/compression_common.rs diff --git a/openpgp/src/serialize/writer/mod.rs b/openpgp/src/serialize/stream/writer/mod.rs index 2141ca98..2141ca98 100644 --- a/openpgp/src/serialize/writer/mod.rs +++ b/openpgp/src/serialize/stream/writer/mod.rs diff --git a/openpgp/src/serialize/writer/writer_bzip2.rs b/openpgp/src/serialize/stream/writer/writer_bzip2.rs index 62affd0c..62affd0c 100644 --- a/openpgp/src/serialize/writer/writer_bzip2.rs +++ b/openpgp/src/serialize/stream/writer/writer_bzip2.rs diff --git a/openpgp/src/serialize/writer/writer_deflate.rs b/openpgp/src/serialize/stream/writer/writer_deflate.rs index 387b3f2c..387b3f2c 100644 --- a/openpgp/src/serialize/writer/writer_deflate.rs +++ b/openpgp/src/serialize/stream/writer/writer_deflate.rs |