Clippy fixes

LDeakin · Jan 26, 2024 · cefb65c · cefb65c
1 parent e414b10
commit cefb65c
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/src/array/chunk_grid.rs b/src/array/chunk_grid.rs
@@ -99,9 +99,8 @@ impl TryFrom<ArrayShape> for ChunkGrid {
         let regular_chunk_shape = regular_chunk_shape
             .into_iter()
             .map(|i| {
-                NonZeroU64::new(i).ok_or(PluginCreateError::from(
-                    "chunk shape elements must be non-zero",
-                ))
+                NonZeroU64::new(i)
+                    .ok_or_else(|| PluginCreateError::from("chunk shape elements must be non-zero"))
             })
             .collect::<Result<Vec<_>, _>>()?
             .into();

diff --git a/src/metadata.rs b/src/metadata.rs
@@ -163,21 +163,25 @@ impl Metadata {
             },
             |configuration| {
                 let value = serde_json::to_value(configuration);
-                match value {
-                    Ok(value) => serde_json::from_value(value).map_or_else(
-                        |_| {
-                            Err(ConfigurationInvalidError::new(
-                                self.name.clone(),
-                                self.configuration.clone(),
-                            ))
-                        },
-                        |configuration| Ok(configuration),
-                    ),
-                    Err(_) => Err(ConfigurationInvalidError::new(
-                        self.name.clone(),
-                        self.configuration.clone(),
-                    )),
-                }
+                value.map_or_else(
+                    |_| {
+                        Err(ConfigurationInvalidError::new(
+                            self.name.clone(),
+                            self.configuration.clone(),
+                        ))
+                    },
+                    |value| {
+                        serde_json::from_value(value).map_or_else(
+                            |_| {
+                                Err(ConfigurationInvalidError::new(
+                                    self.name.clone(),
+                                    self.configuration.clone(),
+                                ))
+                            },
+                            |configuration| Ok(configuration),
+                        )
+                    },
+                )
             },
         )
     }