aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/installer
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-06-27 03:52:05 +0900
committernsfisis <nsfisis@gmail.com>2026-06-27 04:21:34 +0900
commit2b51554ff59d1e5cbf8dd2db65d278b0202a9102 (patch)
treef4d9b0abf4df9b5e363e3bd65511d70e3d5ada00 /crates/shirabe/src/installer
parentcc07b5abb83a40d678401c335bdc49bb81b72c5f (diff)
downloadphp-shirabe-2b51554ff59d1e5cbf8dd2db65d278b0202a9102.tar.gz
php-shirabe-2b51554ff59d1e5cbf8dd2db65d278b0202a9102.tar.zst
php-shirabe-2b51554ff59d1e5cbf8dd2db65d278b0202a9102.zip
refactor: fix compiler warnings and clippy warnings
Diffstat (limited to 'crates/shirabe/src/installer')
-rw-r--r--crates/shirabe/src/installer/binary_installer.rs6
-rw-r--r--crates/shirabe/src/installer/installation_manager.rs8
-rw-r--r--crates/shirabe/src/installer/library_installer.rs2
-rw-r--r--crates/shirabe/src/installer/plugin_installer.rs2
-rw-r--r--crates/shirabe/src/installer/suggested_packages_reporter.rs6
5 files changed, 9 insertions, 15 deletions
diff --git a/crates/shirabe/src/installer/binary_installer.rs b/crates/shirabe/src/installer/binary_installer.rs
index 8e7ade5..a76f69e 100644
--- a/crates/shirabe/src/installer/binary_installer.rs
+++ b/crates/shirabe/src/installer/binary_installer.rs
@@ -147,10 +147,8 @@ impl BinaryInstaller {
// still checking for symlinks here for legacy support
self.filesystem.borrow_mut().unlink(&link);
}
- if is_file(&format!("{}.bat", link)) {
- self.filesystem
- .borrow_mut()
- .unlink(&format!("{}.bat", link));
+ if is_file(format!("{}.bat", link)) {
+ self.filesystem.borrow_mut().unlink(format!("{}.bat", link));
}
}
diff --git a/crates/shirabe/src/installer/installation_manager.rs b/crates/shirabe/src/installer/installation_manager.rs
index e149b41..ac5f8e4 100644
--- a/crates/shirabe/src/installer/installation_manager.rs
+++ b/crates/shirabe/src/installer/installation_manager.rs
@@ -5,8 +5,8 @@ use anyhow::Result;
use indexmap::IndexMap;
use shirabe_external_packages::seld::signal::SignalHandler;
use shirabe_php_shim::{
- InvalidArgumentException, PhpMixed, array_search_mixed, array_splice, array_unshift, count,
- http_build_query, json_encode, str_contains, str_replace, strpos, strtolower, ucfirst,
+ InvalidArgumentException, PhpMixed, array_splice, array_unshift, http_build_query, json_encode,
+ str_contains, str_replace, strpos, strtolower,
};
use crate::dependency_resolver::operation::InstallOperation;
@@ -17,14 +17,10 @@ use crate::dependency_resolver::operation::UninstallOperation;
use crate::dependency_resolver::operation::UpdateOperation;
use crate::downloader::FileDownloader;
use crate::event_dispatcher::EventDispatcher;
-use crate::installer::BinaryPresenceInterface;
use crate::installer::InstallerInterface;
use crate::installer::PackageEvents;
-use crate::installer::PluginInstaller;
-use crate::io::ConsoleIO;
use crate::io::IOInterface;
use crate::io::IOInterfaceImmutable;
-use crate::package::PackageInterface;
use crate::package::PackageInterfaceHandle;
use crate::repository::InstalledRepositoryInterface;
use crate::util::Platform;
diff --git a/crates/shirabe/src/installer/library_installer.rs b/crates/shirabe/src/installer/library_installer.rs
index d716814..e2c6c0c 100644
--- a/crates/shirabe/src/installer/library_installer.rs
+++ b/crates/shirabe/src/installer/library_installer.rs
@@ -1,7 +1,5 @@
//! ref: composer/src/Composer/Installer/LibraryInstaller.php
-use std::any::Any;
-
use anyhow::Result;
use shirabe_external_packages::composer::pcre::Preg;
use shirabe_php_shim::{
diff --git a/crates/shirabe/src/installer/plugin_installer.rs b/crates/shirabe/src/installer/plugin_installer.rs
index 2644639..cd4de0a 100644
--- a/crates/shirabe/src/installer/plugin_installer.rs
+++ b/crates/shirabe/src/installer/plugin_installer.rs
@@ -13,7 +13,7 @@ use crate::repository::InstalledRepositoryInterface;
use crate::util::Filesystem;
use crate::util::Platform;
use anyhow::Result;
-use shirabe_php_shim::{LogicException, PhpMixed, UnexpectedValueException, empty};
+use shirabe_php_shim::{PhpMixed, UnexpectedValueException, empty};
#[derive(Debug)]
pub struct PluginInstaller {
diff --git a/crates/shirabe/src/installer/suggested_packages_reporter.rs b/crates/shirabe/src/installer/suggested_packages_reporter.rs
index 979b4bb..adbfebe 100644
--- a/crates/shirabe/src/installer/suggested_packages_reporter.rs
+++ b/crates/shirabe/src/installer/suggested_packages_reporter.rs
@@ -166,8 +166,10 @@ impl SuggestedPackagesReporter {
) -> anyhow::Result<Vec<IndexMap<String, String>>> {
let suggested_packages = self.get_packages();
let mut installed_names: Vec<String> = Vec::new();
- if installed_repo.is_some() && !suggested_packages.is_empty() {
- for package in installed_repo.unwrap().get_packages()? {
+ if let Some(installed_repo) = installed_repo
+ && !suggested_packages.is_empty()
+ {
+ for package in installed_repo.get_packages()? {
installed_names.extend(package.get_names(true));
}
}