Clippy

.github/workflows/ci.yml

@@ -218,11 +218,11 @@ jobs:
             DL_PATH=hdf5-1.12.0-Std-win10_64-vs16.zip
             echo "MSI_PATH=hdf\\HDF5-1.12.0-win64.msi" >> $GITHUB_ENV
           else
-            VERSION=1.13.0
-            DL_PATH=windows/hdf5-1.13.0-Std-win10_64-vs16.zip
-            echo "MSI_PATH=hdf\\HDF5-1.13.0-win64.msi" >> $GITHUB_ENV
+            VERSION=1.13.2
+            DL_PATH=windows/hdf5-1.13.2-Std-win10_64-vs16.zip
+            echo "MSI_PATH=hdf\\HDF5-1.13.2-win64.msi" >> $GITHUB_ENV
           fi
-          BASE_URL=https://support.hdfgroup.org/ftp/HDF5/prev-releases
+          BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
           echo "DL_URL=$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH" >> $GITHUB_ENV
           echo "C:\\Program Files\\HDF_Group\\HDF5\\$VERSION\\bin" >> $GITHUB_PATH
       - name: Install HDF5 (${{matrix.version}})
@@ -245,7 +245,7 @@ jobs:
         with: {submodules: true}
       - name: Install Rust
         uses: actions-rs/toolchain@v1
-        with: {toolchain: 1.51, profile: minimal, override: true}
+        with: {toolchain: 1.54, profile: minimal, override: true}
       - name: Build and test all crates
         run:
           cargo test --workspace -vv --features=hdf5-sys/static --exclude=hdf5-derive

CHANGELOG.md

@@ -12,6 +12,7 @@
 ### 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.
 
 ### Fixed
 

hdf5-src/build.rs

@@ -41,7 +41,7 @@ fn main() {
         let zlib_lib = "z";
         cfg.define("HDF5_ENABLE_Z_LIB_SUPPORT", "ON")
             .define("H5_ZLIB_HEADER", &zlib_header)
-            .define("ZLIB_STATIC_LIBRARY", &zlib_lib);
+            .define("ZLIB_STATIC_LIBRARY", zlib_lib);
         println!("cargo:zlib_header={}", zlib_header.to_str().unwrap());
         println!("cargo:zlib={}", zlib_lib);
     }

hdf5-sys/build.rs

@@ -565,7 +565,7 @@ impl LibrarySearcher {
                     }
                 }
             }
-            let header = Header::parse(&inc_dir);
+            let header = Header::parse(inc_dir);
             if let Some(version) = self.version {
                 assert_eq!(header.version, version, "HDF5 header version mismatch",);
             }

hdf5-sys/src/h5.rs

@@ -27,7 +27,7 @@ pub type hbool_t = u8;
 pub type hbool_t = c_uint;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5_iter_order_t {
     H5_ITER_UNKNOWN = -1,
     H5_ITER_INC = 0,
@@ -37,7 +37,7 @@ pub enum H5_iter_order_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5_index_t {
     H5_INDEX_UNKNOWN = -1,
     H5_INDEX_NAME = 0,

hdf5-sys/src/h5c.rs

@@ -4,21 +4,21 @@ pub use self::H5C_cache_flash_incr_mode::*;
 pub use self::H5C_cache_incr_mode::*;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5C_cache_incr_mode {
     H5C_incr__off = 0,
     H5C_incr__threshold = 1,
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5C_cache_flash_incr_mode {
     H5C_flash_incr__off = 0,
     H5C_flash_incr__add_space = 1,
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5C_cache_decr_mode {
     H5C_decr__off = 0,
     H5C_decr__threshold = 1,

hdf5-sys/src/h5d.rs

@@ -18,7 +18,7 @@ pub const H5D_CHUNK_CACHE_W0_DEFAULT: c_float = -1.0;
 
 #[cfg(not(feature = "1.10.0"))]
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_layout_t {
     H5D_LAYOUT_ERROR = -1,
     H5D_COMPACT = 0,
@@ -39,7 +39,7 @@ pub const H5D_CHUNK_BTREE: H5D_chunk_index_t = 0;
 pub const H5D_CHUNK_IDX_BTREE: H5D_chunk_index_t = H5D_CHUNK_BTREE;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_alloc_time_t {
     H5D_ALLOC_TIME_ERROR = -1,
     H5D_ALLOC_TIME_DEFAULT = 0,
@@ -55,7 +55,7 @@ impl Default for H5D_alloc_time_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_space_status_t {
     H5D_SPACE_STATUS_ERROR = -1,
     H5D_SPACE_STATUS_NOT_ALLOCATED = 0,
@@ -64,7 +64,7 @@ pub enum H5D_space_status_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_fill_time_t {
     H5D_FILL_TIME_ERROR = -1,
     H5D_FILL_TIME_ALLOC = 0,
@@ -79,7 +79,7 @@ impl Default for H5D_fill_time_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_fill_value_t {
     H5D_FILL_VALUE_ERROR = -1,
     H5D_FILL_VALUE_UNDEFINED = 0,
@@ -94,15 +94,15 @@ impl Default for H5D_fill_value_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_mpio_actual_chunk_opt_mode_t {
     H5D_MPIO_NO_CHUNK_OPTIMIZATION = 0,
     H5D_MPIO_LINK_CHUNK = 1,
     H5D_MPIO_MULTI_CHUNK = 2,
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_mpio_actual_io_mode_t {
     H5D_MPIO_NO_COLLECTIVE = 0,
     H5D_MPIO_CHUNK_INDEPENDENT = 1,
@@ -112,7 +112,7 @@ pub enum H5D_mpio_actual_io_mode_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5D_mpio_no_collective_cause_t {
     H5D_MPIO_COLLECTIVE = 0,
     H5D_MPIO_SET_INDEPENDENT = 1,
@@ -218,7 +218,7 @@ mod hdf5_1_10_0 {
     use super::*;
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
     pub enum H5D_layout_t {
         H5D_LAYOUT_ERROR = -1,
         H5D_COMPACT = 0,
@@ -229,7 +229,7 @@ mod hdf5_1_10_0 {
     }
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
     pub enum H5D_vds_view_t {
         H5D_VDS_ERROR = -1,
         H5D_VDS_FIRST_MISSING = 0,

hdf5-sys/src/h5e.rs

@@ -14,7 +14,7 @@ use crate::internal_prelude::*;
 pub const H5E_DEFAULT: hid_t = 0;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5E_type_t {
     H5E_MAJOR = 0,
     H5E_MINOR = 1,
@@ -54,7 +54,7 @@ impl Default for H5E_error2_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5E_direction_t {
     H5E_WALK_UPWARD = 0,
     H5E_WALK_DOWNWARD = 1,

hdf5-sys/src/h5f.rs

@@ -47,14 +47,14 @@ pub const H5F_MPIO_DEBUG_KEY: &str = "H5F_mpio_debug_key";
 pub const H5F_UNLIMITED: hsize_t = !0;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5F_scope_t {
     H5F_SCOPE_LOCAL = 0,
     H5F_SCOPE_GLOBAL = 1,
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5F_close_degree_t {
     H5F_CLOSE_DEFAULT = 0,
     H5F_CLOSE_WEAK = 1,
@@ -97,7 +97,7 @@ impl Default for H5F_info1_t__sohm {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5F_mem_t {
     H5FD_MEM_NOLIST = -1,
     H5FD_MEM_DEFAULT = 0,
@@ -112,15 +112,15 @@ pub enum H5F_mem_t {
 
 #[cfg(not(feature = "1.10.2"))]
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5F_libver_t {
     H5F_LIBVER_EARLIEST = 0,
     H5F_LIBVER_LATEST = 1,
 }
 
 #[cfg(feature = "1.10.2")]
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5F_libver_t {
     H5F_LIBVER_ERROR = -1,
     H5F_LIBVER_EARLIEST = 0,
@@ -297,7 +297,7 @@ mod hdf5_1_10_0 {
         Option<unsafe extern "C" fn(object_id: hid_t, udata: *mut c_void) -> herr_t>;
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
     pub enum H5F_file_space_type_t {
         H5F_FILE_SPACE_DEFAULT = 0,
         H5F_FILE_SPACE_ALL_PERSIST = 1,
@@ -341,7 +341,7 @@ mod hdf5_1_10_1 {
     use super::*;
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
     pub enum H5F_fspace_strategy_t {
         H5F_FSPACE_STRATEGY_FSM_AGGR = 0,
         H5F_FSPACE_STRATEGY_PAGE = 1,

hdf5-sys/src/h5fd.rs

@@ -269,7 +269,7 @@ impl Default for H5FD_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5FD_file_image_op_t {
     H5FD_FILE_IMAGE_OP_NO_OP = 0,
     H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET = 1,

hdf5-sys/src/h5g.rs

@@ -26,7 +26,7 @@ pub const fn H5G_USERTYPE(X: c_uint) -> c_uint {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5G_storage_type_t {
     H5G_STORAGE_TYPE_UNKNOWN = -1,
     H5G_STORAGE_TYPE_SYMBOL_TABLE = 0,

hdf5-sys/src/h5i.rs

@@ -4,7 +4,7 @@ pub use self::H5I_type_t::*;
 use crate::internal_prelude::*;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5I_type_t {
     H5I_UNINIT = -2,
     H5I_BADID = -1,

hdf5-sys/src/h5l.rs

@@ -14,7 +14,7 @@ pub const H5L_SAME_LOC: hid_t = 0;
 pub const H5L_LINK_CLASS_T_VERS: c_uint = 0;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5L_type_t {
     H5L_TYPE_ERROR = -1,
     H5L_TYPE_HARD = 0,

hdf5-sys/src/h5o.rs

@@ -82,7 +82,7 @@ pub const H5O_NATIVE_INFO_META_SIZE: c_uint = 0x0010;
 pub const H5O_NATIVE_INFO_ALL: c_uint = H5O_NATIVE_INFO_HDR | H5O_NATIVE_INFO_META_SIZE;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5O_type_t {
     H5O_TYPE_UNKNOWN = -1,
     H5O_TYPE_GROUP,
@@ -195,7 +195,7 @@ pub type H5O_iterate2_t = Option<
 >;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5O_mcdt_search_ret_t {
     H5O_MCDT_SEARCH_ERROR = -1,
     H5O_MCDT_SEARCH_CONT = 0,

hdf5-sys/src/h5pl.rs

@@ -6,7 +6,7 @@ mod hdf5_1_8_15 {
     use super::*;
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
     pub enum H5PL_type_t {
         H5PL_TYPE_ERROR = -1,
         H5PL_TYPE_FILTER = 0,

hdf5-sys/src/h5r.rs

@@ -11,7 +11,7 @@ use crate::h5g::H5G_obj_t;
 use crate::h5o::H5O_type_t;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 #[cfg(not(feature = "1.12.0"))]
 pub enum H5R_type_t {
     H5R_BADTYPE = -1,
@@ -21,7 +21,7 @@ pub enum H5R_type_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 #[cfg(feature = "1.12.0")]
 pub enum H5R_type_t {
     H5R_BADTYPE = -1,

hdf5-sys/src/h5s.rs

@@ -19,7 +19,7 @@ pub const H5S_SEL_ITER_GET_SEQ_LIST_SORTED: c_uint = 0x0001;
 pub const H5S_SEL_ITER_SHARE_WITH_DATASPACE: c_uint = 0x0002;
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5S_class_t {
     H5S_NO_CLASS = -1,
     H5S_SCALAR = 0,
@@ -28,7 +28,7 @@ pub enum H5S_class_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5S_seloper_t {
     H5S_SELECT_NOOP = -1,
     H5S_SELECT_SET = 0,
@@ -43,7 +43,7 @@ pub enum H5S_seloper_t {
 }
 
 #[repr(C)]
-#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
 pub enum H5S_sel_type {
     H5S_SEL_ERROR = -1,
     H5S_SEL_NONE = 0,