Remove h5_ prefix on internal features

Author: mulimoen

build.rs

@@ -3,11 +3,11 @@ use std::env;
 fn main() {
     for (key, _) in env::vars() {
         let key = match key.as_str() {
-            "DEP_HDF5_HAVE_DIRECT" => "h5_have_direct".into(),
-            "DEP_HDF5_HAVE_STDBOOL" => "h5_have_stdbool".into(),
-            "DEP_HDF5_HAVE_PARALLEL" => "h5_have_parallel".into(),
-            "DEP_HDF5_HAVE_THREADSAFE" => "h5_have_threadsafe".into(),
-            "DEP_HDF5_MSVC_DLL_INDIRECTION" => "h5_dll_indirection".into(),
+            "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(),
             key if key.starts_with("DEP_HDF5_VERSION_") => {
                 let version = key.trim_start_matches("DEP_HDF5_VERSION_");
                 format!("feature=\"{}\"", version.replace("_", "."))

src/globals.rs

@@ -4,9 +4,9 @@ use std::mem;
 
 use lazy_static::lazy_static;
 
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 use hdf5_sys::h5fd::H5FD_direct_init;
-#[cfg(h5_have_parallel)]
+#[cfg(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,
@@ -16,17 +16,17 @@ use hdf5_sys::{h5e, h5p, h5t};
 
 use crate::internal_prelude::*;
 
-#[cfg(h5_dll_indirection)]
+#[cfg(dll_indirection)]
 pub struct H5GlobalConstant(&'static usize);
-#[cfg(not(h5_dll_indirection))]
+#[cfg(not(dll_indirection))]
 pub struct H5GlobalConstant(&'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(h5_dll_indirection)] {
+            if #[cfg(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(h5_have_parallel)]
+#[cfg(have_parallel)]
 lazy_static! {
     pub static ref H5FD_MPIO: hid_t = unsafe { h5lock!(H5FD_mpio_init()) };
 }
-#[cfg(not(h5_have_parallel))]
+#[cfg(not(have_parallel))]
 lazy_static! {
     pub static ref H5FD_MPIO: hid_t = H5I_INVALID_HID;
 }
 
 // Direct VFD
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 lazy_static! {
     pub static ref H5FD_DIRECT: hid_t = unsafe { h5lock!(H5FD_direct_init()) };
 }
-#[cfg(not(h5_have_direct))]
+#[cfg(not(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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn all_coll_metadata_ops(&mut self, is_collective: bool) {
         self.with_dapl(|pl| pl.all_coll_metadata_ops(is_collective));
     }
@@ -944,7 +944,7 @@ macro_rules! impl_builder_methods {
         impl_builder!(DatasetAccess: virtual_view(view: VirtualView));
         #[cfg(feature = "1.10.0")]
         impl_builder!(DatasetAccess: virtual_printf_gap(gap_size: usize));
-        #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", have_parallel))]
         impl_builder!(DatasetAccess: all_coll_metadata_ops(is_collective: bool));
 
         impl_builder!(DatasetCreate: create/dcpl);

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", h5_have_parallel))]
+#[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn all_coll_metadata_ops(&self) -> bool {
         self.get_all_coll_metadata_ops().unwrap_or(false)
     }

src/hl/plist/file_access.rs

@@ -42,7 +42,7 @@ use hdf5_sys::h5p::{
     H5Pset_gc_references, H5Pset_mdc_config, H5Pset_meta_block_size, H5Pset_sieve_buf_size,
     H5Pset_small_data_block_size,
 };
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 use hdf5_sys::h5p::{H5Pget_fapl_direct, H5Pset_fapl_direct};
 #[cfg(feature = "mpio")]
 use hdf5_sys::h5p::{H5Pget_fapl_mpio, H5Pset_fapl_mpio};
@@ -51,7 +51,7 @@ use hdf5_sys::h5p::{H5Pget_fapl_mpio, H5Pset_fapl_mpio};
 use hdf5_sys::h5ac::{H5AC_cache_image_config_t, H5AC__CACHE_IMAGE__ENTRY_AGEOUT__NONE};
 #[cfg(feature = "1.10.2")]
 use hdf5_sys::h5f::H5F_libver_t;
-#[cfg(all(feature = "1.10.0", h5_have_parallel))]
+#[cfg(all(feature = "1.10.0", have_parallel))]
 use hdf5_sys::h5p::{
     H5Pget_all_coll_metadata_ops, H5Pget_coll_metadata_write, H5Pset_all_coll_metadata_ops,
     H5Pset_coll_metadata_write,
@@ -73,7 +73,7 @@ use hdf5_sys::h5p::{
     H5Pset_metadata_read_attempts,
 };
 
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 use crate::globals::H5FD_DIRECT;
 #[cfg(feature = "mpio")]
 use crate::globals::H5FD_MPIO;
@@ -131,9 +131,9 @@ impl Debug for FileAccess {
         formatter.field("metadata_read_attempts", &self.metadata_read_attempts());
         #[cfg(feature = "1.10.0")]
         formatter.field("mdc_log_options", &self.mdc_log_options());
-        #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", have_parallel))]
         formatter.field("all_coll_metadata_ops", &self.all_coll_metadata_ops());
-        #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", have_parallel))]
         formatter.field("coll_metadata_write", &self.coll_metadata_write());
         formatter.field("mdc_config", &self.mdc_config());
         formatter.field("driver", &self.driver());
@@ -451,15 +451,15 @@ mod mpio {
 #[cfg(feature = "mpio")]
 pub use self::mpio::*;
 
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct DirectDriver {
     pub alignment: usize,
     pub block_size: usize,
     pub cbuf_size: usize,
 }
 
-#[cfg(h5_have_direct)]
+#[cfg(have_direct)]
 impl Default for DirectDriver {
     fn default() -> Self {
         Self { alignment: 4096, block_size: 4096, cbuf_size: 16 * 1024 * 1024 }
@@ -477,7 +477,7 @@ pub enum FileDriver {
     Split(SplitDriver),
     #[cfg(feature = "mpio")]
     Mpio(MpioDriver),
-    #[cfg(h5_have_direct)]
+    #[cfg(have_direct)]
     Direct(DirectDriver),
 }
 
@@ -702,8 +702,8 @@ impl Eq for MetadataCacheConfig {}
 
 impl Default for MetadataCacheConfig {
     fn default() -> Self {
-        let min_clean_fraction = if cfg!(h5_have_parallel) { 0.3_f32 } else { 0.01_f32 };
-        let flash_multiple = if cfg!(h5_have_parallel) { 1.0_f32 } else { 1.4_f32 };
+        let min_clean_fraction = if cfg!(have_parallel) { 0.3_f32 } else { 0.01_f32 };
+        let flash_multiple = if cfg!(have_parallel) { 1.0_f32 } else { 1.4_f32 };
         Self {
             rpt_fcn_enabled: false,
             open_trace_file: false,
@@ -971,9 +971,9 @@ pub struct FileAccessBuilder {
     mdc_image_config: Option<CacheImageConfig>,
     #[cfg(feature = "1.10.0")]
     mdc_log_options: Option<CacheLogOptions>,
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     all_coll_metadata_ops: Option<bool>,
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     coll_metadata_write: Option<bool>,
     gc_references: Option<bool>,
     small_data_block_size: Option<u64>,
@@ -1023,7 +1023,7 @@ impl FileAccessBuilder {
             let v = plist.get_mdc_log_options()?;
             builder.mdc_log_options(v.is_enabled, &v.location, v.start_on_access);
         }
-        #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", have_parallel))]
         {
             builder.all_coll_metadata_ops(plist.get_all_coll_metadata_ops()?);
             builder.coll_metadata_write(plist.get_coll_metadata_write()?);
@@ -1118,13 +1118,13 @@ impl FileAccessBuilder {
         self
     }
 
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn all_coll_metadata_ops(&mut self, is_collective: bool) -> &mut Self {
         self.all_coll_metadata_ops = Some(is_collective);
         self
     }
 
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn coll_metadata_write(&mut self, is_collective: bool) -> &mut Self {
         self.coll_metadata_write = Some(is_collective);
         self
@@ -1251,14 +1251,14 @@ impl FileAccessBuilder {
         self.driver(&FileDriver::Mpio(MpioDriver::try_new(comm, info).unwrap()))
     }
 
-    #[cfg(h5_have_direct)]
+    #[cfg(have_direct)]
     pub fn direct_options(
         &mut self, alignment: usize, block_size: usize, cbuf_size: usize,
     ) -> &mut Self {
         self.driver(&FileDriver::Direct(DirectDriver { alignment, block_size, cbuf_size }))
     }
 
-    #[cfg(h5_have_direct)]
+    #[cfg(have_direct)]
     pub fn direct(&mut self) -> &mut Self {
         self.driver(&FileDriver::Direct(DirectDriver::default()))
     }
@@ -1360,7 +1360,7 @@ impl FileAccessBuilder {
         Ok(())
     }
 
-    #[cfg(h5_have_direct)]
+    #[cfg(have_direct)]
     fn set_direct(id: hid_t, drv: &DirectDriver) -> Result<()> {
         h5try!(H5Pset_fapl_direct(id, drv.alignment as _, drv.block_size as _, drv.cbuf_size as _));
         Ok(())
@@ -1393,7 +1393,7 @@ impl FileAccessBuilder {
             FileDriver::Mpio(drv) => {
                 Self::set_mpio(id, drv)?;
             }
-            #[cfg(h5_have_direct)]
+            #[cfg(have_direct)]
             FileDriver::Direct(drv) => {
                 Self::set_direct(id, drv)?;
             }
@@ -1472,7 +1472,7 @@ impl FileAccessBuilder {
                 ));
             }
         }
-        #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+        #[cfg(all(feature = "1.10.0", have_parallel))]
         {
             if let Some(v) = self.all_coll_metadata_ops {
                 h5try!(H5Pset_all_coll_metadata_ops(id, v as _));
@@ -1593,7 +1593,7 @@ impl FileAccess {
     }
 
     #[doc(hidden)]
-    #[cfg(h5_have_direct)]
+    #[cfg(have_direct)]
     fn get_direct(&self) -> Result<DirectDriver> {
         let res = h5get!(H5Pget_fapl_direct(self.id()): size_t, size_t, size_t)?;
         Ok(DirectDriver { alignment: res.0 as _, block_size: res.1 as _, cbuf_size: res.2 as _ })
@@ -1608,7 +1608,7 @@ impl FileAccess {
                 return self.get_mpio().map(FileDriver::Mpio);
             }
         }
-        #[cfg(h5_have_direct)]
+        #[cfg(have_direct)]
         {
             if drv_id == *H5FD_DIRECT {
                 return self.get_direct().map(FileDriver::Direct);
@@ -1797,24 +1797,24 @@ impl FileAccess {
         self.get_mdc_log_options().ok().unwrap_or_default()
     }
 
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", 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", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn all_coll_metadata_ops(&self) -> bool {
         self.get_all_coll_metadata_ops().unwrap_or(false)
     }
 
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     #[doc(hidden)]
     pub fn get_coll_metadata_write(&self) -> Result<bool> {
         h5get!(H5Pget_coll_metadata_write(self.id()): hbool_t).map(|x| x > 0)
     }
 
-    #[cfg(all(feature = "1.10.0", h5_have_parallel))]
+    #[cfg(all(feature = "1.10.0", have_parallel))]
     pub fn coll_metadata_write(&self) -> bool {
         self.get_coll_metadata_write().unwrap_or(false)
     }

src/lib.rs

@@ -27,7 +27,7 @@
 // RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --features blosc,lzf
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
-#[cfg(all(feature = "mpio", not(h5_have_parallel)))]
+#[cfg(all(feature = "mpio", not(have_parallel)))]
 compile_error!("Enabling \"mpio\" feature requires HDF5 library built with MPI support");
 
 mod export {
@@ -175,7 +175,7 @@ pub fn is_library_threadsafe() -> bool {
     }
     #[cfg(not(feature = "1.8.16"))]
     {
-        cfg!(h5_have_threadsafe)
+        cfg!(have_threadsafe)
     }
 }