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/command/install_command.rs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'crates/shirabe/src/command/install_command.rs') diff --git a/crates/shirabe/src/command/install_command.rs b/crates/shirabe/src/command/install_command.rs index 666833d..632ccb1 100644 --- a/crates/shirabe/src/command/install_command.rs +++ b/crates/shirabe/src/command/install_command.rs @@ -100,9 +100,10 @@ impl InstallCommand { return Ok(1); } - let mut composer = self.require_composer(None, None)?; + let composer_handle = self.require_composer(None, None)?; + let mut composer = crate::command::composer_full_mut(&composer_handle); - if !composer.get_locker_mut().is_locked() && !HttpDownloader::is_curl_enabled() { + if !composer.get_locker().borrow_mut().is_locked() && !HttpDownloader::is_curl_enabled() { io.write_error("Composer is operating significantly slower than normal because you do not have the PHP curl extension enabled."); } @@ -113,9 +114,9 @@ impl InstallCommand { .borrow_mut() .dispatch(Some(command_event.get_name()), None); - let mut install = Installer::create(io.clone_box(), &composer); + let mut install = Installer::create(io.clone_box(), &composer_handle); - let config = std::rc::Rc::clone(composer.get_config()); + let config = composer.get_config(); let (prefer_source, prefer_dist) = self.get_preferred_install_options(&*config.borrow(), input, false)?; @@ -153,7 +154,8 @@ impl InstallCommand { .unwrap_or(false); composer - .get_installation_manager_mut() + .get_installation_manager() + .borrow_mut() .set_output_progress(!input.get_option("no-progress").as_bool().unwrap_or(false)); install -- cgit v1.3.1