openpgp: Rename.

5 files changed, 6 insertions, 87 deletions

diff --git a/openpgp/src/serialize/stream/padding.rs b/openpgp/src/serialize/stream/padding.rs
index 3b08aa50..dbc15800 100644
--- a/openpgp/src/serialize/stream/padding.rs
+++ b/openpgp/src/serialize/stream/padding.rs
@@ -57,6 +57,7 @@ use crate::serialize::{
 };
 use crate::types::{
     CompressionAlgorithm,
+    CompressionLevel,
 };
 
 /// Pads a packet stream.
@@ -150,7 +151,7 @@ impl<'a, P: Fn(u64) -> u64 + 'a> Padder<'a, P> {
         // Create an appropriate filter.
         let inner: Message<'a, Cookie> =
             writer::ZIP::new(inner, Cookie::new(level),
-                             writer::CompressionLevel::none());
+                             CompressionLevel::none());
 
         Ok(Message::from(Box::new(Self {
             inner: inner.into(),
diff --git a/openpgp/src/serialize/stream/writer/compression_common.rs b/openpgp/src/serialize/stream/writer/compression_common.rs
deleted file mode 100644
index 7ac32d31..00000000
--- a/openpgp/src/serialize/stream/writer/compression_common.rs
+++ /dev/null
@@ -1,82 +0,0 @@
-//! Common code for the compression writers.
-
-use crate::{
-    Error,
-    Result,
-};
-
-/// Compression level.
-///
-/// This value is used by the encoders to tune their compression
-/// strategy.  The level is restricted to levels commonly used by
-/// compression libraries, `0` to `9`, where `0` means no compression,
-/// `1` means fastest compression, `6` being a good default, and
-/// meaning `9` best compression.
-#[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
-pub struct CompressionLevel(u8);
-
-impl Default for CompressionLevel {
-    fn default() -> Self {
-        Self(6)
-    }
-}
-
-impl CompressionLevel {
-    /// Creates a new compression level.
-    ///
-    /// `level` must be in range `0..10`, where `0` means no
-    /// compression, `1` means fastest compression, `6` being a good
-    /// default, and meaning `9` best compression.
-    pub fn new(level: u8) -> Result<CompressionLevel> {
-        if level < 10 {
-            Ok(Self(level))
-        } else {
-            Err(Error::InvalidArgument(
-                format!("compression level out of range: {}", level)).into())
-        }
-    }
-
-    /// No compression.
-    pub fn none() -> CompressionLevel {
-        Self(0)
-    }
-
-    /// Fastest compression.
-    pub fn fastest() -> CompressionLevel {
-        Self(1)
-    }
-    /// Best compression.
-    pub fn best() -> CompressionLevel {
-        Self(9)
-    }
-}
-
-#[cfg(feature = "compression-deflate")]
-mod into_deflate_compression {
-    use flate2::Compression;
-    use super::*;
-
-    impl From<CompressionLevel> for Compression {
-        fn from(l: CompressionLevel) -> Self {
-            Compression::new(l.0 as u32)
-        }
-    }
-}
-
-#[cfg(feature = "compression-bzip2")]
-mod into_bzip2_compression {
-    use bzip2::Compression;
-    use super::*;
-
-    impl From<CompressionLevel> for Compression {
-        fn from(l: CompressionLevel) -> Self {
-            if l <= CompressionLevel::fastest() {
-                Compression::Fastest
-            } else if l <= CompressionLevel::default() {
-                Compression::Default
-            } else {
-                Compression::Best
-            }
-        }
-    }
-}
diff --git a/openpgp/src/serialize/stream/writer/mod.rs b/openpgp/src/serialize/stream/writer/mod.rs
index 1006f0f5..44751c3f 100644
--- a/openpgp/src/serialize/stream/writer/mod.rs
+++ b/openpgp/src/serialize/stream/writer/mod.rs
@@ -8,8 +8,6 @@ pub use self::writer_bzip2::BZ;
 mod writer_deflate;
 #[cfg(feature = "compression-deflate")]
 pub use self::writer_deflate::{ZIP, ZLIB};
-mod compression_common;
-pub use compression_common::CompressionLevel;
 
 use std::fmt;
 use std::io;
diff --git a/openpgp/src/serialize/stream/writer/writer_bzip2.rs b/openpgp/src/serialize/stream/writer/writer_bzip2.rs
index 1f5b6cdf..28401550 100644
--- a/openpgp/src/serialize/stream/writer/writer_bzip2.rs
+++ b/openpgp/src/serialize/stream/writer/writer_bzip2.rs
@@ -3,7 +3,8 @@ use std::fmt;
 use std::io;
 
 use crate::Result;
-use super::{Generic, Message, BoxStack, Stackable, CompressionLevel};
+use crate::types::CompressionLevel;
+use super::{Generic, Message, BoxStack, Stackable};
 
 /// BZing writer.
 pub struct BZ<'a, C: 'a> {
diff --git a/openpgp/src/serialize/stream/writer/writer_deflate.rs b/openpgp/src/serialize/stream/writer/writer_deflate.rs
index b2cdd74f..b6e1116a 100644
--- a/openpgp/src/serialize/stream/writer/writer_deflate.rs
+++ b/openpgp/src/serialize/stream/writer/writer_deflate.rs
@@ -3,7 +3,8 @@ use std::fmt;
 use std::io;
 
 use crate::Result;
-use super::{Generic, Message, BoxStack, Stackable, CompressionLevel};
+use crate::types::CompressionLevel;
+use super::{Generic, Message, BoxStack, Stackable};
 
 /// ZIPing writer.
 pub struct ZIP<'a, C: 'a> {