From f5b987a00712211b7ce56300851182bda904e97b Mon Sep 17 00:00:00 2001 From: nsfisis Date: Sat, 23 May 2026 17:33:56 +0900 Subject: refactor(resolver): change Rule to a closed enum Co-Authored-By: Claude Opus 4.7 --- crates/shirabe/src/dependency_resolver/decisions.rs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'crates/shirabe/src/dependency_resolver/decisions.rs') diff --git a/crates/shirabe/src/dependency_resolver/decisions.rs b/crates/shirabe/src/dependency_resolver/decisions.rs index f0842d9..3b82883 100644 --- a/crates/shirabe/src/dependency_resolver/decisions.rs +++ b/crates/shirabe/src/dependency_resolver/decisions.rs @@ -10,7 +10,7 @@ use std::fmt; pub struct Decisions { pub(crate) pool: std::rc::Rc>, pub(crate) decision_map: IndexMap, - pub(crate) decision_queue: Vec<(i64, Box)>, + pub(crate) decision_queue: Vec<(i64, std::rc::Rc>)>, iterator_cursor: Option, } @@ -36,7 +36,7 @@ impl Decisions { } } - pub fn decide(&mut self, literal: i64, level: i64, why: Box) { + pub fn decide(&mut self, literal: i64, level: i64, why: std::rc::Rc>) { self.add_decision(literal, level); self.decision_queue.push((literal, why)); } @@ -90,12 +90,15 @@ impl Decisions { 0 } - pub fn decision_rule(&self, literal_or_package_id: i64) -> &dyn Rule { + pub fn decision_rule( + &self, + literal_or_package_id: i64, + ) -> std::rc::Rc> { let package_id = literal_or_package_id.abs(); for decision in &self.decision_queue { if package_id == decision.0.abs() { - return &*decision.1; + return decision.1.clone(); } } @@ -112,7 +115,7 @@ impl Decisions { ); } - pub fn at_offset(&self, queue_offset: usize) -> &(i64, Box) { + pub fn at_offset(&self, queue_offset: usize) -> &(i64, std::rc::Rc>) { &self.decision_queue[queue_offset] } @@ -120,8 +123,8 @@ impl Decisions { queue_offset >= 0 && queue_offset < self.decision_queue.len() as i64 } - pub fn last_reason(&self) -> &dyn Rule { - &*self.decision_queue[self.decision_queue.len() - 1].1 + pub fn last_reason(&self) -> std::rc::Rc> { + self.decision_queue[self.decision_queue.len() - 1].1.clone() } pub fn last_literal(&self) -> i64 { @@ -159,7 +162,7 @@ impl Decisions { } } - pub fn current(&self) -> Option<&(i64, Box)> { + pub fn current(&self) -> Option<&(i64, std::rc::Rc>)> { self.iterator_cursor .and_then(|cursor| self.decision_queue.get(cursor)) } -- cgit v1.3.1