diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-04-03 12:07:31 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-04-03 13:46:23 +0200 |
commit | 3537bf41630139cb4cd44a8b13a21e7cce27211e (patch) | |
tree | 62d134a854a73bb8cba08f915d5d8a8e2f3863ac | |
parent | 5dcd7da9f497f53a8271f2dbd923b52f230cec31 (diff) |
openpgp: Rename.
-rw-r--r-- | openpgp/src/serialize.rs | 2 | ||||
-rw-r--r-- | openpgp/src/serialize/stream.rs | 3 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/padding.rs | 2 | ||||
-rw-r--r-- | openpgp/src/serialize/stream/partial_body.rs (renamed from openpgp/src/serialize/partial_body.rs) | 9 |
4 files changed, 8 insertions, 8 deletions
diff --git a/openpgp/src/serialize.rs b/openpgp/src/serialize.rs index 9f1eda4f..0e6d4dfd 100644 --- a/openpgp/src/serialize.rs +++ b/openpgp/src/serialize.rs @@ -19,12 +19,10 @@ use std::convert::TryFrom; use super::*; -mod partial_body; mod sexp; mod cert; pub use self::cert::TSK; mod cert_armored; -use self::partial_body::PartialBodyFilter; pub mod stream; use crate::crypto::S2K; use crate::packet::header::{ diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs index 3c810a14..2316ec43 100644 --- a/openpgp/src/serialize/stream.rs +++ b/openpgp/src/serialize/stream.rs @@ -33,7 +33,6 @@ use crate::{ use crate::packet::header::CTB; use crate::packet::header::BodyLength; use super::{ - PartialBodyFilter, Marshal, }; use crate::types::{ @@ -47,6 +46,8 @@ use crate::types::{ pub mod writer; #[cfg(feature = "compression-deflate")] pub mod padding; +mod partial_body; +use partial_body::PartialBodyFilter; /// Cookie must be public because the writers are. #[doc(hidden)] diff --git a/openpgp/src/serialize/stream/padding.rs b/openpgp/src/serialize/stream/padding.rs index 02bbe7ff..db190253 100644 --- a/openpgp/src/serialize/stream/padding.rs +++ b/openpgp/src/serialize/stream/padding.rs @@ -47,11 +47,11 @@ use crate::{ }; use crate::packet::header::CTB; use crate::serialize::{ - PartialBodyFilter, Marshal, stream::{ writer, Cookie, + PartialBodyFilter, }, }; use crate::types::{ diff --git a/openpgp/src/serialize/partial_body.rs b/openpgp/src/serialize/stream/partial_body.rs index f6e62280..e5aef8ca 100644 --- a/openpgp/src/serialize/partial_body.rs +++ b/openpgp/src/serialize/stream/partial_body.rs @@ -8,7 +8,8 @@ use std::cmp; use crate::Error; use crate::Result; use crate::packet::header::BodyLength; -use super::{ +use crate::serialize::{ + log2, stream::writer, write_byte, Marshal, @@ -124,9 +125,9 @@ impl<'a, C: 'a> PartialBodyFilter<'a, C> { // Write a partial body length header. let chunk_size_log2 = - super::log2(cmp::min(self.max_chunk_size, - self.buffer.len() + other.len()) - as u32); + log2(cmp::min(self.max_chunk_size, + self.buffer.len() + other.len()) + as u32); let chunk_size = (1usize) << chunk_size_log2; let size = BodyLength::Partial(chunk_size as u32); |