diff options
Diffstat (limited to 'crates/shirabe/src/dependency_resolver/rule_set_iterator.rs')
| -rw-r--r-- | crates/shirabe/src/dependency_resolver/rule_set_iterator.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs index 73c406f..c1b8657 100644 --- a/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs +++ b/crates/shirabe/src/dependency_resolver/rule_set_iterator.rs @@ -1,12 +1,15 @@ //! ref: composer/src/Composer/DependencyResolver/RuleSetIterator.php +use std::cell::RefCell; +use std::rc::Rc; + use crate::dependency_resolver::Rule; use indexmap::IndexMap; /// Implements PHP \Iterator over a grouped rule set. #[derive(Debug)] pub struct RuleSetIterator { - pub(crate) rules: IndexMap<i64, Vec<Box<dyn Rule>>>, + pub(crate) rules: IndexMap<i64, Vec<Rc<RefCell<Rule>>>>, pub(crate) types: Vec<i64>, pub(crate) current_offset: i64, pub(crate) current_type: i64, @@ -14,7 +17,7 @@ pub struct RuleSetIterator { } impl RuleSetIterator { - pub fn new(rules: IndexMap<i64, Vec<Box<dyn Rule>>>) -> Self { + pub fn new(rules: IndexMap<i64, Vec<Rc<RefCell<Rule>>>>) -> Self { let mut types: Vec<i64> = rules.keys().copied().collect(); types.sort(); let mut iter = Self { @@ -28,8 +31,8 @@ impl RuleSetIterator { iter } - pub fn current(&self) -> &dyn Rule { - &*self.rules[&self.current_type][self.current_offset as usize] + pub fn current(&self) -> Rc<RefCell<Rule>> { + self.rules[&self.current_type][self.current_offset as usize].clone() } pub fn key(&self) -> i64 { |
