Skip to content

Commit fa662a0

Browse files
committed
Rename hdf5_version() -> library_version()
1 parent c635a25 commit fa662a0

File tree

2 files changed

+8
-10
lines changed

2 files changed

+8
-10
lines changed

src/hl/file.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ impl FileBuilder {
353353

354354
#[cfg(test)]
355355
pub mod tests {
356-
use crate::hdf5_version;
357356
use crate::internal_prelude::*;
358357
use std::fs;
359358
use std::io::{Read, Write};
@@ -445,11 +444,10 @@ pub mod tests {
445444
assert!(file.size() > 0);
446445
let orig_size = fs::metadata(file.filename()).unwrap().len();
447446
assert!(file.size() > orig_size);
448-
if hdf5_version() >= (1, 10, 0) {
449-
assert_ne!(orig_size, 0);
450-
} else {
451-
assert_eq!(orig_size, 0);
452-
}
447+
#[cfg(hdf5_1_10_0)]
448+
assert_ne!(orig_size, 0);
449+
#[cfg(not(hdf5_1_10_0))]
450+
assert_eq!(orig_size, 0);
453451
assert!(file.flush().is_ok());
454452
assert!(file.size() > 0);
455453
let new_size = fs::metadata(file.filename()).unwrap().len();

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ mod internal_prelude {
114114
pub mod test;
115115

116116
/// Returns the runtime version of the HDF5 library.
117-
pub fn hdf5_version() -> (u8, u8, u8) {
117+
pub fn library_version() -> (u8, u8, u8) {
118118
use self::internal_prelude::c_uint;
119119
use hdf5_sys::h5::H5get_libversion;
120120
let mut v: (c_uint, c_uint, c_uint) = (0, 0, 0);
@@ -133,10 +133,10 @@ pub fn is_library_threadsafe() -> bool {
133133

134134
#[cfg(test)]
135135
pub mod tests {
136-
use super::hdf5_version;
136+
use crate::library_version;
137137

138138
#[test]
139-
pub fn test_hdf5_version() {
140-
assert!(hdf5_version() >= (1, 8, 4));
139+
pub fn test_library_version() {
140+
assert!(library_version() >= (1, 8, 4));
141141
}
142142
}

0 commit comments

Comments
 (0)