From 0b06f54103490e3ce5658e82bbc0119633e26cd8 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 22 May 2026 01:29:48 +0900 Subject: refactor(composer): unify Composer/PartialComposer via Rc handles Model PHP's `Composer extends PartialComposer` as a PartialOrFullComposer enum and merge partial_composer.rs into composer.rs. Introduce ComposerHandle / PartialComposerHandle (plus their Weak variants) so the graph can be shared, and build it at once with Rc::new_cyclic in the factory to resolve the back-reference cycles. Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/util/http_downloader.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crates/shirabe/src/util/http_downloader.rs') diff --git a/crates/shirabe/src/util/http_downloader.rs b/crates/shirabe/src/util/http_downloader.rs index 8c8b8ef..b5a4923 100644 --- a/crates/shirabe/src/util/http_downloader.rs +++ b/crates/shirabe/src/util/http_downloader.rs @@ -14,7 +14,8 @@ use shirabe_php_shim::{ }; use shirabe_semver::constraint::Constraint; -use crate::composer::Composer; +use crate::composer; +use crate::composer::ComposerHandle; use crate::config::Config; use crate::downloader::TransportException; use crate::exception::IrrecoverableDownloadException; @@ -595,7 +596,7 @@ impl HttpDownloader { .parse_constraints(versions_value.as_string().unwrap_or(""))?; let composer_constraint = Constraint::new( "==", - &version_parser.normalize(&Composer::get_version(), None)?, + &version_parser.normalize(&composer::get_version(), None)?, ); if !constraint.matches(&composer_constraint) { continue; @@ -633,7 +634,7 @@ impl HttpDownloader { )?; let composer_constraint = Constraint::new( "==", - &version_parser.normalize(&Composer::get_version(), None)?, + &version_parser.normalize(&composer::get_version(), None)?, ); if !constraint.matches(&composer_constraint) { continue; -- cgit v1.3.1