From 2914770fba6b3cc03a68fae493f60470a41962ec Mon Sep 17 00:00:00 2001 From: nsfisis Date: Wed, 20 May 2026 09:54:30 +0900 Subject: refactor: re-export module items to shorten import paths --- crates/shirabe/src/downloader/zip_downloader.rs | 36 +++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-) (limited to 'crates/shirabe/src/downloader/zip_downloader.rs') diff --git a/crates/shirabe/src/downloader/zip_downloader.rs b/crates/shirabe/src/downloader/zip_downloader.rs index 835c118..7cd5000 100644 --- a/crates/shirabe/src/downloader/zip_downloader.rs +++ b/crates/shirabe/src/downloader/zip_downloader.rs @@ -1,17 +1,17 @@ //! ref: composer/src/Composer/Downloader/ZipDownloader.php -use crate::downloader::archive_downloader::ArchiveDownloader; -use crate::downloader::downloader_interface::DownloaderInterface; -use crate::downloader::file_downloader::FileDownloader; -use crate::package::package_interface::PackageInterface; -use crate::util::ini_helper::IniHelper; -use crate::util::platform::Platform; +use crate::downloader::ArchiveDownloader; +use crate::downloader::DownloaderInterface; +use crate::downloader::FileDownloader; +use crate::package::PackageInterface; +use crate::util::IniHelper; +use crate::util::Platform; use anyhow::Result; use indexmap::IndexMap; -use shirabe_external_packages::composer::pcre::preg::{CaptureKey, Preg}; -use shirabe_external_packages::react::promise::promise_interface::PromiseInterface; -use shirabe_external_packages::symfony::component::process::executable_finder::ExecutableFinder; -use shirabe_external_packages::symfony::component::process::process::Process; +use shirabe_external_packages::composer::pcre::{CaptureKey, Preg}; +use shirabe_external_packages::react::promise::PromiseInterface; +use shirabe_external_packages::symfony::component::process::ExecutableFinder; +use shirabe_external_packages::symfony::component::process::Process; use shirabe_php_shim::{ DIRECTORY_SEPARATOR, ErrorException, RuntimeException, UnexpectedValueException, ZipArchive, bin2hex, class_exists, file_exists, file_get_contents, filesize, function_exists, hash_file, @@ -33,19 +33,15 @@ pub struct ZipDownloader { impl ZipDownloader { pub fn new( - io: Box, + io: Box, config: std::rc::Rc>, - http_downloader: std::rc::Rc< - std::cell::RefCell, - >, + http_downloader: std::rc::Rc>, event_dispatcher: Option< - std::rc::Rc< - std::cell::RefCell, - >, + std::rc::Rc>, >, cache: Option, - filesystem: std::rc::Rc>, - process: std::rc::Rc>, + filesystem: std::rc::Rc>, + process: std::rc::Rc>, ) -> Self { Self { inner: FileDownloader::new( @@ -426,7 +422,7 @@ impl ZipDownloader { // TODO(phase-b): ZipDownloader::download is overridden with extra setup (UNZIP_COMMANDS init, // etc.). The trait method here delegates straight to the inner FileDownloader; the bespoke // override on the struct itself takes &mut self and is not yet routed through the trait. -impl crate::downloader::downloader_interface::DownloaderInterface for ZipDownloader { +impl crate::downloader::DownloaderInterface for ZipDownloader { fn get_installation_source(&self) -> String { self.inner.get_installation_source() } -- cgit v1.3.1