From efec43b3b8827820cf35fe1b73d8e33f5fe84eb4 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Sat, 20 Jun 2026 01:16:50 +0900
Subject: refactor: auto-fix clippy warnings

---
 .../package/archiver/archivable_files_filter.rs    |  4 ++--
 .../src/package/archiver/archive_manager.rs        | 26 +++++++++++-----------
 .../shirabe/src/package/archiver/phar_archiver.rs  |  6 +++++
 .../shirabe/src/package/archiver/zip_archiver.rs   |  6 +++++
 4 files changed, 27 insertions(+), 15 deletions(-)

(limited to 'crates/shirabe/src/package/archiver')

diff --git a/crates/shirabe/src/package/archiver/archivable_files_filter.rs b/crates/shirabe/src/package/archiver/archivable_files_filter.rs
index f820e08..ee39ba3 100644
--- a/crates/shirabe/src/package/archiver/archivable_files_filter.rs
+++ b/crates/shirabe/src/package/archiver/archivable_files_filter.rs
@@ -1,7 +1,7 @@
 //! ref: composer/src/Composer/Package/Archiver/ArchivableFilesFilter.php
 
 use shirabe_php_shim::PharData;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 
 pub struct ArchivableFilesFilter {
     inner: Box<dyn Iterator<Item = PathBuf>>,
@@ -16,7 +16,7 @@ impl ArchivableFilesFilter {
         }
     }
 
-    fn accept(&mut self, file: &PathBuf) -> bool {
+    fn accept(&mut self, file: &Path) -> bool {
         if file.is_dir() {
             self.dirs.push(file.to_string_lossy().into_owned());
             return false;
diff --git a/crates/shirabe/src/package/archiver/archive_manager.rs b/crates/shirabe/src/package/archiver/archive_manager.rs
index cb15b76..2c9eb35 100644
--- a/crates/shirabe/src/package/archiver/archive_manager.rs
+++ b/crates/shirabe/src/package/archiver/archive_manager.rs
@@ -198,20 +198,20 @@ impl ArchiveManager {
                 let mut json_file = JsonFile::new(composer_json_path, None, None)?;
                 let json_data = json_file.read()?;
                 if let Some(archive) = json_data.get("archive") {
-                    if let Some(name) = archive.get("name").and_then(|v| v.as_string()) {
-                        if !name.is_empty() {
-                            package.set_archive_name(name.to_string());
-                        }
+                    if let Some(name) = archive.get("name").and_then(|v| v.as_string())
+                        && !name.is_empty()
+                    {
+                        package.set_archive_name(name.to_string());
                     }
-                    if let Some(exclude) = archive.get("exclude") {
-                        if let Some(excludes) = exclude.as_array() {
-                            let excludes: Vec<String> = excludes
-                                .values()
-                                .filter_map(|v| v.as_string().map(|s| s.to_string()))
-                                .collect();
-                            if !excludes.is_empty() {
-                                package.set_archive_excludes(excludes);
-                            }
+                    if let Some(exclude) = archive.get("exclude")
+                        && let Some(excludes) = exclude.as_array()
+                    {
+                        let excludes: Vec<String> = excludes
+                            .values()
+                            .filter_map(|v| v.as_string().map(|s| s.to_string()))
+                            .collect();
+                        if !excludes.is_empty() {
+                            package.set_archive_excludes(excludes);
                         }
                     }
                 }
diff --git a/crates/shirabe/src/package/archiver/phar_archiver.rs b/crates/shirabe/src/package/archiver/phar_archiver.rs
index d2854eb..c25b90b 100644
--- a/crates/shirabe/src/package/archiver/phar_archiver.rs
+++ b/crates/shirabe/src/package/archiver/phar_archiver.rs
@@ -29,6 +29,12 @@ fn compress_formats() -> IndexMap<&'static str, i64> {
 #[derive(Debug)]
 pub struct PharArchiver;
 
+impl Default for PharArchiver {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl PharArchiver {
     pub fn new() -> Self {
         Self
diff --git a/crates/shirabe/src/package/archiver/zip_archiver.rs b/crates/shirabe/src/package/archiver/zip_archiver.rs
index 7d9f126..41201b5 100644
--- a/crates/shirabe/src/package/archiver/zip_archiver.rs
+++ b/crates/shirabe/src/package/archiver/zip_archiver.rs
@@ -13,6 +13,12 @@ use std::path::PathBuf;
 #[derive(Debug)]
 pub struct ZipArchiver;
 
+impl Default for ZipArchiver {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ZipArchiver {
     pub fn new() -> Self {
         Self
-- 
cgit v1.3.1