hdf5 crate: cfg(have_*) -> feature="have-*"

Author: aldanor

build.rs

@@ -1,19 +1,21 @@
 use std::env;
 
 fn main() {
+    let print_feature = |key: &str| println!("cargo:rustc-cfg=feature=\"{}\"", key);
+    let print_cfg = |key: &str| println!("cargo:rustc-cfg={}", key);
     for (key, _) in env::vars() {
-        let key = match key.as_str() {
-            "DEP_HDF5_HAVE_DIRECT" => "have_direct".into(),
-            "DEP_HDF5_HAVE_STDBOOL" => "have_stdbool".into(),
-            "DEP_HDF5_HAVE_PARALLEL" => "have_parallel".into(),
-            "DEP_HDF5_HAVE_THREADSAFE" => "have_threadsafe".into(),
-            "DEP_HDF5_MSVC_DLL_INDIRECTION" => "dll_indirection".into(),
+        match key.as_str() {
+            // public features
+            "DEP_HDF5_HAVE_DIRECT" => print_feature("have-direct"),
+            "DEP_HDF5_HAVE_PARALLEL" => print_feature("have-parallel"),
+            "DEP_HDF5_HAVE_THREADSAFE" => print_feature("have-threadsafe"),
+            // internal config flags
+            "DEP_HDF5_MSVC_DLL_INDIRECTION" => print_cfg("msvc_dll_indirection"),
+            // public version features
             key if key.starts_with("DEP_HDF5_VERSION_") => {
-                let version = key.trim_start_matches("DEP_HDF5_VERSION_");
-                format!("feature=\"{}\"", version.replace("_", "."))
+                print_feature(&key.trim_start_matches("DEP_HDF5_VERSION_").replace("_", "."));
             }
             _ => continue,
-        };
-        println!("cargo:rustc-cfg={}", key);
+        }
     }
 }

hdf5-sys/build.rs

@@ -620,8 +620,8 @@ impl Config {
             println!("cargo:version_{}_{}_{}=1", v.major, v.minor, v.micro);
         }
         if self.header.have_stdbool_h {
-            println!("cargo:have_stdbool=1");
             println!("cargo:rustc-cfg=have_stdbool_h");
+            // there should be no need to export have_stdbool_h downstream
         }
         if self.header.have_direct {
             println!("cargo:rustc-cfg=feature=\"have-direct\"");

src/globals.rs

@@ -4,9 +4,9 @@ use std::mem;
 
 use lazy_static::lazy_static;
 
-#[cfg(have_direct)]
+#[cfg(feature = "have-direct")]
 use hdf5_sys::h5fd::H5FD_direct_init;
-#[cfg(have_parallel)]
+#[cfg(feature = "have-parallel")]
 use hdf5_sys::h5fd::H5FD_mpio_init;
 use hdf5_sys::h5fd::{
     H5FD_core_init, H5FD_family_init, H5FD_log_init, H5FD_multi_init, H5FD_sec2_init,
@@ -17,16 +17,16 @@ use hdf5_sys::{h5e, h5p, h5t};
 use crate::internal_prelude::*;
 
 pub struct H5GlobalConstant(
-    #[cfg(dll_indirection)] &'static usize,
-    #[cfg(not(dll_indirection))] &'static hdf5_sys::h5i::hid_t,
+    #[cfg(msvc_dll_indirection)] &'static usize,
+    #[cfg(not(msvc_dll_indirection))] &'static hdf5_sys::h5i::hid_t,
 );
 
 impl std::ops::Deref for H5GlobalConstant {
     type Target = hdf5_sys::h5i::hid_t;
     fn deref(&self) -> &Self::Target {
         lazy_static::initialize(&crate::sync::LIBRARY_INIT);
         cfg_if::cfg_if! {
-            if #[cfg(dll_indirection)] {
+            if #[cfg(msvc_dll_indirection)] {
                 let dll_ptr = self.0 as *const usize;
                 let ptr: *const *const hdf5_sys::h5i::hid_t = dll_ptr.cast();
                 unsafe {
@@ -336,21 +336,21 @@ lazy_static! {
 }
 
 // MPI-IO file driver
-#[cfg(have_parallel)]
+#[cfg(feature = "have-parallel")]
 lazy_static! {
     pub static ref H5FD_MPIO: hid_t = unsafe { h5lock!(H5FD_mpio_init()) };
 }
-#[cfg(not(have_parallel))]
+#[cfg(not(feature = "have-parallel"))]
 lazy_static! {
     pub static ref H5FD_MPIO: hid_t = H5I_INVALID_HID;
 }
 
 // Direct VFD
-#[cfg(have_direct)]
+#[cfg(feature = "have-direct")]
 lazy_static! {
     pub static ref H5FD_DIRECT: hid_t = unsafe { h5lock!(H5FD_direct_init()) };
 }
-#[cfg(not(have_direct))]
+#[cfg(not(feature = "have-direct"))]
 lazy_static! {
     pub static ref H5FD_DIRECT: hid_t = H5I_INVALID_HID;
 }

src/hl/dataset.rs

@@ -611,7 +611,7 @@ impl DatasetBuilderInner {
         self.with_dapl(|pl| pl.virtual_printf_gap(gap_size));
     }
 
-    #[cfg(all(feature = "1.10.0", have_parallel))]
+    #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
     pub fn all_coll_metadata_ops(&mut self, is_collective: bool) {
         self.with_dapl(|pl| pl.all_coll_metadata_ops(is_collective));
     }
@@ -908,11 +908,11 @@ macro_rules! impl_builder {
         }
     };
     ($(#[cfg(feature = $feature:literal)])*
-     $(#[cfg(all(feature = $feature2:literal, $feature3:ident))])*
+     $(#[cfg(all(feature = $feature2:literal, feature = $feature3:literal))])*
      $plist:ident: $name:ident($($var:ident: $ty:ty),*)) => {
         paste::paste! {
             $(#[cfg(feature = $feature )])*
-            $(#[cfg(all(feature = $feature2, $feature3))])*
+            $(#[cfg(all(feature = $feature2, feature = $feature3))])*
             #[inline] #[must_use] #[doc =
                 "\u{21b3} [`" $plist "Builder::" $name "`]"
                 "(crate::plist::" $plist "Builder::" $name ")"
@@ -947,7 +947,7 @@ macro_rules! impl_builder_methods {
         impl_builder!(#[cfg(feature = "1.10.0")] DatasetAccess: virtual_view(view: VirtualView));
         impl_builder!(#[cfg(feature = "1.10.0")] DatasetAccess: virtual_printf_gap(gap_size: usize));
         impl_builder!(
-            #[cfg(all(feature = "1.10.0", have_parallel))]
+            #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
             DatasetAccess: all_coll_metadata_ops(is_collective: bool)
         );
 

src/hl/plist/dataset_access.rs

@@ -9,7 +9,7 @@ use std::fmt::{self, Debug};
 use std::ops::Deref;
 
 use hdf5_sys::h5p::{H5Pcreate, H5Pget_chunk_cache, H5Pset_chunk_cache};
-#[cfg(all(feature = "1.10.0", have_parallel))]
+#[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
 use hdf5_sys::h5p::{H5Pget_all_coll_metadata_ops, H5Pset_all_coll_metadata_ops};
 #[cfg(feature = "1.8.17")]
 use hdf5_sys::h5p::{H5Pget_efile_prefix, H5Pset_efile_prefix};
@@ -62,7 +62,7 @@ impl Debug for DatasetAccess {
             formatter.field("virtual_view", &self.virtual_view());
             formatter.field("virtual_printf_gap", &self.virtual_printf_gap());
         }
-        #[cfg(all(feature = "1.10.0", have_parallel))]
+        #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
         formatter.field("all_coll_metadata_ops", &self.all_coll_metadata_ops());
         formatter.finish()
     }
@@ -134,7 +134,7 @@ pub struct DatasetAccessBuilder {
     virtual_view: Option<VirtualView>,
     #[cfg(feature = "1.10.0")]
     virtual_printf_gap: Option<usize>,
-    #[cfg(all(feature = "1.10.0", have_parallel))]
+    #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
     all_coll_metadata_ops: Option<bool>,
 }
 
@@ -159,7 +159,7 @@ impl DatasetAccessBuilder {
             builder.virtual_view(plist.get_virtual_view()?);
             builder.virtual_printf_gap(plist.get_virtual_printf_gap()?);
         }
-        #[cfg(all(feature = "1.10.0", have_parallel))]
+        #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
         builder.all_coll_metadata_ops(plist.get_all_coll_metadata_ops()?);
         Ok(builder)
     }
@@ -187,7 +187,7 @@ impl DatasetAccessBuilder {
         self
     }
 
-    #[cfg(all(feature = "1.10.0", have_parallel))]
+    #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
     pub fn all_coll_metadata_ops(&mut self, is_collective: bool) -> &mut Self {
         self.all_coll_metadata_ops = Some(is_collective);
         self
@@ -213,7 +213,7 @@ impl DatasetAccessBuilder {
                 h5try!(H5Pset_virtual_printf_gap(id, v as _));
             }
         }
-        #[cfg(all(feature = "1.10.0", have_parallel))]
+        #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
         {
             if let Some(v) = self.all_coll_metadata_ops {
                 h5try!(H5Pset_all_coll_metadata_ops(id, v as _));
@@ -296,13 +296,13 @@ impl DatasetAccess {
         self.get_virtual_printf_gap().unwrap_or(0)
     }
 
-    #[cfg(all(feature = "1.10.0", have_parallel))]
+    #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
     #[doc(hidden)]
     pub fn get_all_coll_metadata_ops(&self) -> Result<bool> {
         h5get!(H5Pget_all_coll_metadata_ops(self.id()): hbool_t).map(|x| x > 0)
     }
 
-    #[cfg(all(feature = "1.10.0", have_parallel))]
+    #[cfg(all(feature = "1.10.0", feature = "have-parallel"))]
     pub fn all_coll_metadata_ops(&self) -> bool {
         self.get_all_coll_metadata_ops().unwrap_or(false)
     }