diff options
| author | nsfisis <nsfisis@gmail.com> | 2026-05-28 03:31:41 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2026-05-28 03:32:04 +0900 |
| commit | c7f53c5d7d581ebf76803650c63ec615b1558dc8 (patch) | |
| tree | c6d83819e82a83cf93ca737b661094a8ea800cec /crates/shirabe/src/command/package_discovery_trait.rs | |
| parent | cc5d73c05a0abca2eebcc8a6afa0b1543ee49850 (diff) | |
| download | php-shirabe-refactor/composer-handles.tar.gz php-shirabe-refactor/composer-handles.tar.zst php-shirabe-refactor/composer-handles.zip | |
refactor(composer): represent composer via trait-based handlesrefactor/composer-handles
Replace the PartialComposer/Composer structs and the single
Rc<RefCell<PartialOrFullComposer>> enum with PartialComposer and
Composer traits (Composer: PartialComposer), InnerPartialComposer /
InnerFullComposer data structs, and the handle types FullComposerHandle
(impl Composer) and AnyComposerHandle (polymorphic enum, impl
PartialComposer), plus their weak variants.
Factory builds the full and partial graphs via separate Rc::new_cyclic
branches that share a build_composer_base helper. Call sites now use
trait methods that encapsulate borrowing instead of borrow_partial() /
composer_full*().
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/command/package_discovery_trait.rs')
| -rw-r--r-- | crates/shirabe/src/command/package_discovery_trait.rs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index d0574c6..e43f401 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -15,7 +15,7 @@ use shirabe_php_shim::{ trim, }; -use crate::composer::PartialComposerHandle; +use crate::composer::{AnyComposerHandle, PartialComposer}; use crate::factory::Factory; use crate::filter::platform_requirement_filter::IgnoreAllPlatformRequirementFilter; use crate::filter::platform_requirement_filter::PlatformRequirementFilterFactory; @@ -40,12 +40,12 @@ pub trait PackageDiscoveryTrait { // PHP: trait dependencies (provided by BaseCommand) fn get_io(&self) -> std::rc::Rc<std::cell::RefCell<dyn IOInterface>>; - fn try_composer(&self) -> Option<PartialComposerHandle>; + fn try_composer(&self) -> Option<AnyComposerHandle>; fn require_composer( &self, disable_plugins: Option<bool>, disable_scripts: Option<bool>, - ) -> PartialComposerHandle; + ) -> AnyComposerHandle; fn get_platform_requirement_filter( &self, input: &dyn InputInterface, @@ -218,10 +218,7 @@ pub trait PackageDiscoveryTrait { // Collect existing packages let composer = self.try_composer(); - let composer_ref = composer.as_ref().map(|c| c.borrow_partial()); - let repository_manager = composer_ref - .as_ref() - .map(|c| c.get_repository_manager().clone()); + let repository_manager = composer.as_ref().map(|c| c.get_repository_manager()); let repository_manager_ref = repository_manager.as_ref().map(|rm| rm.borrow()); let installed_repo = repository_manager_ref .as_ref() @@ -236,7 +233,6 @@ pub trait PackageDiscoveryTrait { drop(installed_repo); drop(repository_manager_ref); drop(repository_manager); - drop(composer_ref); drop(composer); let io = self.get_io(); @@ -816,8 +812,7 @@ pub trait PackageDiscoveryTrait { let mut similar_packages: IndexMap<String, i64> = IndexMap::new(); let composer_for_installed = self.require_composer(None, None); - let composer_for_installed = composer_for_installed.borrow_partial(); - let repository_manager = composer_for_installed.get_repository_manager().clone(); + let repository_manager = composer_for_installed.get_repository_manager(); let repository_manager = repository_manager.borrow(); let installed_repo = repository_manager.get_local_repository(); |
