clippy lints

Author: mulimoen

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())
 }