openpgp: Prevent monomorphization of Compressor::new_naked.

2 files changed, 8 insertions, 8 deletions

diff --git a/openpgp/src/serialize/mod.rs b/openpgp/src/serialize/mod.rs
index 91a26daf..5bdf6974 100644
--- a/openpgp/src/serialize/mod.rs
+++ b/openpgp/src/serialize/mod.rs
@@ -1676,8 +1676,8 @@ impl Serialize for CompressedData {
         }
 
         let o = stream::Message::new(o);
-        let mut o =
-            stream::Compressor::new_naked(o, self.algorithm(), None, 0)?;
+        let mut o = stream::Compressor::new_naked(
+            o, self.algorithm(), Default::default(), 0)?;
 
         // Serialize the packets.
         if let Some(ref children) = self.common.children {
diff --git a/openpgp/src/serialize/stream.rs b/openpgp/src/serialize/stream.rs
index 7d94616c..d69f51fc 100644
--- a/openpgp/src/serialize/stream.rs
+++ b/openpgp/src/serialize/stream.rs
@@ -765,6 +765,7 @@ impl<'a> Compressor<'a> {
         where L: Into<Option<writer::CompressionLevel>>
     {
         let mut inner = writer::BoxStack::from(inner);
+        let compression_level = compression_level.into().unwrap_or_default();
         let level = inner.cookie_ref().level + 1;
 
         // Packet header.
@@ -779,12 +780,11 @@ impl<'a> Compressor<'a> {
 
     /// Creates a new compressor using the given algorithm.
     pub(crate) // For CompressedData::serialize.
-    fn new_naked<L>(mut inner: writer::Stack<'a, Cookie>,
-                    algo: CompressionAlgorithm,
-                    compression_level: L,
-                    level: usize)
-                    -> Result<writer::Stack<'a, Cookie>>
-        where L: Into<Option<writer::CompressionLevel>>
+    fn new_naked(mut inner: writer::Stack<'a, Cookie>,
+                 algo: CompressionAlgorithm,
+                 compression_level: writer::CompressionLevel,
+                 level: usize)
+                 -> Result<writer::Stack<'a, Cookie>>
     {
         // Compressed data header.
         inner.as_mut().write_u8(algo.into())?;