From 2a1696906344cb4da768a940bf8b1f89bbc82b47 Mon Sep 17 00:00:00 2001 From: nsfisis Date: Fri, 22 May 2026 04:19:14 +0900 Subject: refactor: share Pool via Rc Convert Pool to Rc> so Solver, Decisions, and RuleSetGenerator share it, resolving the todo!() placeholders that blocked the dependency resolver (Phase C shared ownership). Co-Authored-By: Claude Opus 4.7 (1M context) --- crates/shirabe/src/dependency_resolver/rule_set_generator.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/rule_set_generator.rs') diff --git a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs index 57d1d18..2d99d7f 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_generator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_generator.rs @@ -24,14 +24,17 @@ use crate::package::PackageInterface; #[derive(Debug)] pub struct RuleSetGenerator { pub(crate) policy: Box, - pub(crate) pool: Pool, + pub(crate) pool: std::rc::Rc>, pub(crate) rules: RuleSet, pub(crate) added_map: IndexMap>, pub(crate) added_packages_by_names: IndexMap>>, } impl RuleSetGenerator { - pub fn new(policy: Box, pool: Pool) -> Self { + pub fn new( + policy: Box, + pool: std::rc::Rc>, + ) -> Self { Self { policy, pool, @@ -221,6 +224,7 @@ impl RuleSetGenerator { let possible_requires: Vec> = self .pool + .borrow_mut() .what_provides(link.get_target(), Some(&*constraint)) .into_iter() .map(|p| p.clone_package_box()) @@ -276,6 +280,7 @@ impl RuleSetGenerator { let conflicts = self .pool + .borrow_mut() .what_provides(link.get_target(), Some(&*constraint)); for conflict in &conflicts { @@ -327,6 +332,7 @@ impl RuleSetGenerator { // fixed package was not added to the pool as it did not pass the stability requirements, this is fine if self .pool + .borrow() .is_unacceptable_fixed_or_locked_package(package.as_ref()) { continue; @@ -373,6 +379,7 @@ impl RuleSetGenerator { let packages: Vec> = self .pool + .borrow_mut() .what_provides(package_name, Some(&*constraint)) .into_iter() .map(|p| p.clone_package_box()) @@ -412,6 +419,7 @@ impl RuleSetGenerator { ) { let packages: Vec> = self .pool + .borrow() .get_packages() .iter() .map(|p| p.clone_box()) -- cgit v1.3.1