From a8623a5e867825400073d2597dfb3118d6624ef7 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 24 Jun 2026 04:51:47 +0900 Subject: chore: unwrap meaningless PhpMixed::String() --- crates/shirabe/src/downloader/download_manager.rs | 12 ++++++------ crates/shirabe/src/downloader/git_downloader.rs | 5 +---- crates/shirabe/src/downloader/vcs_downloader.rs | 6 +++--- 3 files changed, 10 insertions(+), 13 deletions(-) (limited to 'crates/shirabe/src/downloader') diff --git a/crates/shirabe/src/downloader/download_manager.rs b/crates/shirabe/src/downloader/download_manager.rs index 23b025f..15275a9 100644 --- a/crates/shirabe/src/downloader/download_manager.rs +++ b/crates/shirabe/src/downloader/download_manager.rs @@ -112,8 +112,8 @@ impl DownloadManager { return Err(InvalidArgumentException { message: format!( "Unknown downloader type: {}. Available types: {}.", - PhpMixed::String(r#type), - PhpMixed::String(implode(", ", &array_keys(&self.downloaders))), + r#type, + implode(", ", &array_keys(&self.downloaders)), ), code: 0, } @@ -159,10 +159,10 @@ impl DownloadManager { return Err(LogicException { message: format!( "Downloader \"{}\" is a {} type downloader and can not be used to download {} for package {}", - PhpMixed::String(shirabe_php_shim::get_class_obj(&*downloader.borrow())), - PhpMixed::String(downloader_installation_source), - PhpMixed::String(installation_source.clone().unwrap_or_default()), - PhpMixed::String(package.to_string()), + shirabe_php_shim::get_class_obj(&*downloader.borrow()), + downloader_installation_source, + installation_source.clone().unwrap_or_default(), + package.to_string(), ), code: 0, } diff --git a/crates/shirabe/src/downloader/git_downloader.rs b/crates/shirabe/src/downloader/git_downloader.rs index 0a6e242..fa7fd16 100644 --- a/crates/shirabe/src/downloader/git_downloader.rs +++ b/crates/shirabe/src/downloader/git_downloader.rs @@ -811,10 +811,7 @@ impl VcsDownloader for GitDownloader { io_interface::NORMAL, ); self.inner.io.write_error3( - &format!( - " Cloning to cache at {}", - PhpMixed::String(cache_path.clone()), - ), + &format!(" Cloning to cache at {}", cache_path.clone()), true, io_interface::DEBUG, ); diff --git a/crates/shirabe/src/downloader/vcs_downloader.rs b/crates/shirabe/src/downloader/vcs_downloader.rs index 482a343..78b3ae7 100644 --- a/crates/shirabe/src/downloader/vcs_downloader.rs +++ b/crates/shirabe/src/downloader/vcs_downloader.rs @@ -161,7 +161,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io().write_error3( - &format!("Failed: [{}] {}", get_class_err(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e), true, io_interface::NORMAL, ); @@ -265,7 +265,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io().write_error3( - &format!("Failed: [{}] {}", get_class_err(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e), true, io_interface::NORMAL, ); @@ -334,7 +334,7 @@ pub trait VcsDownloader: } if self.io().is_debug() { self.io().write_error3( - &format!("Failed: [{}] {}", get_class_err(&e), e,), + &format!("Failed: [{}] {}", get_class_err(&e), e), true, io_interface::NORMAL, ); -- cgit v1.3.1