Merge pull request #405 from Byron/fix-CI

fix CI - `--all-features` wasn't tested and didn't work with arrival of `zlib-rs`

.github/workflows/main.yml

@@ -55,13 +55,14 @@ jobs:
       if: matrix.build == 'stable' 
 
   rustfmt:
-    name: Rustfmt
+    name: Rustfmt & Docs
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install Rust
       run: rustup update stable && rustup default stable && rustup component add rustfmt
     - run: cargo fmt -- --check
+    - run: cargo doc --all-features
 
   wasm:
     name: WebAssembly

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "flate2"
 authors = ["Alex Crichton <[email protected]>", "Josh Triplett <[email protected]>"]
-version = "1.0.29"
+version = "1.0.30"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 readme = "README.md"

src/ffi/c.rs

@@ -403,7 +403,7 @@ mod c_backend {
     #[cfg(feature = "zlib-ng")]
     use libz_ng_sys as libz;
 
-    #[cfg(feature = "zlib-rs")]
+    #[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))]
     use libz_rs_sys as libz;
 
     #[cfg(all(not(feature = "zlib-ng"), feature = "cloudflare_zlib"))]
@@ -443,7 +443,7 @@ mod c_backend {
 
     #[cfg(feature = "zlib-ng")]
     const ZLIB_VERSION: &'static str = "2.1.0.devel\0";
-    #[cfg(feature = "zlib-rs")]
+    #[cfg(all(not(feature = "zlib-ng"), feature = "zlib-rs"))]
     const ZLIB_VERSION: &'static str = "0.1.0\0";
     #[cfg(not(any(feature = "zlib-ng", feature = "zlib-rs")))]
     const ZLIB_VERSION: &'static str = "1.2.8\0";