Replace hdf5_1_2_3 cfg flags with feature="1.2.3"

Author: aldanor

build.rs

@@ -10,7 +10,7 @@ fn main() {
             "DEP_HDF5_MSVC_DLL_INDIRECTION" => "h5_dll_indirection".into(),
             key if key.starts_with("DEP_HDF5_VERSION_") => {
                 let version = key.trim_start_matches("DEP_HDF5_VERSION_");
-                format!("hdf5_{}", version)
+                format!("feature=\"{}\"", version.replace("_", "."))
             }
             _ => continue,
         };

hdf5-sys/build.rs

@@ -616,7 +616,7 @@ impl Config {
         vs.extend((0..=7).map(|v| Version::new(1, 10, v))); // 1.10.[0-7]
         vs.push(Version::new(1, 12, 0)); // 1.12.0
         for v in vs.into_iter().filter(|&v| version >= v) {
-            println!("cargo:rustc-cfg=hdf5_{}_{}_{}", v.major, v.minor, v.micro);
+            println!("cargo:rustc-cfg=feature=\"{}.{}.{}\"", v.major, v.minor, v.micro);
             println!("cargo:version_{}_{}_{}=1", v.major, v.minor, v.micro);
         }
         if self.header.have_stdbool_h {

hdf5-sys/src/h5.rs

@@ -12,9 +12,9 @@ pub type hsize_t = c_ulonglong;
 pub type hssize_t = c_longlong;
 pub type haddr_t = uint64_t;
 
-#[cfg(all(hdf5_1_10_0, h5_have_stdbool_h))]
+#[cfg(all(feature = "1.10.0", h5_have_stdbool_h))]
 pub type hbool_t = u8;
-#[cfg(any(not(hdf5_1_10_0), not(h5_have_stdbool_h)))]
+#[cfg(any(not(feature = "1.10.0"), not(h5_have_stdbool_h)))]
 pub type hbool_t = c_uint;
 
 #[repr(C)]
@@ -71,23 +71,23 @@ extern "C" {
     pub fn H5check_version(majnum: c_uint, minnum: c_uint, relnum: c_uint) -> herr_t;
 }
 
-#[cfg(hdf5_1_8_13)]
+#[cfg(feature = "1.8.13")]
 extern "C" {
     pub fn H5free_memory(mem: *mut c_void) -> herr_t;
 }
 
-#[cfg(hdf5_1_8_15)]
+#[cfg(feature = "1.8.15")]
 extern "C" {
     pub fn H5allocate_memory(size: size_t, clear: hbool_t) -> *mut c_void;
     pub fn H5resize_memory(mem: *mut c_void, size: size_t) -> *mut c_void;
 }
 
-#[cfg(hdf5_1_8_16)]
+#[cfg(feature = "1.8.16")]
 extern "C" {
     pub fn H5is_library_threadsafe(is_ts: *mut hbool_t) -> herr_t;
 }
 
-#[cfg(all(hdf5_1_10_7, not(hdf5_1_12_0)))]
+#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
 #[repr(C)]
 pub struct H5_alloc_stats_t {
     total_alloc_bytes: c_ulonglong,
@@ -99,7 +99,7 @@ pub struct H5_alloc_stats_t {
     peak_alloc_blocks_count: size_t,
 }
 
-#[cfg(all(hdf5_1_10_7, not(hdf5_1_12_0)))]
+#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
 extern "C" {
     pub fn H5get_alloc_stats(stats: *mut H5_alloc_stats_t) -> herr_t;
     pub fn H5get_free_list_sizes(

hdf5-sys/src/h5ac.rs

@@ -45,9 +45,9 @@ pub struct H5AC_cache_config_t {
     pub epochs_before_eviction: c_int,
     pub apply_empty_reserve: hbool_t,
     pub empty_reserve: c_double,
-    #[cfg(not(hdf5_1_10_0))]
+    #[cfg(not(feature = "1.10.0"))]
     pub dirty_bytes_threshold: c_int,
-    #[cfg(hdf5_1_10_0)]
+    #[cfg(feature = "1.10.0")]
     pub dirty_bytes_threshold: size_t,
     pub metadata_write_strategy: c_int,
 }
@@ -58,7 +58,7 @@ impl Default for H5AC_cache_config_t {
     }
 }
 
-#[cfg(hdf5_1_10_1)]
+#[cfg(feature = "1.10.1")]
 mod hdf5_1_10_1 {
     use super::*;
 
@@ -78,5 +78,5 @@ mod hdf5_1_10_1 {
     }
 }
 
-#[cfg(hdf5_1_10_1)]
+#[cfg(feature = "1.10.1")]
 pub use self::hdf5_1_10_1::*;

hdf5-sys/src/h5d.rs

@@ -16,7 +16,7 @@ pub const H5D_CHUNK_CACHE_NBYTES_DEFAULT: size_t = !0;
 
 pub const H5D_CHUNK_CACHE_W0_DEFAULT: c_float = -1.0;
 
-#[cfg(not(hdf5_1_10_0))]
+#[cfg(not(feature = "1.10.0"))]
 #[repr(C)]
 #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
 pub enum H5D_layout_t {
@@ -134,15 +134,15 @@ pub type H5D_operator_t = Option<
     ) -> herr_t,
 >;
 
-#[cfg(hdf5_1_8_11)]
+#[cfg(feature = "1.8.11")]
 pub type H5D_scatter_func_t = Option<
     extern "C" fn(
         src_buf: *mut *const c_void,
         src_buf_bytes_used: *mut size_t,
         op_data: *mut c_void,
     ) -> herr_t,
 >;
-#[cfg(hdf5_1_8_11)]
+#[cfg(feature = "1.8.11")]
 pub type H5D_gather_func_t = Option<
     extern "C" fn(
         dst_buf: *const c_void,
@@ -180,7 +180,7 @@ extern "C" {
         buf: *mut c_void, type_id: hid_t, space_id: hid_t, op: H5D_operator_t,
         operator_data: *mut c_void,
     ) -> herr_t;
-    #[cfg_attr(hdf5_1_12_0, deprecated(note = "deprecated in HDF5 1.12.0, use H5Treclaim"))]
+    #[cfg_attr(feature = "1.12.0", deprecated(note = "deprecated in HDF5 1.12.0, use H5Treclaim"))]
     pub fn H5Dvlen_reclaim(
         type_id: hid_t, space_id: hid_t, plist_id: hid_t, buf: *mut c_void,
     ) -> herr_t;
@@ -201,7 +201,7 @@ extern "C" {
     pub fn H5Dopen1(file_id: hid_t, name: *const c_char) -> hid_t;
 }
 
-#[cfg(hdf5_1_8_11)]
+#[cfg(feature = "1.8.11")]
 extern "C" {
     pub fn H5Dscatter(
         op: H5D_scatter_func_t, op_data: *mut c_void, type_id: hid_t, dst_space_id: hid_t,
@@ -213,7 +213,7 @@ extern "C" {
     ) -> herr_t;
 }
 
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 mod hdf5_1_10_0 {
     use super::*;
 
@@ -260,10 +260,10 @@ mod hdf5_1_10_0 {
     }
 }
 
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 pub use self::hdf5_1_10_0::*;
 
-#[cfg(hdf5_1_10_3)]
+#[cfg(feature = "1.10.3")]
 extern "C" {
     pub fn H5Dread_chunk(
         dset_id: hid_t, dxpl_id: hid_t, offset: *const hsize_t, filters: *mut u32, buf: *mut c_void,
@@ -274,7 +274,7 @@ extern "C" {
     ) -> herr_t;
 }
 
-#[cfg(hdf5_1_10_5)]
+#[cfg(feature = "1.10.5")]
 extern "C" {
     pub fn H5Dget_chunk_info(
         dset_id: hid_t, fspace_id: hid_t, index: hsize_t, offset: *mut hsize_t,

hdf5-sys/src/h5f.rs

@@ -5,11 +5,11 @@ pub use self::H5F_close_degree_t::*;
 pub use self::H5F_libver_t::*;
 pub use self::H5F_mem_t::*;
 pub use self::H5F_scope_t::*;
-#[cfg(not(hdf5_1_10_0))]
+#[cfg(not(feature = "1.10.0"))]
 pub use {
     H5F_info1_t as H5F_info_t, H5F_info1_t__sohm as H5F_info_t__sohm, H5Fget_info1 as H5Fget_info,
 };
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 pub use {
     H5F_info2_t as H5F_info_t, H5F_info2_t__free as H5F_info_t__free,
     H5F_info2_t__sohm as H5F_info_t__sohm, H5F_info2_t__super as H5F_info_t__super,
@@ -20,7 +20,7 @@ use crate::internal_prelude::*;
 
 use crate::h5ac::H5AC_cache_config_t;
 
-#[cfg_attr(hdf5_1_10_0, deprecated(note = "deprecated in HDF5 1.10.0"))]
+#[cfg_attr(feature = "1.10.0", deprecated(note = "deprecated in HDF5 1.10.0"))]
 pub const H5F_ACC_DEBUG: c_uint = 0x0000;
 
 /* these flags call H5check() in the C library */
@@ -68,7 +68,7 @@ impl Default for H5F_close_degree_t {
     }
 }
 
-#[cfg_attr(hdf5_1_10_0, deprecated(note = "deprecated in HDF5 1.10.0, use H5F_info2_t"))]
+#[cfg_attr(feature = "1.10.0", deprecated(note = "deprecated in HDF5 1.10.0, use H5F_info2_t"))]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct H5F_info1_t {
@@ -82,7 +82,7 @@ impl Default for H5F_info1_t {
     }
 }
 
-#[cfg_attr(hdf5_1_10_0, deprecated(note = "deprecated in HDF5 1.10.0, use H5F_info2_t"))]
+#[cfg_attr(feature = "1.10.0", deprecated(note = "deprecated in HDF5 1.10.0, use H5F_info2_t"))]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct H5F_info1_t__sohm {
@@ -110,15 +110,15 @@ pub enum H5F_mem_t {
     H5FD_MEM_NTYPES = 7,
 }
 
-#[cfg(not(hdf5_1_10_2))]
+#[cfg(not(feature = "1.10.2"))]
 #[repr(C)]
 #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
 pub enum H5F_libver_t {
     H5F_LIBVER_EARLIEST = 0,
     H5F_LIBVER_LATEST = 1,
 }
 
-#[cfg(hdf5_1_10_2)]
+#[cfg(feature = "1.10.2")]
 #[repr(C)]
 #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
 pub enum H5F_libver_t {
@@ -129,7 +129,7 @@ pub enum H5F_libver_t {
     H5F_LIBVER_NBOUNDS = 3,
 }
 
-#[cfg(hdf5_1_10_2)]
+#[cfg(feature = "1.10.2")]
 pub const H5F_LIBVER_LATEST: H5F_libver_t = H5F_LIBVER_V110;
 
 impl Default for H5F_libver_t {
@@ -145,7 +145,7 @@ extern "C" {
     )]
     pub fn H5Fset_latest_format(file_id: hid_t, latest_format: hbool_t) -> herr_t;
     pub fn H5Fis_hdf5(filename: *const c_char) -> htri_t;
-    #[cfg(hdf5_1_12_0)]
+    #[cfg(feature = "1.12.0")]
     pub fn H5Fis_accessible(container_name: *const c_char, fapl_id: hid_t) -> htri_t;
     pub fn H5Fcreate(
         filename: *const c_char, flags: c_uint, create_plist: hid_t, access_plist: hid_t,
@@ -154,12 +154,12 @@ extern "C" {
     pub fn H5Freopen(file_id: hid_t) -> hid_t;
     pub fn H5Fflush(object_id: hid_t, scope: H5F_scope_t) -> herr_t;
     pub fn H5Fclose(file_id: hid_t) -> herr_t;
-    #[cfg(hdf5_1_12_0)]
+    #[cfg(feature = "1.12.0")]
     pub fn H5Fdelete(filename: *const c_char, fapl_id: hid_t) -> herr_t;
     pub fn H5Fget_create_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_access_plist(file_id: hid_t) -> hid_t;
     pub fn H5Fget_intent(file_id: hid_t, intent: *mut c_uint) -> herr_t;
-    #[cfg(hdf5_1_12_0)]
+    #[cfg(feature = "1.12.0")]
     pub fn H5Fget_fileno(file_id: hid_t, fileno: *mut c_ulong) -> herr_t;
     pub fn H5Fget_obj_count(file_id: hid_t, types: c_uint) -> ssize_t;
     pub fn H5Fget_obj_ids(
@@ -181,23 +181,23 @@ extern "C" {
     pub fn H5Fget_name(obj_id: hid_t, name: *mut c_char, size: size_t) -> ssize_t;
 }
 
-#[cfg(hdf5_1_8_7)]
+#[cfg(feature = "1.8.7")]
 extern "C" {
     pub fn H5Fclear_elink_file_cache(file_id: hid_t) -> herr_t;
 }
 
-#[cfg(hdf5_1_8_9)]
+#[cfg(feature = "1.8.9")]
 extern "C" {
     pub fn H5Fget_file_image(file_id: hid_t, buf_ptr: *mut c_void, buf_len: size_t) -> ssize_t;
 }
 
-#[cfg(all(hdf5_1_8_9, h5_have_parallel))]
+#[cfg(all(feature = "1.8.9", h5_have_parallel))]
 extern "C" {
     pub fn H5Fset_mpi_atomicity(file_id: hid_t, flag: hbool_t) -> herr_t;
     pub fn H5Fget_mpi_atomicity(file_id: hid_t, flag: *mut hbool_t) -> herr_t;
 }
 
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 mod hdf5_1_10_0 {
     use super::*;
 
@@ -318,15 +318,18 @@ mod hdf5_1_10_0 {
 }
 
 extern "C" {
-    #[cfg_attr(hdf5_1_10_0, deprecated(note = "deprecated in HDF5 1.10.0, use H5Fget_info2"))]
-    #[cfg_attr(not(hdf5_1_10_0), link_name = "H5Fget_info")]
+    #[cfg_attr(
+        feature = "1.10.0",
+        deprecated(note = "deprecated in HDF5 1.10.0, use H5Fget_info2")
+    )]
+    #[cfg_attr(not(feature = "1.10.0"), link_name = "H5Fget_info")]
     pub fn H5Fget_info1(obj_id: hid_t, finfo: *mut H5F_info1_t) -> herr_t;
 }
 
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 pub use self::hdf5_1_10_0::*;
 
-#[cfg(hdf5_1_10_1)]
+#[cfg(feature = "1.10.1")]
 mod hdf5_1_10_1 {
     use super::*;
 
@@ -360,10 +363,10 @@ mod hdf5_1_10_1 {
     }
 }
 
-#[cfg(hdf5_1_10_1)]
+#[cfg(feature = "1.10.1")]
 pub use self::hdf5_1_10_1::*;
 
-#[cfg(hdf5_1_10_5)]
+#[cfg(feature = "1.10.5")]
 extern "C" {
     pub fn H5Fget_dset_no_attrs_hint(file_id: hid_t, minimize: *mut hbool_t) -> herr_t;
     pub fn H5Fset_dset_no_attrs_hint(file_id: hid_t, minimize: hbool_t) -> herr_t;

hdf5-sys/src/h5fd.rs

@@ -67,7 +67,7 @@ pub const H5FD_FEAT_DIRTY_SBLK_LOAD: c_uint = 0x00000040;
 pub const H5FD_FEAT_POSIX_COMPAT_HANDLE: c_uint = 0x00000080;
 pub const H5FD_FEAT_ALLOW_FILE_IMAGE: c_uint = 0x00000400;
 pub const H5FD_FEAT_CAN_USE_FILE_IMAGE_CALLBACKS: c_uint = 0x00000800;
-#[cfg(hdf5_1_10_2)]
+#[cfg(feature = "1.10.2")]
 pub const H5FD_FEAT_DEFAULT_VFD_COMPATIBLE: c_uint = 0x00008000;
 
 /* Flags for H5Pset_fapl_log() */
@@ -262,7 +262,7 @@ pub enum H5FD_file_image_op_t {
     H5FD_FILE_IMAGE_OP_FILE_CLOSE = 7,
 }
 
-#[cfg(hdf5_1_8_9)]
+#[cfg(feature = "1.8.9")]
 #[repr(C)]
 #[derive(Debug, Copy, Clone)]
 pub struct H5FD_file_image_callbacks_t {
@@ -302,7 +302,7 @@ pub struct H5FD_file_image_callbacks_t {
     pub udata: *mut c_void,
 }
 
-#[cfg(hdf5_1_8_9)]
+#[cfg(feature = "1.8.9")]
 impl Default for H5FD_file_image_callbacks_t {
     fn default() -> Self {
         unsafe { mem::zeroed() }
@@ -362,13 +362,13 @@ extern "C" {
     pub fn H5FD_direct_init() -> hid_t;
 }
 
-#[cfg(hdf5_1_10_0)]
+#[cfg(feature = "1.10.0")]
 extern "C" {
     pub fn H5FDlock(file: *mut H5FD_t, rw: hbool_t) -> herr_t;
     pub fn H5FDunlock(file: *mut H5FD_t) -> herr_t;
 }
 
-#[cfg(hdf5_1_10_6)]
+#[cfg(feature = "1.10.6")]
 pub mod hdfs {
     use super::*;
     pub const H5FD__CURR_HDFS_FAPL_T_VERSION: c_uint = 1;
@@ -393,7 +393,7 @@ pub mod hdfs {
     }
 }
 
-#[cfg(hdf5_1_10_6)]
+#[cfg(feature = "1.10.6")]
 pub mod ros3 {
     use super::*;
     pub const H5FD_CURR_ROS3_FAPL_T_VERSION: c_uint = 1;
@@ -417,7 +417,7 @@ pub mod ros3 {
     }
 }
 
-#[cfg(all(hdf5_1_10_7, not(hdf5_1_12_0)))]
+#[cfg(all(feature = "1.10.7", not(feature = "1.12.0")))]
 pub mod splitter {
     use super::*;
 
@@ -447,7 +447,7 @@ pub mod splitter {
     }
 }
 
-#[cfg(hdf5_1_10_2)]
+#[cfg(feature = "1.10.2")]
 extern "C" {
     pub fn H5FDdriver_query(driver_id: hid_t, flags: *mut c_ulong) -> herr_t;
 }