Fix all clippy errors in all crates

Author: aldanor

hdf5-derive/src/lib.rs

@@ -134,10 +134,8 @@ fn find_hdf5_rename(attrs: &[Attribute]) -> Option<String> {
     let mut rename = None;
     let attr = attrs.iter().find(|a| a.path().is_ident("hdf5"))?;
     attr.parse_nested_meta(|meta| {
-        if meta.path.is_ident("rename") {
-            if rename.is_none() {
-                rename = Some(meta.value()?.parse::<LitStr>()?.value());
-            }
+        if meta.path.is_ident("rename") && rename.is_none() {
+            rename = Some(meta.value()?.parse::<LitStr>()?.value());
         }
         Ok(())
     })

hdf5-sys/src/h5f.rs

@@ -341,21 +341,16 @@ mod hdf5_1_10_1 {
     use super::*;
 
     #[repr(C)]
-    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug)]
+    #[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Debug, Default)]
     pub enum H5F_fspace_strategy_t {
+        #[default]
         H5F_FSPACE_STRATEGY_FSM_AGGR = 0,
         H5F_FSPACE_STRATEGY_PAGE = 1,
         H5F_FSPACE_STRATEGY_AGGR = 2,
         H5F_FSPACE_STRATEGY_NONE = 3,
         H5F_FSPACE_STRATEGY_NTYPES = 4,
     }
 
-    impl Default for H5F_fspace_strategy_t {
-        fn default() -> Self {
-            H5F_FSPACE_STRATEGY_FSM_AGGR
-        }
-    }
-
     pub use self::H5F_fspace_strategy_t::*;
 
     extern "C" {

src/error.rs

@@ -123,7 +123,7 @@ impl ErrorFrame {
             func: func.into(),
             major: major.into(),
             minor: minor.into(),
-            description: format!("{}(): {}", func, desc),
+            description: format!("{func}(): {desc}"),
         }
     }
 
@@ -265,7 +265,7 @@ impl StdError for Error {}
 
 impl From<ShapeError> for Error {
     fn from(err: ShapeError) -> Self {
-        format!("shape error: {}", err).into()
+        format!("shape error: {err}").into()
     }
 }
 

src/handle.rs

@@ -20,7 +20,7 @@ impl Handle {
             // Drop on an invalid handle could cause closing an unrelated object
             // in the destructor, hence it's important to prevent the drop here.
             mem::forget(handle);
-            Err(From::from(format!("Invalid handle id: {}", id)))
+            Err(From::from(format!("Invalid handle id: {id}")))
         }
     }
 

src/hl/container.rs

@@ -78,7 +78,7 @@ impl<'a> Reader<'a> {
         let selection = selection.try_into()?;
         let obj_space = self.obj.space()?;
 
-        let out_shape = selection.out_shape(&obj_space.shape())?;
+        let out_shape = selection.out_shape(obj_space.shape())?;
         let out_size: Ix = out_shape.iter().product();
         let fspace = obj_space.select(selection)?;
 
@@ -250,7 +250,7 @@ impl<'a> Writer<'a> {
         let selection = selection.try_into()?;
         let obj_space = self.obj.space()?;
 
-        let out_shape = selection.out_shape(&obj_space.shape())?;
+        let out_shape = selection.out_shape(obj_space.shape())?;
         let out_size: Ix = out_shape.iter().product();
         let fspace = obj_space.select(selection)?;
         let view = arr.into();
@@ -392,7 +392,7 @@ impl io::Read for ByteReader {
         let pos = self.pos as usize;
         let amt = std::cmp::min(buf.len(), self.remaining_len());
         let selection = Selection::new(pos..pos + amt);
-        let out_shape = selection.out_shape(&self.obj_space.shape())?;
+        let out_shape = selection.out_shape(self.obj_space.shape())?;
         let fspace = self.obj_space.select(selection)?;
         let mspace = Dataspace::try_new(&out_shape)?;
         h5call!(H5Dread(

src/hl/dataspace.rs

@@ -36,7 +36,7 @@ impl ObjectClass for Dataspace {
 
     fn short_repr(&self) -> Option<String> {
         if let Ok(e) = self.extents() {
-            Some(format!("{}", e))
+            Some(format!("{e}"))
         } else {
             Some("(invalid)".into())
         }
@@ -200,7 +200,7 @@ impl Dataspace {
     }
 
     pub fn select<S: Into<Selection>>(&self, selection: S) -> Result<Self> {
-        let raw_sel = selection.into().into_raw(&self.shape())?;
+        let raw_sel = selection.into().into_raw(self.shape())?;
         self.select_raw(raw_sel)
     }
 

src/hl/datatype.rs

@@ -156,6 +156,7 @@ impl From<H5T_order_t> for ByteOrder {
 
 impl Datatype {
     /// Get the total size of the datatype in bytes.
+    #[allow(clippy::unnecessary_cast)]
     pub fn size(&self) -> usize {
         h5lock!(H5Tget_size(self.id())) as usize
     }
@@ -217,6 +218,7 @@ impl Datatype {
 
         h5lock!({
             let id = self.id();
+            #[allow(clippy::unnecessary_cast)]
             let size = H5Tget_size(id) as usize;
             match H5Tget_class(id) {
                 H5T_class_t::H5T_INTEGER => {

src/hl/extents.rs

@@ -18,20 +18,21 @@ pub struct Extent {
 
 impl Debug for Extent {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Extent({})", self)
+        write!(f, "Extent({self})")
     }
 }
 
 impl Display for Extent {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let dim = self.dim;
         if let Some(max) = self.max {
             if self.dim == max {
-                write!(f, "{}", self.dim)
+                write!(f, "{dim}")
             } else {
-                write!(f, "{}..={}", self.dim, max)
+                write!(f, "{dim}..={max}")
             }
         } else {
-            write!(f, "{}..", self.dim)
+            write!(f, "{dim}..")
         }
     }
 }
@@ -190,7 +191,7 @@ impl Deref for SimpleExtents {
 
 impl Debug for SimpleExtents {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "SimpleExtents({})", self)
+        write!(f, "SimpleExtents({self})")
     }
 }
 
@@ -202,7 +203,7 @@ impl Display for SimpleExtents {
             write!(f, "({},)", self[0])
         } else {
             let extents = self.iter().map(ToString::to_string).collect::<Vec<_>>().join(", ");
-            write!(f, "({})", extents)
+            write!(f, "({extents})")
         }
     }
 }
@@ -466,7 +467,7 @@ impl Display for Extents {
         match self {
             Self::Null => write!(f, "null"),
             Self::Scalar => write!(f, "scalar"),
-            Self::Simple(ref e) => write!(f, "{}", e),
+            Self::Simple(ref e) => write!(f, "{e}"),
         }
     }
 }

src/hl/file.rs

@@ -53,7 +53,7 @@ impl ObjectClass for File {
             None => String::new(),
         };
         let mode = if self.is_read_only() { "read-only" } else { "read/write" };
-        Some(format!("\"{}\" ({})", basename, mode))
+        Some(format!("\"{basename}\" ({mode})"))
     }
 }
 
@@ -227,9 +227,7 @@ impl FileBuilder {
             }
         }
         let filename = to_cstring(
-            filename
-                .to_str()
-                .ok_or_else(|| format!("Invalid UTF-8 in file name: {:?}", filename))?,
+            filename.to_str().ok_or_else(|| format!("Invalid UTF-8 in file name: {filename:?}"))?,
         )?;
         let flags = match mode {
             OpenMode::Read => H5F_ACC_RDONLY,

src/hl/filters.rs

@@ -553,12 +553,12 @@ pub(crate) fn validate_filters(filters: &[Filter], type_class: H5T_class_t) -> R
                 }
                 _ => fail!("Can only use scale-offset with ints/floats, got: {:?}", type_class),
             }
-        } else if let Filter::SZip(_, _) = filter {
+        } else if matches!(filter, Filter::SZip(_, _)) {
             // https://github.com/h5py/h5py/issues/953
             if map.contains_key(&H5Z_FILTER_FLETCHER32) {
                 fail!("Fletcher32 filter must be placed after szip filter");
             }
-        } else if let Filter::Shuffle = filter {
+        } else if matches!(filter, Filter::Shuffle) {
             if let Some(comp_filter) = comp_filter {
                 fail!("Shuffle filter placed after compression filter: {:?}", comp_filter);
             }