Merge pull request #129 from mulimoen/bugfix/CI

Fix CI

Author: mulimoen

.github/workflows/ci.yml

@@ -2,6 +2,8 @@ name: CI
 
 on:
   push:
+    branches:
+      - master
   pull_request:
     branches:
       - master
@@ -94,7 +96,7 @@ jobs:
         uses: actions-rs/toolchain@v1
         with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
       - name: Install conda
-        uses: goanpeca/setup-miniconda@v1
+        uses: conda-incubator/setup-miniconda@v2
         with: {auto-update-conda: false, activate-environment: testenv}
       - name: Install HDF5 (${{matrix.version}}${{matrix.mpi && '-' || ''}}${{matrix.mpi}})
         run: |
@@ -124,6 +126,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
         with: {submodules: true}
+      - name: Change to older toolchain
+        if: matrix.os == 'macos'
+        run: sudo xcode-select -s "/Applications/Xcode_11.7.app"
       - name: Install Rust (${{matrix.rust}})
         uses: actions-rs/toolchain@v1
         with: {toolchain: '${{matrix.rust}}', profile: minimal, override: true}
@@ -165,7 +170,7 @@ jobs:
       fail-fast: false
       matrix:
         rust: [stable]
-        version: [1.8, '1.10']
+        version: ["1.8", "1.10", "1.12"]
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -176,18 +181,22 @@ jobs:
       - name: Configure environment
         shell: bash
         run: |
-          if [ "${{matrix.version}}" == "1.8" ]; then
+          if [[ "${{matrix.version}}" == "1.8" ]]; then
             VERSION=1.8.21
             DL_PATH=hdf5-1.8.21-Std-win7_64-vs14.zip
-            echo ::set-env name=MSI_PATH::hdf\\HDF5-1.8.21-win64.msi
-          else
+            echo "MSI_PATH=hdf\\HDF5-1.8.21-win64.msi" >> $GITHUB_ENV
+          elif [[ "${{matrix.version}}" == "1.10" ]]; then
             VERSION=1.10.0
             DL_PATH=windows/extra/hdf5-1.10.0-win64-VS2015-shared.zip
-            echo ::set-env name=MSI_PATH::hdf5\\HDF5-1.10.0-win64.msi
+            echo "MSI_PATH=hdf5\\HDF5-1.10.0-win64.msi" >> $GITHUB_ENV
+          else
+            VERSION=1.12.0
+            DL_PATH=hdf5-1.12.0-Std-win10_64-vs16.zip
+            echo "MSI_PATH=hdf\\HDF5-1.12.0-win64.msi" >> $GITHUB_ENV
           fi
           BASE_URL=https://support.hdfgroup.org/ftp/HDF5/prev-releases
-          echo ::set-env name=DL_URL::$BASE_URL/hdf5-${{matrix.version}}/hdf5-$VERSION/bin/$DL_PATH
-          echo ::add-path::C:\\Program Files\\HDF_Group\\HDF5\\$VERSION\\bin
+          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}})
         shell: pwsh
         run: |

hdf5-sys/src/h5s.rs

@@ -6,7 +6,7 @@ use crate::internal_prelude::*;
 
 pub const H5S_ALL: hid_t = 0;
 
-pub const H5S_UNLIMITED: hsize_t = (-1 as hssize_t) as _;
+pub const H5S_UNLIMITED: hsize_t = -1_i32 as _;
 
 pub const H5S_MAX_RANK: c_uint = 32;
 

src/hl/group.rs

@@ -189,7 +189,7 @@ impl Group {
         }
 
         let callback_fn: H5L_iterate_t = Some(members_callback);
-        let iteration_position: *mut hsize_t = &mut { 0 as u64 };
+        let iteration_position: *mut hsize_t = &mut { 0_u64 };
         let mut result: Vec<String> = Vec::new();
         let other_data: *mut c_void = &mut result as *mut _ as *mut c_void;
 

src/hl/plist.rs

@@ -215,7 +215,7 @@ pub fn set_vlen_manager_libc(plist: hid_t) -> Result<()> {
         panic::catch_unwind(|| unsafe { libc::malloc(size) }).unwrap_or(ptr::null_mut())
     }
     extern "C" fn free(ptr: *mut c_void, _info: *mut libc::c_void) {
-        let _ = panic::catch_unwind(|| unsafe { libc::free(ptr) });
+        let _p = panic::catch_unwind(|| unsafe { libc::free(ptr) });
     }
     h5try!(H5Pset_vlen_mem_manager(
         plist,

src/hl/plist/file_access.rs

@@ -1157,15 +1157,12 @@ impl FileAccessBuilder {
     }
 
     pub fn core_options(&mut self, increment: usize, filebacked: bool) -> &mut Self {
-        let mut drv = CoreDriver::default();
-        drv.increment = increment;
-        drv.filebacked = filebacked;
+        let drv = CoreDriver { increment, filebacked, ..CoreDriver::default() };
         self.driver(&FileDriver::Core(drv))
     }
 
     pub fn core_filebacked(&mut self, filebacked: bool) -> &mut Self {
-        let mut drv = CoreDriver::default();
-        drv.filebacked = filebacked;
+        let drv = CoreDriver { filebacked, ..CoreDriver::default() };
         self.driver(&FileDriver::Core(drv))
     }
 
@@ -1585,11 +1582,8 @@ impl FileAccess {
             self.get_family().map(FileDriver::Family)
         } else if drv_id == *H5FD_MULTI {
             let multi = self.get_multi()?;
-            if let Some(split) = SplitDriver::from_multi(&multi) {
-                Ok(FileDriver::Split(split))
-            } else {
-                Ok(FileDriver::Multi(multi))
-            }
+            SplitDriver::from_multi(&multi)
+                .map_or(Ok(FileDriver::Multi(multi)), |split| Ok(FileDriver::Split(split)))
         } else {
             fail!("unknown or unsupported file driver (id: {})", drv_id);
         }

src/util.rs

@@ -16,6 +16,7 @@ pub fn string_from_cstr(string: *const c_char) -> String {
 /// Convert a `String` or a `&str` into a zero-terminated string (`const char *`).
 pub fn to_cstring<S: Borrow<str>>(string: S) -> Result<CString> {
     let string = string.borrow();
+    #[allow(clippy::map_err_ignore)]
     CString::new(string).map_err(|_| format!("null byte in string: {:?}", string).into())
 }