From f411daceacad66e0bd774fda7d3c5ef8533cc55c Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 26 May 2026 20:04:02 +0900 Subject: refactor(io): share IOInterface via Rc> handle Co-Authored-By: Claude Opus 4.7 --- crates/shirabe/src/package/loader/root_package_loader.rs | 9 +++++---- crates/shirabe/src/package/locker.rs | 2 +- crates/shirabe/src/package/version/version_guesser.rs | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/package') diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index e235e31..1b4d155 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -8,6 +8,7 @@ use shirabe_php_shim::{ use crate::config::Config; use crate::io::IOInterface; +use crate::io::IOInterfaceImmutable; use crate::package::CompletePackageInterface; use crate::package::PackageInterface; use crate::package::RootAliasPackage; @@ -30,7 +31,7 @@ pub struct RootPackageLoader { manager: std::rc::Rc>, config: std::rc::Rc>, version_guesser: VersionGuesser, - io: Option>, + io: Option>>, } impl RootPackageLoader { @@ -39,17 +40,17 @@ impl RootPackageLoader { config: std::rc::Rc>, parser: Option, version_guesser: Option, - io: Option>, + io: Option>>, ) -> Self { let inner = ArrayLoader::new(parser, true); let version_guesser = version_guesser.unwrap_or_else(|| { - let mut process_executor = ProcessExecutor::new(io.as_deref().map(|i| i.clone_box())); + let mut process_executor = ProcessExecutor::new(io.clone()); process_executor.enable_async(); VersionGuesser::new( config.clone(), std::rc::Rc::new(std::cell::RefCell::new(process_executor)), inner.version_parser.clone(), - io.as_ref().map(|i| i.clone_box()), + io.clone(), ) }); Self { diff --git a/crates/shirabe/src/package/locker.rs b/crates/shirabe/src/package/locker.rs index bdeb391..8ba2cc2 100644 --- a/crates/shirabe/src/package/locker.rs +++ b/crates/shirabe/src/package/locker.rs @@ -60,7 +60,7 @@ pub struct Locker { impl Locker { /// Initializes packages locker. pub fn new( - io: Box, + io: std::rc::Rc>, lock_file: JsonFile, installation_manager: std::rc::Rc>, composer_file_contents: &str, diff --git a/crates/shirabe/src/package/version/version_guesser.rs b/crates/shirabe/src/package/version/version_guesser.rs index 47054a4..c7ffd65 100644 --- a/crates/shirabe/src/package/version/version_guesser.rs +++ b/crates/shirabe/src/package/version/version_guesser.rs @@ -37,7 +37,7 @@ pub struct VersionGuesser { version_parser: VersionParser, /// @var IOInterface|null - io: Option>, + io: Option>>, } /// PHP: @phpstan-type Version array{version, commit, pretty_version, feature_version?, feature_pretty_version?} @@ -55,7 +55,7 @@ impl VersionGuesser { config: std::rc::Rc>, process: std::rc::Rc>, version_parser: VersionParser, - io: Option>, + io: Option>>, ) -> Self { Self { config, @@ -284,7 +284,7 @@ impl VersionGuesser { GitUtil::check_for_repo_ownership_error( &self.process.borrow().get_error_output(), path, - self.io.as_deref(), + self.io.clone(), ); if version.is_none() || is_detached { -- cgit v1.3.1