Merge pull request #3742 from bgurney-rh/clippy-1.84

Fix clippy 1.84 linting errors
stratis-storage · Jan 9, 2025 · 086180c · 086180c
2 parents 5654874 + 66d3066
commit 086180c
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 14 deletions.
diff --git a/src/dbus_api/tree.rs b/src/dbus_api/tree.rs
@@ -298,7 +298,7 @@ impl DbusTreeHandler {
             opath
                 .get_data()
                 .as_ref()
-                .map_or(false, |op_cxt| op_cxt.parent == item)
+                .is_some_and(|op_cxt| op_cxt.parent == item)
         }) {
             if let StratisUuid::Fs(_) = opath
                 .get_data()

diff --git a/src/engine/strat_engine/liminal/liminal.rs b/src/engine/strat_engine/liminal/liminal.rs
@@ -1017,10 +1017,7 @@ impl LiminalDevices {
         event: &UdevEngineEvent,
     ) -> Option<(Name, PoolUuid, AnyPool)> {
         let event_type = event.event_type();
-        let device_path = match event.device().devnode() {
-            Some(d) => d,
-            None => return None,
-        };
+        let device_path = event.device().devnode()?;
         let device_info = match event_type {
             libudev::EventType::Add | libudev::EventType::Change => {
                 if device_path.exists() {

diff --git a/src/engine/strat_engine/pool/v1.rs b/src/engine/strat_engine/pool/v1.rs
@@ -1802,7 +1802,7 @@ mod tests {
             .tempdir()
             .unwrap();
         let new_file = tmp_dir.path().join("stratis_test.txt");
-        let write_block = &[0; 512_000];
+        let write_block = vec![0; 512_000].into_boxed_slice();
 
         {
             let (_, fs) = pool.get_filesystem(fs_uuid).unwrap();
@@ -1823,7 +1823,7 @@ mod tests {
             .open(new_file)
             .unwrap();
         while !pool.out_of_alloc_space() {
-            f.write_all(write_block).unwrap();
+            f.write_all(&write_block).unwrap();
             f.sync_all().unwrap();
             match pool {
                 AnyPool::V1(p) => p.event_on(pool_uuid, &pool_name).unwrap(),

diff --git a/src/engine/strat_engine/pool/v2.rs b/src/engine/strat_engine/pool/v2.rs
@@ -1744,7 +1744,7 @@ mod tests {
             .tempdir()
             .unwrap();
         let new_file = tmp_dir.path().join("stratis_test.txt");
-        let write_block = &[0; 512_000];
+        let write_block = vec![0; 512_000].into_boxed_slice();
 
         {
             let (_, fs) = pool.get_filesystem(fs_uuid).unwrap();
@@ -1765,7 +1765,7 @@ mod tests {
             .open(new_file)
             .unwrap();
         while !pool.out_of_alloc_space() {
-            f.write_all(write_block).unwrap();
+            f.write_all(&write_block).unwrap();
             f.sync_all().unwrap();
             match pool {
                 AnyPool::V1(p) => p.event_on(pool_uuid, &pool_name).unwrap(),

diff --git a/src/engine/strat_engine/udev.rs b/src/engine/strat_engine/udev.rs
@@ -161,6 +161,6 @@ where
     Ok(enumerator
         .scan_devices()?
         .filter(|dev| dev.is_initialized())
-        .find(|x| x.devnode().map_or(false, |d| **device_path == *d))
+        .find(|x| x.devnode().is_some_and(|d| **device_path == *d))
         .map(|ref d| f(&UdevEngineDevice::from(d))))
 }
diff --git a/src/engine/structures/table.rs b/src/engine/structures/table.rs
@@ -217,10 +217,7 @@ where
 
     /// Get mutable item by name.
     pub fn get_mut_by_name(&mut self, name: &str) -> Option<(U, &mut T)> {
-        let uuid = match self.name_to_uuid.get(name) {
-            Some(uuid) => uuid,
-            None => return None,
-        };
+        let uuid = self.name_to_uuid.get(name)?;
         self.items
             .get_mut(uuid)
             .map(|&mut (_, ref mut item)| (*uuid, item))