fix(clippy): apply clippy suggestions

Author: QaidVoid

crates/soar-cli/src/apply.rs

@@ -366,8 +366,8 @@ async fn compute_diff(
         for installed in all_installed {
             let is_declared = declared_keys.iter().any(|(name, pkg_id, repo)| {
                 let name_matches = *name == installed.pkg_name;
-                let pkg_id_matches = pkg_id.as_ref().map_or(true, |id| *id == installed.pkg_id);
-                let repo_matches = repo.as_ref().map_or(true, |r| *r == installed.repo_name);
+                let pkg_id_matches = pkg_id.as_ref().is_none_or(|id| *id == installed.pkg_id);
+                let repo_matches = repo.as_ref().is_none_or(|r| *r == installed.repo_name);
                 name_matches && pkg_id_matches && repo_matches
             });
 

crates/soar-cli/src/install.rs

@@ -279,7 +279,7 @@ fn resolve_packages(
 
         let query = PackageQuery::try_from(package.as_str())?;
 
-        if show && query.pkg_id.is_none() && query.name.is_some() {
+        if let (true, None, Some(ref name)) = (show, &query.pkg_id, &query.name) {
             let repo_pkgs: Vec<Package> = if let Some(ref repo_name) = query.repo_name {
                 metadata_mgr
                     .query_repo(repo_name, |conn| {
@@ -322,7 +322,7 @@ fn resolve_packages(
             };
 
             if repo_pkgs.is_empty() {
-                error!("Package {} not found", query.name.as_ref().unwrap());
+                error!("Package {} not found", name);
                 continue;
             }
 
@@ -1279,7 +1279,7 @@ pub async fn install_single_package(
         if let Ok(entries) = fs::read_dir(&install_dir) {
             for entry in entries.filter_map(|e| e.ok()) {
                 let path = entry.path();
-                if path.extension().map_or(false, |ext| ext == "sig") && path.is_file() {
+                if path.extension().is_some_and(|ext| ext == "sig") && path.is_file() {
                     fs::remove_file(&path).ok();
                 }
             }

crates/soar-cli/src/remove.rs

@@ -25,7 +25,7 @@ pub async fn remove_packages(packages: &[String], yes: bool, all: bool) -> SoarR
         let query = PackageQuery::try_from(package.as_str())?;
 
         // --all flag: remove all installed variants of the package
-        if all && query.pkg_id.is_none() && query.name.is_some() {
+        if let (true, None, Some(ref name)) = (all, &query.pkg_id, &query.name) {
             let installed: Vec<InstalledPackage> = diesel_db
                 .with_conn(|conn| {
                     CoreRepository::list_filtered(
@@ -45,7 +45,7 @@ pub async fn remove_packages(packages: &[String], yes: bool, all: bool) -> SoarR
                 .collect();
 
             if installed.is_empty() {
-                error!("Package {} is not installed", query.name.as_ref().unwrap());
+                error!("Package {} is not installed", name);
                 continue;
             }
 

crates/soar-core/src/error.rs

@@ -1,5 +1,7 @@
 //! Error types for soar-core.
 
+#![expect(unused_assignments)]
+
 use std::error::Error;
 
 use miette::Diagnostic;

crates/soar-core/src/package/release_source.rs

@@ -171,11 +171,10 @@ fn resolve_github(
                     "No release found for {} with version '{}'",
                     repo, ver
                 ))
-            } else if tag_pattern.is_some() {
+            } else if let Some(pattern) = tag_pattern {
                 SoarError::Custom(format!(
                     "No releases found for {} matching tag pattern '{}'",
-                    repo,
-                    tag_pattern.unwrap()
+                    repo, pattern
                 ))
             } else {
                 SoarError::Custom(format!("No releases found for {}", repo))
@@ -228,11 +227,10 @@ fn resolve_gitlab(
                     "No release found for {} with version '{}'",
                     repo, ver
                 ))
-            } else if tag_pattern.is_some() {
+            } else if let Some(pattern) = tag_pattern {
                 SoarError::Custom(format!(
                     "No releases found for {} matching tag pattern '{}'",
-                    repo,
-                    tag_pattern.unwrap()
+                    repo, pattern
                 ))
             } else {
                 SoarError::Custom(format!("No releases found for {}", repo))

crates/soar-core/src/package/remote_update.rs

@@ -97,7 +97,7 @@ fn check_github(
 
     let release = releases.iter().find(|r: &&GithubRelease| {
         let prerelease_ok = include_prerelease || !r.is_prerelease();
-        let tag_ok = tag_pattern.map_or(true, |p| fast_glob::glob_match(p, r.tag()));
+        let tag_ok = tag_pattern.is_none_or(|p| fast_glob::glob_match(p, r.tag()));
         prerelease_ok && tag_ok
     });
 
@@ -140,7 +140,7 @@ fn check_gitlab(
 
     let release = releases.iter().find(|r: &&GitLabRelease| {
         let prerelease_ok = include_prerelease || !r.is_prerelease();
-        let tag_ok = tag_pattern.map_or(true, |p| fast_glob::glob_match(p, r.tag()));
+        let tag_ok = tag_pattern.is_none_or(|p| fast_glob::glob_match(p, r.tag()));
         prerelease_ok && tag_ok
     });
 

crates/soar-dl/src/http_client.rs

@@ -353,7 +353,7 @@ mod tests {
 
     #[test]
     fn test_shared_agent_default() {
-        let agent = SharedAgent::default();
+        let agent = SharedAgent;
         let _ = agent.get("https://example.com");
     }
 

crates/soar-utils/src/fs.rs

@@ -383,7 +383,7 @@ mod tests {
 
         // Cleanup: Set back to writable to allow tempdir to be removed.
         let mut perms = fs::metadata(&read_only_dir).unwrap().permissions();
-        perms.set_readonly(false);
+        perms.set_mode(0o755);
         fs::set_permissions(&read_only_dir, perms).unwrap();
     }
 
@@ -405,7 +405,7 @@ mod tests {
 
         // Cleanup: Set back to writable to allow tempdir to be removed.
         let mut perms = fs::metadata(&sub_dir).unwrap().permissions();
-        perms.set_readonly(false);
+        perms.set_mode(0o755);
         fs::set_permissions(&sub_dir, perms).unwrap();
     }
 
@@ -427,7 +427,7 @@ mod tests {
 
         // Cleanup: Set back to writable to allow tempdir to be removed.
         let mut perms = fs::metadata(&sub_dir).unwrap().permissions();
-        perms.set_readonly(false);
+        perms.set_mode(0o755);
         fs::set_permissions(&sub_dir, perms).unwrap();
     }
 
@@ -471,7 +471,7 @@ mod tests {
 
         // Cleanup: Set back to writable to allow tempdir to be removed.
         let mut perms = fs::metadata(dir.path()).unwrap().permissions();
-        perms.set_readonly(false);
+        perms.set_mode(0o755);
         fs::set_permissions(dir.path(), perms).unwrap();
     }
 
@@ -717,7 +717,7 @@ mod tests {
 
         // Cleanup: Set back to writable to allow tempdir to be removed.
         let mut perms = fs::metadata(tempdir.path()).unwrap().permissions();
-        perms.set_readonly(false);
+        perms.set_mode(0o755);
         fs::set_permissions(tempdir.path(), perms).unwrap();
     }
 }