Use weak features

Author: mulimoen

.github/workflows/ci.yml

@@ -47,7 +47,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with: {toolchain: nightly, profile: minimal, override: true}
       - name: Document workspace
-        run: env RUSTDOCFLAGS="--cfg docsrs" cargo doc --features hdf5-sys/static,hdf5-sys/zlib,blosc,lzf
+        run: env RUSTDOCFLAGS="--cfg docsrs" cargo doc --features static,zlib,blosc,lzf
 
   brew:
     name: brew
@@ -144,14 +144,14 @@ jobs:
         uses: actions-rs/toolchain@v1
         with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
       - name: Build and test all crates
-        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib --exclude hdf5-derive
+        run: cargo test --workspace -v --features static,zlib --exclude hdf5-derive
       - name: Build and test with filters
-        run: cargo test --workspace -v --features hdf5-sys/static,hdf5-sys/zlib,lzf,blosc --exclude hdf5-derive
+        run: cargo test --workspace -v --features static,zlib,lzf,blosc --exclude hdf5-derive
         if: matrix.rust != 'stable-gnu'
       - name: Run examples
         run: |
-          cargo r --example simple --features hdf5-sys/static,hdf5-sys/zlib,lzf,blosc
-          cargo r --example chunking --features hdf5-sys/static,hdf5-sys/zlib,lzf,blosc
+          cargo r --example simple --features static,zlib,lzf,blosc
+          cargo r --example chunking --features static,zlib,lzf,blosc
         if: matrix.rust != 'stable-gnu'
 
   apt:
@@ -245,10 +245,10 @@ jobs:
         with: {submodules: true}
       - name: Install Rust
         uses: actions-rs/toolchain@v1
-        with: {toolchain: 1.54, profile: minimal, override: true}
+        with: {toolchain: "1.60", profile: minimal, override: true}
       - name: Build and test all crates
         run:
-          cargo test --workspace -vv --features=hdf5-sys/static --exclude=hdf5-derive
+          cargo test -- --workspace -vv --features static --exclude=hdf5-derive
 
   wine:
     name: wine
@@ -263,7 +263,7 @@ jobs:
       - name: Install dependencies
         run: sudo apt-get update && sudo apt install wine64 mingw-w64
       - name: Build and test
-        run: env CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=wine64 cargo test --features hdf5-sys/static --target x86_64-pc-windows-gnu -- --skip test_compile_fail
+        run: env CARGO_TARGET_X86_64_PC_WINDOWS_GNU_RUNNER=wine64 cargo test --features static --target x86_64-pc-windows-gnu -- --skip test_compile_fail
   addr_san:
     name: Address sanitizer
     runs-on: ubuntu-latest
@@ -275,4 +275,4 @@ jobs:
         uses: actions-rs/toolchain@v1
         with: {toolchain: nightly, profile: minimal, override: true}
       - name: Run test with sanitizer
-        run: env RUSTFLAGS="-Z sanitizer=address" cargo test --features hdf5-sys/static --target x86_64-unknown-linux-gnu --workspace --exclude hdf5-derive
+        run: env RUSTFLAGS="-Z sanitizer=address" cargo test --features static --target x86_64-unknown-linux-gnu --workspace --exclude hdf5-derive

CHANGELOG.md

@@ -12,7 +12,8 @@
 ### Changed
 
 - The `H5Type` derive macro now uses `proc-macro-error` to emit error messages.
-- MSRV is now `1.54` following a bump in a dependency.
+- Features have been reworked to use the new dependency resolution. This bumps MSRV.
+- MSRV is increased to `1.60`.
 
 ### Fixed
 

Cargo.toml

@@ -11,12 +11,15 @@ homepage = "https://github.com/aldanor/hdf5-rust"
 build = "build.rs"
 edition = "2018"
 categories = ["science", "filesystem"]
+rust-version = "1.60"
 
 [features]
 default = []
-mpio = ["mpi-sys", "hdf5-sys/mpio"]
-lzf = ["lzf-sys", "errno"]
-blosc = ["blosc-sys"]
+mpio = ["dep:mpi-sys", "hdf5-sys/mpio"]
+lzf = ["dep:lzf-sys", "dep:errno"]
+blosc = ["dep:blosc-sys"]
+static = ["hdf5-sys/static"]
+zlib = ["hdf5-sys/zlib"]
 # The features with version numbers such as 1.10.3, 1.12.0 are metafeatures
 # and is only available when the HDF5 library is at least this version.
 # Features have_direct and have_parallel are also metafeatures and dependent

hdf5-src/Cargo.toml

@@ -12,6 +12,7 @@ edition = "2018"
 links = "hdf5src"
 readme = "README.md"
 categories = ["ffi"]
+rust-version = "1.60"
 exclude = [
     "ext/hdf5/bin/**",
     "ext/hdf5/c++/**",
@@ -29,7 +30,7 @@ exclude = [
 
 [features]
 hl = []
-zlib = ["libz-sys"]
+zlib = ["dep:libz-sys"]
 deprecated = []
 threadsafe = []
 

hdf5-sys/Cargo.toml

@@ -12,6 +12,7 @@ edition = "2018"
 links = "hdf5"
 readme = "README.md"
 categories = ["ffi", "filesystem", "science"]
+rust-version = "1.60"
 
 [dependencies]
 libc = "0.2"
@@ -22,12 +23,12 @@ hdf5-src = { path = "../hdf5-src", version = "0.8.1", optional = true }  # !V
 # Please see README for further explanation of these feature flags
 [features]
 default = []
-mpio = ["mpi-sys"]
-hl = ["hdf5-src/hl"]
-threadsafe = ["hdf5-src/threadsafe"]
-zlib = ["libz-sys", "hdf5-src/zlib"]
-static = ["hdf5-src"]
-deprecated = ["hdf5-src/deprecated"]
+mpio = ["dep:mpi-sys"]
+hl = ["hdf5-src?/hl"]
+threadsafe = ["hdf5-src?/threadsafe"]
+zlib = ["dep:libz-sys", "hdf5-src?/zlib"]
+static = ["dep:hdf5-src"]
+deprecated = ["hdf5-src?/deprecated"]
 
 [build-dependencies]
 libloading = "0.7"

hdf5-sys/build.rs

@@ -168,6 +168,8 @@ pub struct Header {
     pub have_direct: bool,
     pub have_parallel: bool,
     pub have_threadsafe: bool,
+    pub have_zlib: bool,
+    pub have_no_deprecated: bool,
     pub version: Version,
 }
 
@@ -193,6 +195,10 @@ impl Header {
                 hdr.have_parallel = value > 0;
             } else if name == "H5_HAVE_THREADSAFE" {
                 hdr.have_threadsafe = value > 0;
+            } else if name == "H5_HAVE_FILTER_DEFLATE" {
+                hdr.have_zlib = value > 0;
+            } else if name == "H5_NO_DEPRECATED_SYMBOLS" {
+                hdr.have_no_deprecated = value > 0;
             }
         }
 
@@ -571,6 +577,7 @@ impl LibrarySearcher {
             }
             let config = Config { inc_dir: inc_dir.clone(), link_paths, header };
             validate_runtime_version(&config);
+            config.check_against_features_required();
             config
         } else {
             panic!("Unable to determine HDF5 location (set HDF5_DIR to specify it manually).");
@@ -634,6 +641,24 @@ impl Config {
             println!("cargo:have_threadsafe=1");
         }
     }
+
+    fn check_against_features_required(&self) {
+        if feature_enabled("DEPRECATED") {
+            assert!(!self.header.have_no_deprecated, "Required deprecated symbols are not present")
+        }
+        if feature_enabled("THREADSAFE") {
+            assert!(
+                self.header.have_threadsafe,
+                "Required threadsafe but library was not build using the threadsafe option"
+            );
+        }
+        if feature_enabled("ZLIB") {
+            assert!(
+                self.header.have_zlib,
+                "Required zlib filter but library does not have builtin support for this options"
+            );
+        }
+    }
 }
 
 fn main() {