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/package/loader/root_package_loader.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crates/shirabe/src/package/loader') diff --git a/crates/shirabe/src/package/loader/root_package_loader.rs b/crates/shirabe/src/package/loader/root_package_loader.rs index 231c807..5d66931 100644 --- a/crates/shirabe/src/package/loader/root_package_loader.rs +++ b/crates/shirabe/src/package/loader/root_package_loader.rs @@ -27,7 +27,7 @@ use crate::util::ProcessExecutor; #[derive(Debug)] pub struct RootPackageLoader { inner: ArrayLoader, - manager: RepositoryManager, + manager: std::rc::Rc>, config: std::rc::Rc>, version_guesser: VersionGuesser, io: Option>, @@ -35,7 +35,7 @@ pub struct RootPackageLoader { impl RootPackageLoader { pub fn new( - manager: RepositoryManager, + manager: std::rc::Rc>, config: std::rc::Rc>, parser: Option, version_guesser: Option, @@ -281,10 +281,10 @@ impl RootPackageLoader { let repos = RepositoryFactory::default_repos( None, Some(std::rc::Rc::clone(&self.config)), - Some(&mut self.manager), + Some(&mut *self.manager.borrow_mut()), )?; for (_, repo) in repos { - self.manager.add_repository(repo); + self.manager.borrow_mut().add_repository(repo); } // TODO(phase-b): Config::get_repositories returns IndexMap, but // set_repositories expects Vec>; pass empty placeholder. -- cgit v1.3.1