Skip to content

Commit 29df194

Browse files
rytheorytheo
authored
Merge branch 'aldanor:master' into add-docs
2 parents e3fd8c6 + 0299592 commit 29df194

23 files changed

+180
-99
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ jobs:
273273
with: {submodules: true}
274274
- name: Install Rust
275275
uses: dtolnay/rust-toolchain@stable
276-
with: {toolchain: 1.64}
276+
with: {toolchain: "1.70"}
277277
- name: Build and test all crates
278278
run:
279279
cargo test --workspace -vv --features=hdf5-sys/static,hdf5-sys/zlib --exclude=hdf5-derive

‎CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
### Changed
1717

1818
- The `H5Type` derive macro now uses `proc-macro-error` to emit error messages.
19-
- MSRV is now `1.64.0` and Rust edition has now been bumped to 2021.
19+
- MSRV is now `1.70.0` and Rust edition has now been bumped to 2021.
2020
- Types in ChunkInfo has been changed to match HDF5.
2121
- Dependencies now uses the `dep:` syntax and are only enabled through features.
2222
- Some features are made weak and will not enable e.g. static build when asking for a
@@ -35,6 +35,7 @@
3535
- Applying filters without chunking will now produce an explicit error.
3636
- Fixed a bug where chunking could not be enabled for zero-sized extents.
3737
- Fixed library finding on Windows with MSYS2-distributed MinGW HDF5.
38+
- Fixed a bug which made parallel builds unusable.
3839

3940
## 0.8.1
4041

‎hdf5-sys/src/h5.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ extern "C" {
117117
}
118118

119119
#[cfg(feature = "1.14.0")]
120-
type H5_atclose_func_t = Option<extern "C" fn(ctx: *mut c_void)>;
120+
type H5_atclose_func_t = Option<unsafe extern "C" fn(ctx: *mut c_void)>;
121121

122122
#[cfg(feature = "1.14.0")]
123123
extern "C" {

‎hdf5-sys/src/h5a.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ impl Default for H5A_info_t {
2626

2727
#[deprecated(note = "deprecated in HDF5 1.8.0, use H5A_operator2_t")]
2828
pub type H5A_operator1_t = Option<
29-
extern "C" fn(
29+
unsafe extern "C" fn(
3030
location_id: hid_t,
3131
attr_name: *const c_char,
3232
operator_data: *mut c_void,
3333
) -> herr_t,
3434
>;
3535

3636
pub type H5A_operator2_t = Option<
37-
extern "C" fn(
37+
unsafe extern "C" fn(
3838
location_id: hid_t,
3939
attr_name: *const c_char,
4040
ainfo: *const H5A_info_t,

‎hdf5-sys/src/h5d.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ pub enum H5D_mpio_no_collective_cause_t {
125125
}
126126

127127
pub type H5D_operator_t = Option<
128-
extern "C" fn(
128+
unsafe extern "C" fn(
129129
elem: *mut c_void,
130130
type_id: hid_t,
131131
ndim: c_uint,
@@ -136,15 +136,15 @@ pub type H5D_operator_t = Option<
136136

137137
#[cfg(feature = "1.8.11")]
138138
pub type H5D_scatter_func_t = Option<
139-
extern "C" fn(
139+
unsafe extern "C" fn(
140140
src_buf: *mut *const c_void,
141141
src_buf_bytes_used: *mut size_t,
142142
op_data: *mut c_void,
143143
) -> herr_t,
144144
>;
145145
#[cfg(feature = "1.8.11")]
146146
pub type H5D_gather_func_t = Option<
147-
extern "C" fn(
147+
unsafe extern "C" fn(
148148
dst_buf: *const c_void,
149149
dst_buf_bytes_used: size_t,
150150
op_data: *mut c_void,
@@ -289,7 +289,7 @@ extern "C" {
289289

290290
#[cfg(feature = "1.14.0")]
291291
pub type H5D_chunk_iter_op_t = Option<
292-
extern "C" fn(
292+
unsafe extern "C" fn(
293293
offset: *const hsize_t,
294294
filter_mask: c_uint,
295295
addr: haddr_t,

‎hdf5-sys/src/h5es.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub enum H5ES_status_t {
4545
}
4646

4747
pub type H5ES_event_complete_func_t = Option<
48-
extern "C" fn(
48+
unsafe extern "C" fn(
4949
op_info: *mut H5ES_op_info_t,
5050
status: H5ES_status_t,
5151
err_stack: hid_t,
@@ -54,7 +54,7 @@ pub type H5ES_event_complete_func_t = Option<
5454
>;
5555

5656
pub type H5ES_event_insert_func_t =
57-
Option<extern "C" fn(op_info: *const H5ES_op_info_t, ctx: *mut c_void) -> c_int>;
57+
Option<unsafe extern "C" fn(op_info: *const H5ES_op_info_t, ctx: *mut c_void) -> c_int>;
5858

5959
extern "C" {
6060
pub fn H5ESinsert_request(es_id: hid_t, connector_id: hid_t, request: *mut c_void) -> herr_t;

‎hdf5-sys/src/h5fd.rs

+27-24
Original file line numberDiff line numberDiff line change
@@ -132,31 +132,33 @@ pub struct H5FD_class_t {
132132
pub fc_degree: H5F_close_degree_t,
133133
#[cfg(feature = "1.14.0")]
134134
pub terminate: Option<extern "C" fn() -> herr_t>,
135-
pub sb_size: Option<extern "C" fn(file: *mut H5FD_t) -> hsize_t>,
136-
pub sb_encode:
137-
Option<extern "C" fn(file: *mut H5FD_t, name: *mut c_char, p: *mut c_uchar) -> herr_t>,
138-
pub sb_decode:
139-
Option<extern "C" fn(f: *mut H5FD_t, name: *const c_char, p: *const c_uchar) -> herr_t>,
135+
pub sb_size: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> hsize_t>,
136+
pub sb_encode: Option<
137+
unsafe extern "C" fn(file: *mut H5FD_t, name: *mut c_char, p: *mut c_uchar) -> herr_t,
138+
>,
139+
pub sb_decode: Option<
140+
unsafe extern "C" fn(f: *mut H5FD_t, name: *const c_char, p: *const c_uchar) -> herr_t,
141+
>,
140142
pub fapl_size: size_t,
141-
pub fapl_get: Option<extern "C" fn(file: *mut H5FD_t) -> *mut c_void>,
142-
pub fapl_copy: Option<extern "C" fn(fapl: *const c_void) -> *mut c_void>,
143-
pub fapl_free: Option<extern "C" fn(fapl: *mut c_void) -> herr_t>,
143+
pub fapl_get: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> *mut c_void>,
144+
pub fapl_copy: Option<unsafe extern "C" fn(fapl: *const c_void) -> *mut c_void>,
145+
pub fapl_free: Option<unsafe extern "C" fn(fapl: *mut c_void) -> herr_t>,
144146
pub dxpl_size: size_t,
145-
pub dxpl_copy: Option<extern "C" fn(dxpl: *const c_void) -> *mut c_void>,
146-
pub dxpl_free: Option<extern "C" fn(dxpl: *mut c_void) -> herr_t>,
147+
pub dxpl_copy: Option<unsafe extern "C" fn(dxpl: *const c_void) -> *mut c_void>,
148+
pub dxpl_free: Option<unsafe extern "C" fn(dxpl: *mut c_void) -> herr_t>,
147149
pub open: Option<
148-
extern "C" fn(
150+
unsafe extern "C" fn(
149151
name: *const c_char,
150152
flags: c_uint,
151153
fapl: hid_t,
152154
maxaddr: haddr_t,
153155
) -> *mut H5FD_t,
154156
>,
155-
pub close: Option<extern "C" fn(file: *mut H5FD_t) -> herr_t>,
156-
pub cmp: Option<extern "C" fn(f1: *const H5FD_t, f2: *const H5FD_t) -> c_int>,
157-
pub query: Option<extern "C" fn(f1: *const H5FD_t, flags: *mut c_ulong) -> herr_t>,
157+
pub close: Option<unsafe extern "C" fn(file: *mut H5FD_t) -> herr_t>,
158+
pub cmp: Option<unsafe extern "C" fn(f1: *const H5FD_t, f2: *const H5FD_t) -> c_int>,
159+
pub query: Option<unsafe extern "C" fn(f1: *const H5FD_t, flags: *mut c_ulong) -> herr_t>,
158160
pub get_type_map:
159-
Option<extern "C" fn(file: *const H5FD_t, type_map: *mut H5FD_mem_t) -> herr_t>,
161+
Option<unsafe extern "C" fn(file: *const H5FD_t, type_map: *mut H5FD_mem_t) -> herr_t>,
160162
pub alloc: Option<
161163
extern "C" fn(
162164
file: *mut H5FD_t,
@@ -174,10 +176,10 @@ pub struct H5FD_class_t {
174176
size: hsize_t,
175177
) -> herr_t,
176178
>,
177-
pub get_eoa: Option<extern "C" fn(file: *const H5FD_t, type_: H5FD_mem_t) -> haddr_t>,
179+
pub get_eoa: Option<unsafe extern "C" fn(file: *const H5FD_t, type_: H5FD_mem_t) -> haddr_t>,
178180
pub set_eoa:
179-
Option<extern "C" fn(file: *mut H5FD_t, type_: H5FD_mem_t, addr: haddr_t) -> herr_t>,
180-
pub get_eof: Option<extern "C" fn(file: *const H5FD_t) -> haddr_t>,
181+
Option<unsafe extern "C" fn(file: *mut H5FD_t, type_: H5FD_mem_t, addr: haddr_t) -> herr_t>,
182+
pub get_eof: Option<unsafe extern "C" fn(file: *const H5FD_t) -> haddr_t>,
181183
pub get_handle: Option<
182184
extern "C" fn(file: *mut H5FD_t, fapl: hid_t, file_handle: *mut *mut c_void) -> herr_t,
183185
>,
@@ -201,9 +203,10 @@ pub struct H5FD_class_t {
201203
buffer: *const c_void,
202204
) -> herr_t,
203205
>,
204-
pub flush: Option<extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: c_uint) -> herr_t>,
206+
pub flush:
207+
Option<unsafe extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: c_uint) -> herr_t>,
205208
pub truncate:
206-
Option<extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: hbool_t) -> herr_t>,
209+
Option<unsafe extern "C" fn(file: *mut H5FD_t, dxpl_id: hid_t, closing: hbool_t) -> herr_t>,
207210
pub lock: Option<
208211
extern "C" fn(
209212
file: *mut H5FD_t,
@@ -213,9 +216,9 @@ pub struct H5FD_class_t {
213216
) -> herr_t,
214217
>,
215218
pub unlock:
216-
Option<extern "C" fn(file: *mut H5FD_t, oid: *mut c_uchar, last: hbool_t) -> herr_t>,
219+
Option<unsafe extern "C" fn(file: *mut H5FD_t, oid: *mut c_uchar, last: hbool_t) -> herr_t>,
217220
#[cfg(feature = "1.14.0")]
218-
pub del: Option<extern "C" fn(name: *const c_char, fapl: hid_t) -> herr_t>,
221+
pub del: Option<unsafe extern "C" fn(name: *const c_char, fapl: hid_t) -> herr_t>,
219222
#[cfg(feature = "1.14.0")]
220223
pub ctl: Option<
221224
extern "C" fn(
@@ -316,8 +319,8 @@ pub struct H5FD_file_image_callbacks_t {
316319
udata: *mut c_void,
317320
) -> herr_t,
318321
>,
319-
pub udata_copy: Option<extern "C" fn(udata: *mut c_void) -> *mut c_void>,
320-
pub udata_free: Option<extern "C" fn(udata: *mut c_void) -> herr_t>,
322+
pub udata_copy: Option<unsafe extern "C" fn(udata: *mut c_void) -> *mut c_void>,
323+
pub udata_free: Option<unsafe extern "C" fn(udata: *mut c_void) -> herr_t>,
321324
pub udata: *mut c_void,
322325
}
323326

‎hdf5-sys/src/h5i.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ pub type hid_t = c_int;
4343
pub const H5I_INVALID_HID: hid_t = -1;
4444

4545
#[cfg(not(feature = "1.14.0"))]
46-
pub type H5I_free_t = Option<extern "C" fn(arg1: *mut c_void) -> herr_t>;
46+
pub type H5I_free_t = Option<unsafe extern "C" fn(arg1: *mut c_void) -> herr_t>;
4747
#[cfg(feature = "1.14.0")]
48-
pub type H5I_free_t = Option<extern "C" fn(*mut c_void, *mut *mut c_void) -> herr_t>;
48+
pub type H5I_free_t = Option<unsafe extern "C" fn(*mut c_void, *mut *mut c_void) -> herr_t>;
4949

5050
pub type H5I_search_func_t =
51-
Option<extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
51+
Option<unsafe extern "C" fn(obj: *mut c_void, id: hid_t, key: *mut c_void) -> c_int>;
5252
#[cfg(feature = "1.12.0")]
53-
pub type H5I_iterate_func_t = Option<extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;
53+
pub type H5I_iterate_func_t = Option<unsafe extern "C" fn(id: hid_t, udata: *mut c_void) -> herr_t>;
5454

5555
extern "C" {
5656
pub fn H5Iregister(type_: H5I_type_t, object: *const c_void) -> hid_t;
@@ -79,11 +79,13 @@ extern "C" {
7979
}
8080

8181
#[cfg(feature = "1.14.0")]
82-
pub type H5I_future_realize_func_t =
83-
Option<extern "C" fn(future_object: *mut c_void, actual_object_id: *mut hid_t) -> herr_t>;
82+
pub type H5I_future_realize_func_t = Option<
83+
unsafe extern "C" fn(future_object: *mut c_void, actual_object_id: *mut hid_t) -> herr_t,
84+
>;
8485

8586
#[cfg(feature = "1.14.0")]
86-
pub type H5I_future_discard_func_t = Option<extern "C" fn(future_object: *mut c_void) -> herr_t>;
87+
pub type H5I_future_discard_func_t =
88+
Option<unsafe extern "C" fn(future_object: *mut c_void) -> herr_t>;
8789

8890
#[cfg(feature = "1.14.0")]
8991
extern "C" {

‎hdf5-sys/src/h5l.rs

+39-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
//! Creating and manipulating links within an HDF5 group
2+
#[cfg(feature = "1.12.0")]
3+
use std::fmt;
24
use std::mem;
35

46
pub use self::H5L_type_t::*;
@@ -64,14 +66,14 @@ impl H5L_info1_t__u {
6466
}
6567

6668
#[repr(C)]
67-
#[derive(Debug, Copy, Clone)]
69+
#[derive(Copy, Clone)]
6870
#[cfg(feature = "1.12.0")]
6971
pub struct H5L_info2_t {
7072
pub type_: H5L_type_t,
7173
pub corder_valid: hbool_t,
7274
pub corder: int64_t,
7375
pub cset: H5T_cset_t,
74-
pub u: H5L_info1_t__u,
76+
pub u: H5L_info2_t__u,
7577
}
7678

7779
#[cfg(feature = "1.12.0")]
@@ -81,6 +83,29 @@ impl Default for H5L_info2_t {
8183
}
8284
}
8385

86+
#[cfg(feature = "1.12.0")]
87+
impl fmt::Debug for H5L_info2_t {
88+
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
89+
let mut debug_struct = f.debug_struct("H5L_info2_t");
90+
debug_struct
91+
.field("type_", &self.type_)
92+
.field("corder_valid", &self.corder_valid)
93+
.field("corder", &self.corder)
94+
.field("cset", &self.cset);
95+
96+
match self.type_ {
97+
H5L_TYPE_HARD => {
98+
debug_struct.field("token", unsafe { &self.u.token });
99+
}
100+
H5L_TYPE_SOFT | H5L_TYPE_EXTERNAL | H5L_TYPE_MAX => {
101+
debug_struct.field("val_size", unsafe { &self.u.val_size });
102+
}
103+
H5L_TYPE_ERROR => {}
104+
}
105+
debug_struct.finish()
106+
}
107+
}
108+
84109
#[repr(C)]
85110
#[derive(Copy, Clone)]
86111
#[cfg(feature = "1.12.0")]
@@ -96,6 +121,16 @@ impl Default for H5L_info2_t__u {
96121
}
97122
}
98123

124+
#[cfg(feature = "1.12.0")]
125+
impl H5L_info2_t__u {
126+
pub unsafe fn token(&mut self) -> *mut H5O_token_t {
127+
&mut self.token as *mut H5O_token_t
128+
}
129+
pub unsafe fn val_size(&mut self) -> *mut size_t {
130+
&mut self.val_size as *mut size_t
131+
}
132+
}
133+
99134
pub type H5L_create_func_t = Option<
100135
extern "C" fn(
101136
link_name: *const c_char,
@@ -169,7 +204,7 @@ impl Default for H5L_class_t {
169204
}
170205

171206
pub type H5L_iterate1_t = Option<
172-
extern "C" fn(
207+
unsafe extern "C" fn(
173208
group: hid_t,
174209
name: *const c_char,
175210
info: *const H5L_info1_t,
@@ -178,7 +213,7 @@ pub type H5L_iterate1_t = Option<
178213
>;
179214
#[cfg(feature = "1.12.0")]
180215
pub type H5L_iterate2_t = Option<
181-
extern "C" fn(
216+
unsafe extern "C" fn(
182217
group: hid_t,
183218
name: *const c_char,
184219
info: *const H5L_info2_t,

‎hdf5-sys/src/h5mm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
use crate::internal_prelude::*;
33

44
pub type H5MM_allocate_t =
5-
Option<extern "C" fn(size: size_t, alloc_info: *mut c_void) -> *mut c_void>;
6-
pub type H5MM_free_t = Option<extern "C" fn(mem: *mut c_void, free_info: *mut c_void)>;
5+
Option<unsafe extern "C" fn(size: size_t, alloc_info: *mut c_void) -> *mut c_void>;
6+
pub type H5MM_free_t = Option<unsafe extern "C" fn(mem: *mut c_void, free_info: *mut c_void)>;

‎hdf5-sys/src/h5o.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ pub enum H5O_mcdt_search_ret_t {
204204

205205
#[cfg(feature = "1.8.9")]
206206
pub type H5O_mcdt_search_cb_t =
207-
Option<extern "C" fn(op_data: *mut c_void) -> H5O_mcdt_search_ret_t>;
207+
Option<unsafe extern "C" fn(op_data: *mut c_void) -> H5O_mcdt_search_ret_t>;
208208

209209
#[cfg(not(feature = "1.10.3"))]
210210
extern "C" {

‎hdf5-sys/src/h5p.rs

+10-8
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ pub const H5P_CRT_ORDER_INDEXED: c_uint = 0x0002;
2626
pub const H5P_DEFAULT: hid_t = 0;
2727

2828
pub type H5P_cls_create_func_t =
29-
Option<extern "C" fn(prop_id: hid_t, create_data: *mut c_void) -> herr_t>;
30-
pub type H5P_cls_copy_func_t =
31-
Option<extern "C" fn(new_prop_id: hid_t, old_prop_id: hid_t, copy_data: *mut c_void) -> herr_t>;
29+
Option<unsafe extern "C" fn(prop_id: hid_t, create_data: *mut c_void) -> herr_t>;
30+
pub type H5P_cls_copy_func_t = Option<
31+
unsafe extern "C" fn(new_prop_id: hid_t, old_prop_id: hid_t, copy_data: *mut c_void) -> herr_t,
32+
>;
3233
pub type H5P_cls_close_func_t =
33-
Option<extern "C" fn(prop_id: hid_t, close_data: *mut c_void) -> herr_t>;
34+
Option<unsafe extern "C" fn(prop_id: hid_t, close_data: *mut c_void) -> herr_t>;
3435
pub type H5P_prp_cb1_t =
35-
Option<extern "C" fn(name: *const c_char, size: size_t, value: *mut c_void) -> herr_t>;
36+
Option<unsafe extern "C" fn(name: *const c_char, size: size_t, value: *mut c_void) -> herr_t>;
3637
pub type H5P_prp_cb2_t = Option<
3738
extern "C" fn(prop_id: hid_t, name: *const c_char, size: size_t, value: *mut c_void) -> herr_t,
3839
>;
@@ -41,11 +42,12 @@ pub type H5P_prp_set_func_t = H5P_prp_cb2_t;
4142
pub type H5P_prp_get_func_t = H5P_prp_cb2_t;
4243
pub type H5P_prp_delete_func_t = H5P_prp_cb2_t;
4344
pub type H5P_prp_copy_func_t = H5P_prp_cb1_t;
44-
pub type H5P_prp_compare_func_t =
45-
Option<extern "C" fn(value1: *const c_void, value2: *const c_void, size: size_t) -> c_int>;
45+
pub type H5P_prp_compare_func_t = Option<
46+
unsafe extern "C" fn(value1: *const c_void, value2: *const c_void, size: size_t) -> c_int,
47+
>;
4648
pub type H5P_prp_close_func_t = H5P_prp_cb1_t;
4749
pub type H5P_iterate_t =
48-
Option<extern "C" fn(id: hid_t, name: *const c_char, iter_data: *mut c_void) -> herr_t>;
50+
Option<unsafe extern "C" fn(id: hid_t, name: *const c_char, iter_data: *mut c_void) -> herr_t>;
4951

5052
pub use self::globals::*;
5153

0 commit comments

Comments
 (0)