Fix clippy warnings in latest rust version

Signed-off-by: Ryan Bottriell <[email protected]>

Author: rydrman

crates/spfs/src/graph/tree.rs

@@ -30,12 +30,9 @@ impl Tree {
     }
 
     pub fn get<S: AsRef<str>>(&self, name: S) -> Option<&Entry> {
-        for entry in self.entries.iter() {
-            if entry.name == name.as_ref() {
-                return Some(entry);
-            }
-        }
-        None
+        self.entries
+            .iter()
+            .find(|&entry| entry.name == name.as_ref())
     }
 
     pub fn is_empty(&self) -> bool {
@@ -64,12 +61,9 @@ impl Tree {
     }
 
     pub fn remove<S: AsRef<str>>(&mut self, name: S) -> Option<&Entry> {
-        for entry in self.entries.iter() {
-            if entry.name == name.as_ref() {
-                return Some(entry);
-            }
-        }
-        None
+        self.entries
+            .iter()
+            .find(|&entry| entry.name == name.as_ref())
     }
 
     pub fn iter(&self) -> impl Iterator<Item = &Entry> {

crates/spfs/src/proto/conversions.rs

@@ -63,7 +63,7 @@ impl TryFrom<Option<super::Tag>> for tracking::Tag {
 impl TryFrom<super::Tag> for tracking::Tag {
     type Error = Error;
     fn try_from(source: super::Tag) -> Result<Self> {
-        let org = source.org.is_empty().not().then(|| source.org);
+        let org = source.org.is_empty().not().then_some(source.org);
         let mut tag = Self::new(org, source.name, convert_digest(source.target)?)?;
         tag.parent = convert_digest(source.parent)?;
         tag.user = source.user;

crates/spfs/src/storage/manifest_test.rs

@@ -72,10 +72,7 @@ async fn test_manifest_parity(
         .expect("stored manifest was not written");
     let actual = out.unlock();
     let mut diffs = tracking::compute_diff(&expected, &actual);
-    diffs = diffs
-        .into_iter()
-        .filter(|d| !d.mode.is_unchanged())
-        .collect();
+    diffs.retain(|d| !d.mode.is_unchanged());
 
     for diff in diffs.iter() {
         println!("{diff}, {:?}", diff.mode);

crates/spk-schema/crates/foundation/src/version/mod.rs

@@ -249,9 +249,8 @@ impl std::cmp::Eq for VersionParts {}
 impl std::hash::Hash for VersionParts {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         // trailing zeros do not alter the hash/cmp for a version
-        match self.parts.iter().rposition(|d| d != &0) {
-            Some(last_nonzero) => self.parts[..=last_nonzero].hash(state),
-            None => {}
+        if let Some(last_nonzero) = self.parts.iter().rposition(|d| d != &0) {
+            self.parts[..=last_nonzero].hash(state)
         };
         self.plus_epsilon.hash(state);
     }

crates/spk-schema/crates/validators/src/validators.rs

@@ -29,23 +29,20 @@ where
     let mut diffs: Vec<_> = diffs.iter().filter(|d| d.mode.is_added()).collect();
     let data_path = data_path(spec.ident()).to_path("/");
     for component in spec.components_iter() {
-        diffs = diffs
-            .into_iter()
-            .filter(|d| {
-                let entry = match &d.mode {
-                    spfs::tracking::DiffMode::Unchanged(e) => e,
-                    spfs::tracking::DiffMode::Changed(_, e) => e,
-                    spfs::tracking::DiffMode::Added(e) => e,
-                    spfs::tracking::DiffMode::Removed(_) => return false,
-                };
-                let path = d.path.to_path("/");
-                // either part of a component explicitly or implicitly
-                // because it's a data file
-                let is_explicit = component.files().matches(&path, entry.is_dir());
-                let is_collected = is_explicit || path.starts_with(&data_path);
-                !is_collected
-            })
-            .collect();
+        diffs.retain(|d| {
+            let entry = match &d.mode {
+                spfs::tracking::DiffMode::Unchanged(e) => e,
+                spfs::tracking::DiffMode::Changed(_, e) => e,
+                spfs::tracking::DiffMode::Added(e) => e,
+                spfs::tracking::DiffMode::Removed(_) => return false,
+            };
+            let path = d.path.to_path("/");
+            // either part of a component explicitly or implicitly
+            // because it's a data file
+            let is_explicit = component.files().matches(&path, entry.is_dir());
+            let is_collected = is_explicit || path.starts_with(&data_path);
+            !is_collected
+        });
         if diffs.is_empty() {
             return None;
         }

crates/spk-solve/src/io.rs

@@ -105,9 +105,7 @@ where
     }
 
     fn check_for_interruptions(&mut self) -> Result<()> {
-        if let Err(err) = self.check_if_taking_too_long() {
-            return Err(err);
-        };
+        self.check_if_taking_too_long()?;
         self.check_if_user_hit_ctrlc()
     }
 

crates/spk-storage/src/storage/repository.rs

@@ -393,9 +393,8 @@ pub trait Repository: Storage + Sync {
         };
 
         let components = self.read_components(package.ident()).await?;
-        if let Err(err) = self.publish_package_to_storage(package, &components).await {
-            return Err(err);
-        }
+        self.publish_package_to_storage(package, &components)
+            .await?;
 
         // Changes that affect embedded stubs:
         // - change in deprecation status

crates/spk-storage/src/storage/spfs.rs

@@ -123,7 +123,7 @@ impl std::ops::Drop for SPFSRepository {
     fn drop(&mut self) {
         // Safety: We only put valid `Box` pointers into `self.cache_policy`.
         unsafe {
-            Box::from_raw(self.cache_policy.load(Ordering::Relaxed));
+            let _ = Box::from_raw(self.cache_policy.load(Ordering::Relaxed));
         }
     }
 }
@@ -597,11 +597,8 @@ impl Repository for SPFSRepository {
 
     async fn read_recipe(&self, pkg: &Ident) -> Result<Arc<Self::Recipe>> {
         let address = self.address();
-        match pkg.build {
-            Some(_) => {
-                return Err(format!("cannot read a recipe for a package build: {pkg}").into());
-            }
-            None => {}
+        if pkg.build.is_some() {
+            return Err(format!("cannot read a recipe for a package build: {pkg}").into());
         };
         if self.cached_result_permitted() {
             let r = RECIPE_CACHE