Revert "Revert "Make cfzlib the default on platforms that support it""

This reverts commit ff0e3df948.

.travis.yml

@@ -11,7 +11,7 @@ matrix:
       env: TARGET=x86_64-apple-darwin
       cache: cargo
     - os: linux
-      rust: 1.24.0
+      rust: 1.27.0
       env: TARGET=x86_64-unknown-linux-gnu
       cache: cargo
     - os: linux

Cargo.toml

@@ -48,7 +48,6 @@ optional = true
 version = "1.0.1"
 
 [dependencies.cloudflare-zlib-sys]
-optional = true
 version = "^0.1.2"
 
 [dependencies.image]
@@ -63,11 +62,10 @@ binary = [
 ]
 default = ["binary", "parallel"]
 parallel = ["rayon"]
-cfzlib = ["cloudflare-zlib-sys"]
 dev = [
     "nightly-binary",
 ]
-nightly = ["cfzlib"]
+nightly = []
 nightly-binary = [
     "binary",
     "nightly",

README.md

@@ -26,7 +26,7 @@ cargo build --release
 cp target/release/oxipng /usr/local/bin
 ```
 
-The current minimum supported Rust version is **1.24.0**. Oxipng may compile on earlier versions of Rust,
+The current minimum supported Rust version is **1.27.0**. Oxipng may compile on earlier versions of Rust,
 but there is no guarantee.
 
 Oxipng follows Semantic Versioning.

README.template.md

@@ -26,7 +26,7 @@ cargo build --release
 cp target/release/oxipng /usr/local/bin
 ```
 
-The current minimum supported Rust version is **1.24.0**. Oxipng may compile on earlier versions of Rust,
+The current minimum supported Rust version is **1.27.0**. Oxipng may compile on earlier versions of Rust,
 but there is no guarantee.
 
 Oxipng follows Semantic Versioning.

src/deflate/mod.rs

@@ -16,17 +16,13 @@ pub fn inflate(data: &[u8]) -> PngResult<Vec<u8>> {
 
 /// Compress a data stream using the DEFLATE algorithm
 pub fn deflate(data: &[u8], zc: u8, zs: u8, zw: u8, max_size: &AtomicMin) -> PngResult<Vec<u8>> {
-    #[cfg(feature = "cfzlib")]
+    if is_cfzlib_supported() {
-    {
+        return cfzlib_deflate(data, zc, zs, zw, max_size);
-        if is_cfzlib_supported() {
-            return cfzlib_deflate(data, zc, zs, zw, max_size);
-        }
     }
 
     miniz_stream::compress_to_vec_oxipng(data, zc, zw.into(), zs.into(), max_size)
 }
 
-#[cfg(feature = "cfzlib")]
 fn is_cfzlib_supported() -> bool {
     #[cfg(target_arch = "x86_64")]
     {
@@ -43,7 +39,6 @@ fn is_cfzlib_supported() -> bool {
     false
 }
 
-#[cfg(feature = "cfzlib")]
 pub fn cfzlib_deflate(
     data: &[u8],
     level: u8,
@@ -84,11 +79,11 @@ pub fn cfzlib_deflate(
             Z_OK | Z_BUF_ERROR => {
                 deflateEnd(&mut stream);
                 return Err(PngError::DeflatedDataTooLong(stream.total_out as usize));
-            },
+            }
             _ => {
                 deflateEnd(&mut stream);
                 return Err(PngError::new("deflate"));
-            },
+            }
         }
         if Z_OK != deflateEnd(&mut stream) {
             return Err(PngError::new("deflateEnd"));

src/lib.rs

@@ -1,6 +1,5 @@
 extern crate bit_vec;
 extern crate byteorder;
-#[cfg(feature = "cfzlib")]
 extern crate cloudflare_zlib_sys;
 extern crate crc;
 extern crate image;