From 57da266b3fb4d3b8f22863c15f3c2bb93050bb6b Mon Sep 17 00:00:00 2001
From: Julian Gehring <juliangehring@users.noreply.github.com>
Date: Mon, 22 Jun 2020 18:13:05 +0100
Subject: [PATCH] Fix `libdeflate` feature selection

---
 Cargo.toml         | 2 +-
 hts-sys/Cargo.toml | 3 ++-
 hts-sys/build.rs   | 4 ++--
 hts-sys/src/lib.rs | 4 ++--
 src/bam/mod.rs     | 6 +++---
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 76943fc6c..ad4ceb325 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -36,7 +36,7 @@ bzip2 = ["hts-sys/bzip2"]
 lzma = ["hts-sys/lzma"]
 bindgen = ["hts-sys/bindgen"]
 curl = ["hts-sys/curl"]
-libdeflate = ["hts-sys/libdeflate-sys"]
+libdeflate = ["hts-sys/libdeflate"]
 s3 = ["hts-sys/s3"]
 gcs = ["hts-sys/gcs"]
 static = ["hts-sys/static"]
diff --git a/hts-sys/Cargo.toml b/hts-sys/Cargo.toml
index 551a3c702..1de380bda 100644
--- a/hts-sys/Cargo.toml
+++ b/hts-sys/Cargo.toml
@@ -21,7 +21,7 @@ libz-sys = { version = "1.0.25", features = ["static"] }
 bzip2-sys = { version = "0.1.8", optional = true }
 lzma-sys = { version = "0.1.16", optional = true, features = ["static"] }
 curl-sys = { version = "0.4.31", optional = true, features = ["static-curl", "static-ssl", "protocol-ftp"] }
-libdeflate-sys = { version = "0.5", optional = true }
+libdeflate-sys = { version = "0.5.0", optional = true }
 
 [target.'cfg(all(unix, not(target_os = "macos")))'.dependencies]
 openssl-sys = { version = "0.9", optional = true }
@@ -31,6 +31,7 @@ default = ["bzip2", "lzma", "curl"]
 bzip2 = ["bzip2-sys"]
 lzma = ["lzma-sys"]
 curl = ["curl-sys", "openssl-sys"]
+libdeflate = ["libdeflate-sys"]
 gcs = ["curl"] # Google Cloud Storage support
 s3 = ["curl"] # Amazon S3 support
 static = [] # Don't dynamically link to other libraries
diff --git a/hts-sys/build.rs b/hts-sys/build.rs
index 223747343..58ad98e1d 100644
--- a/hts-sys/build.rs
+++ b/hts-sys/build.rs
@@ -108,8 +108,8 @@ fn main() {
         }
     }
 
-    let use_libdeflater = env::var("CARGO_FEATURE_LIBDEFLATER").is_ok();
-    if use_libdeflater {
+    let use_libdeflate = env::var("CARGO_FEATURE_LIBDEFLATE").is_ok();
+    if use_libdeflate {
         if let Ok(inc) = env::var("DEP_LIBDEFLATE_INCLUDE").map(PathBuf::from) {
             cfg.include(inc);
             config_lines.push("#define HAVE_LIBDEFLATE 1");
diff --git a/hts-sys/src/lib.rs b/hts-sys/src/lib.rs
index 1f1b8ebe3..e80d23638 100644
--- a/hts-sys/src/lib.rs
+++ b/hts-sys/src/lib.rs
@@ -8,8 +8,8 @@
 extern crate libz_sys;
 #[cfg(feature = "bzip2")]
 extern crate bzip2_sys;
-#[cfg(feature = "libdeflater")]
-extern crate libdeflater;
+#[cfg(feature = "libdeflate")]
+extern crate libdeflate_sys;
 #[cfg(feature = "lzma")]
 extern crate lzma_sys;
 #[cfg(feature = "curl")]
diff --git a/src/bam/mod.rs b/src/bam/mod.rs
index 748ecc7f5..b459992bf 100644
--- a/src/bam/mod.rs
+++ b/src/bam/mod.rs
@@ -1687,12 +1687,12 @@ CCCCCCCCCCCCCCCCCCC"[..],
         println!("testing compression leves: {:?}", levels_to_test);
         println!("got compressed sizes: {:?}", file_sizes);
 
-        // libdeflater comes out with a slightly bigger file on Max compression
+        // libdeflate comes out with a slightly bigger file on Max compression
         // than on Level(6), so skip that check
-        #[cfg(feature = "libdeflater")]
+        #[cfg(feature = "libdeflate")]
         assert!(file_sizes[1..].windows(2).all(|size| size[0] <= size[1]));
 
-        #[cfg(not(feature = "libdeflater"))]
+        #[cfg(not(feature = "libdeflate"))]
         assert!(file_sizes.windows(2).all(|size| size[0] <= size[1]));
 
         tmp.close().expect("Failed to delete temp dir");