From c4cf221f703a6e89b702b6cc6193f0b55a524715 Mon Sep 17 00:00:00 2001
From: Mathijs van de Nes <git@mathijs.vd-nes.nl>
Date: Mon, 16 Mar 2015 10:47:16 +0100
Subject: [PATCH] Save the unsupported value of CompressionMethod

---
 src/compression.rs | 38 ++++++++++++++++++++++++--------------
 src/write.rs       |  4 ++--
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/compression.rs b/src/compression.rs
index 17fd6750..e4a32a5e 100644
--- a/src/compression.rs
+++ b/src/compression.rs
@@ -5,13 +5,13 @@
 pub enum CompressionMethod
 {
     /// The file is stored (no compression)
-    Stored = 0,
+    Stored,
     /// The file is Deflated
-    Deflated = 8,
+    Deflated,
     /// File is compressed using BZIP2 algorithm
-    Bzip2 = 12,
+    Bzip2,
     /// Unsupported compression method
-    Unsupported = ::std::u16::MAX as isize,
+    Unsupported(u16),
 }
 
 impl CompressionMethod {
@@ -21,7 +21,17 @@ impl CompressionMethod {
             0 => CompressionMethod::Stored,
             8 => CompressionMethod::Deflated,
             12 => CompressionMethod::Bzip2,
-            _ => CompressionMethod::Unsupported,
+            v => CompressionMethod::Unsupported(v),
+        }
+    }
+
+    /// Converts a CompressionMethod to a u16
+    pub fn to_u16(self) -> u16 {
+        match self {
+            CompressionMethod::Stored => 0,
+            CompressionMethod::Deflated => 8,
+            CompressionMethod::Bzip2 => 12,
+            CompressionMethod::Unsupported(v) => v,
         }
     }
 }
@@ -31,26 +41,26 @@ mod test {
     use super::CompressionMethod;
 
     #[test]
-    fn from_u16() {
+    fn from_eq_to() {
         for v in (0..::std::u16::MAX as u32 + 1)
         {
-            let method = CompressionMethod::from_u16(v as u16);
-            match method {
-                CompressionMethod::Unsupported => {},
-                supported => assert_eq!(v, supported as u32),
-            }
+            let from = CompressionMethod::from_u16(v as u16);
+            let to = from.to_u16() as u32;
+            assert_eq!(v, to);
         }
     }
 
     #[test]
-    fn to_u16() {
+    fn to_eq_from() {
         fn check_match(method: CompressionMethod) {
-            assert!(method as u32 == CompressionMethod::from_u16(method as u16) as u32);
+            let to = method.to_u16();
+            let from = CompressionMethod::from_u16(to);
+            let back = from.to_u16();
+            assert_eq!(to, back);
         }
 
         check_match(CompressionMethod::Stored);
         check_match(CompressionMethod::Deflated);
         check_match(CompressionMethod::Bzip2);
-        check_match(CompressionMethod::Unsupported);
     }
 }
diff --git a/src/write.rs b/src/write.rs
index e381aa78..67da4500 100644
--- a/src/write.rs
+++ b/src/write.rs
@@ -289,7 +289,7 @@ fn write_local_file_header<T: Write>(writer: &mut T, file: &ZipFileData) -> ZipR
     try!(writer.write_u16::<LittleEndian>(20));
     let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
     try!(writer.write_u16::<LittleEndian>(flag));
-    try!(writer.write_u16::<LittleEndian>(file.compression_method as u16));
+    try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
     try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
     try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
     try!(writer.write_u32::<LittleEndian>(file.crc32));
@@ -321,7 +321,7 @@ fn write_central_directory_header<T: Write>(writer: &mut T, file: &ZipFileData)
     try!(writer.write_u16::<LittleEndian>(20));
     let flag = if !file.file_name.is_ascii() { 1u16 << 11 } else { 0 };
     try!(writer.write_u16::<LittleEndian>(flag));
-    try!(writer.write_u16::<LittleEndian>(file.compression_method as u16));
+    try!(writer.write_u16::<LittleEndian>(file.compression_method.to_u16()));
     try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_time(file.last_modified_time)));
     try!(writer.write_u16::<LittleEndian>(util::tm_to_msdos_date(file.last_modified_time)));
     try!(writer.write_u32::<LittleEndian>(file.crc32));