Skip to content

Commit 4e987d5

Browse files
aldanoraldanor
authored
Merge pull request #220 from mulimoen/clippy
Clippy
2 parents d71b03e + d58bcb9 commit 4e987d5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+138
-134
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,11 +218,11 @@ jobs:
218218
DL_PATH=hdf5-1.12.0-Std-win10_64-vs16.zip
219219
echo "MSI_PATH=hdf\\HDF5-1.12.0-win64.msi" >> $GITHUB_ENV
220220
else
221-
VERSION=1.13.0
222-
DL_PATH=windows/hdf5-1.13.0-Std-win10_64-vs16.zip
223-
echo "MSI_PATH=hdf\\HDF5-1.13.0-win64.msi" >> $GITHUB_ENV
221+
VERSION=1.13.2
222+
DL_PATH=windows/hdf5-1.13.2-Std-win10_64-vs16.zip
223+
echo "MSI_PATH=hdf\\HDF5-1.13.2-win64.msi" >> $GITHUB_ENV
224224
fi
225-
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/prev-releases
225+
BASE_URL=https://support.hdfgroup.org/ftp/HDF5/releases
226226
echo "DL_URL=$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH" >> $GITHUB_ENV
227227
echo "C:\\Program Files\\HDF_Group\\HDF5\\$VERSION\\bin" >> $GITHUB_PATH
228228
- name: Install HDF5 (${{matrix.version}})
@@ -245,7 +245,7 @@ jobs:
245245
with: {submodules: true}
246246
- name: Install Rust
247247
uses: actions-rs/toolchain@v1
248-
with: {toolchain: 1.51, profile: minimal, override: true}
248+
with: {toolchain: 1.54, profile: minimal, override: true}
249249
- name: Build and test all crates
250250
run:
251251
cargo test --workspace -vv --features=hdf5-sys/static --exclude=hdf5-derive

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
### Changed
1313

1414
- The `H5Type` derive macro now uses `proc-macro-error` to emit error messages.
15+
- MSRV is now `1.54` following a bump in a dependency.
1516

1617
### Fixed
1718

‎hdf5-src/build.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ fn main() {
4141
let zlib_lib = "z";
4242
cfg.define("HDF5_ENABLE_Z_LIB_SUPPORT", "ON")
4343
.define("H5_ZLIB_HEADER", &zlib_header)
44-
.define("ZLIB_STATIC_LIBRARY", &zlib_lib);
44+
.define("ZLIB_STATIC_LIBRARY", zlib_lib);
4545
println!("cargo:zlib_header={}", zlib_header.to_str().unwrap());
4646
println!("cargo:zlib={}", zlib_lib);
4747
}

‎hdf5-sys/build.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ impl LibrarySearcher {
565565
}
566566
}
567567
}
568-
let header = Header::parse(&inc_dir);
568+
let header = Header::parse(inc_dir);
569569
if let Some(version) = self.version {
570570
assert_eq!(header.version, version, "HDF5 header version mismatch",);
571571
}

‎hdf5-sys/src/h5.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pub type hbool_t = u8;
2727
pub type hbool_t = c_uint;
2828

2929
#[repr(C)]
30-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
30+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
3131
pub enum H5_iter_order_t {
3232
H5_ITER_UNKNOWN = -1,
3333
H5_ITER_INC = 0,
@@ -37,7 +37,7 @@ pub enum H5_iter_order_t {
3737
}
3838

3939
#[repr(C)]
40-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
40+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
4141
pub enum H5_index_t {
4242
H5_INDEX_UNKNOWN = -1,
4343
H5_INDEX_NAME = 0,

‎hdf5-sys/src/h5c.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@ pub use self::H5C_cache_flash_incr_mode::*;
44
pub use self::H5C_cache_incr_mode::*;
55

66
#[repr(C)]
7-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
7+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
88
pub enum H5C_cache_incr_mode {
99
H5C_incr__off = 0,
1010
H5C_incr__threshold = 1,
1111
}
1212

1313
#[repr(C)]
14-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
14+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
1515
pub enum H5C_cache_flash_incr_mode {
1616
H5C_flash_incr__off = 0,
1717
H5C_flash_incr__add_space = 1,
1818
}
1919

2020
#[repr(C)]
21-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
21+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
2222
pub enum H5C_cache_decr_mode {
2323
H5C_decr__off = 0,
2424
H5C_decr__threshold = 1,

‎hdf5-sys/src/h5d.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub const H5D_CHUNK_CACHE_W0_DEFAULT: c_float = -1.0;
1818

1919
#[cfg(not(feature = "1.10.0"))]
2020
#[repr(C)]
21-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
21+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
2222
pub enum H5D_layout_t {
2323
H5D_LAYOUT_ERROR = -1,
2424
H5D_COMPACT = 0,
@@ -39,7 +39,7 @@ pub const H5D_CHUNK_BTREE: H5D_chunk_index_t = 0;
3939
pub const H5D_CHUNK_IDX_BTREE: H5D_chunk_index_t = H5D_CHUNK_BTREE;
4040

4141
#[repr(C)]
42-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
42+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
4343
pub enum H5D_alloc_time_t {
4444
H5D_ALLOC_TIME_ERROR = -1,
4545
H5D_ALLOC_TIME_DEFAULT = 0,
@@ -55,7 +55,7 @@ impl Default for H5D_alloc_time_t {
5555
}
5656

5757
#[repr(C)]
58-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
58+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
5959
pub enum H5D_space_status_t {
6060
H5D_SPACE_STATUS_ERROR = -1,
6161
H5D_SPACE_STATUS_NOT_ALLOCATED = 0,
@@ -64,7 +64,7 @@ pub enum H5D_space_status_t {
6464
}
6565

6666
#[repr(C)]
67-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
67+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
6868
pub enum H5D_fill_time_t {
6969
H5D_FILL_TIME_ERROR = -1,
7070
H5D_FILL_TIME_ALLOC = 0,
@@ -79,7 +79,7 @@ impl Default for H5D_fill_time_t {
7979
}
8080

8181
#[repr(C)]
82-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
82+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
8383
pub enum H5D_fill_value_t {
8484
H5D_FILL_VALUE_ERROR = -1,
8585
H5D_FILL_VALUE_UNDEFINED = 0,
@@ -94,15 +94,15 @@ impl Default for H5D_fill_value_t {
9494
}
9595

9696
#[repr(C)]
97-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
97+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
9898
pub enum H5D_mpio_actual_chunk_opt_mode_t {
9999
H5D_MPIO_NO_CHUNK_OPTIMIZATION = 0,
100100
H5D_MPIO_LINK_CHUNK = 1,
101101
H5D_MPIO_MULTI_CHUNK = 2,
102102
}
103103

104104
#[repr(C)]
105-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
105+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
106106
pub enum H5D_mpio_actual_io_mode_t {
107107
H5D_MPIO_NO_COLLECTIVE = 0,
108108
H5D_MPIO_CHUNK_INDEPENDENT = 1,
@@ -112,7 +112,7 @@ pub enum H5D_mpio_actual_io_mode_t {
112112
}
113113

114114
#[repr(C)]
115-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
115+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
116116
pub enum H5D_mpio_no_collective_cause_t {
117117
H5D_MPIO_COLLECTIVE = 0,
118118
H5D_MPIO_SET_INDEPENDENT = 1,
@@ -218,7 +218,7 @@ mod hdf5_1_10_0 {
218218
use super::*;
219219

220220
#[repr(C)]
221-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
221+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
222222
pub enum H5D_layout_t {
223223
H5D_LAYOUT_ERROR = -1,
224224
H5D_COMPACT = 0,
@@ -229,7 +229,7 @@ mod hdf5_1_10_0 {
229229
}
230230

231231
#[repr(C)]
232-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
232+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
233233
pub enum H5D_vds_view_t {
234234
H5D_VDS_ERROR = -1,
235235
H5D_VDS_FIRST_MISSING = 0,

‎hdf5-sys/src/h5e.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::internal_prelude::*;
1414
pub const H5E_DEFAULT: hid_t = 0;
1515

1616
#[repr(C)]
17-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
17+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
1818
pub enum H5E_type_t {
1919
H5E_MAJOR = 0,
2020
H5E_MINOR = 1,
@@ -54,7 +54,7 @@ impl Default for H5E_error2_t {
5454
}
5555

5656
#[repr(C)]
57-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
57+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
5858
pub enum H5E_direction_t {
5959
H5E_WALK_UPWARD = 0,
6060
H5E_WALK_DOWNWARD = 1,

‎hdf5-sys/src/h5f.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ pub const H5F_MPIO_DEBUG_KEY: &str = "H5F_mpio_debug_key";
4747
pub const H5F_UNLIMITED: hsize_t = !0;
4848

4949
#[repr(C)]
50-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
50+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
5151
pub enum H5F_scope_t {
5252
H5F_SCOPE_LOCAL = 0,
5353
H5F_SCOPE_GLOBAL = 1,
5454
}
5555

5656
#[repr(C)]
57-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
57+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
5858
pub enum H5F_close_degree_t {
5959
H5F_CLOSE_DEFAULT = 0,
6060
H5F_CLOSE_WEAK = 1,
@@ -97,7 +97,7 @@ impl Default for H5F_info1_t__sohm {
9797
}
9898

9999
#[repr(C)]
100-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
100+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
101101
pub enum H5F_mem_t {
102102
H5FD_MEM_NOLIST = -1,
103103
H5FD_MEM_DEFAULT = 0,
@@ -112,15 +112,15 @@ pub enum H5F_mem_t {
112112

113113
#[cfg(not(feature = "1.10.2"))]
114114
#[repr(C)]
115-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
115+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
116116
pub enum H5F_libver_t {
117117
H5F_LIBVER_EARLIEST = 0,
118118
H5F_LIBVER_LATEST = 1,
119119
}
120120

121121
#[cfg(feature = "1.10.2")]
122122
#[repr(C)]
123-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
123+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
124124
pub enum H5F_libver_t {
125125
H5F_LIBVER_ERROR = -1,
126126
H5F_LIBVER_EARLIEST = 0,
@@ -297,7 +297,7 @@ mod hdf5_1_10_0 {
297297
Option<unsafe extern "C" fn(object_id: hid_t, udata: *mut c_void) -> herr_t>;
298298

299299
#[repr(C)]
300-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
300+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
301301
pub enum H5F_file_space_type_t {
302302
H5F_FILE_SPACE_DEFAULT = 0,
303303
H5F_FILE_SPACE_ALL_PERSIST = 1,
@@ -341,7 +341,7 @@ mod hdf5_1_10_1 {
341341
use super::*;
342342

343343
#[repr(C)]
344-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
344+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
345345
pub enum H5F_fspace_strategy_t {
346346
H5F_FSPACE_STRATEGY_FSM_AGGR = 0,
347347
H5F_FSPACE_STRATEGY_PAGE = 1,

‎hdf5-sys/src/h5fd.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ impl Default for H5FD_t {
269269
}
270270

271271
#[repr(C)]
272-
#[derive(Copy, Clone, PartialEq, PartialOrd, Debug)]
272+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
273273
pub enum H5FD_file_image_op_t {
274274
H5FD_FILE_IMAGE_OP_NO_OP = 0,
275275
H5FD_FILE_IMAGE_OP_PROPERTY_LIST_SET = 1,

0 commit comments

Comments
 (0)