Skip to content

Commit 904e5b9

Browse files
committed
chore(eq): Fix reviewed changes
1 parent 310c2e1 commit 904e5b9

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

solver/src/collections/ref_store.rs

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -400,10 +400,10 @@ impl<K: Ref, V> RefMap<K, V> {
400400
pub fn insert(&mut self, k: K, v: V) {
401401
let index = k.into();
402402
if index > self.entries.len() {
403-
self.entries.reserve_exact(index - self.entries.len());
404-
}
405-
while self.entries.len() <= index {
406-
self.entries.push(None);
403+
self.entries.reserve(index - self.entries.len());
404+
while self.entries.len() <= index {
405+
self.entries.push(None);
406+
}
407407
}
408408
self.entries[index] = Some(v);
409409
}
@@ -445,8 +445,7 @@ impl<K: Ref, V> RefMap<K, V> {
445445
if index >= self.entries.len() {
446446
None
447447
} else {
448-
let res: &Option<V> = &self.entries[index];
449-
res.as_ref()
448+
self.entries[index].as_ref()
450449
}
451450
}
452451

@@ -455,13 +454,10 @@ impl<K: Ref, V> RefMap<K, V> {
455454
if index >= self.entries.len() {
456455
None
457456
} else {
458-
let res: &mut Option<V> = &mut self.entries[index];
459-
res.as_mut()
457+
self.entries[index].as_mut()
460458
}
461459
}
462460

463-
// pub fn get_many_mut_or_insert<const N: usize>(&mut self, ks: [K; N], default: impl Fn() -> V) -> [&mut V; N] {}
464-
465461
pub fn get_or_insert(&mut self, k: K, default: impl FnOnce() -> V) -> &V {
466462
if !self.contains(k) {
467463
self.insert(k, default())

solver/src/core/state/domains.rs

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,15 +187,6 @@ impl Domains {
187187
self.lb(var) >= self.ub(var)
188188
}
189189

190-
pub fn get_bound(&self, var: VarRef) -> Option<IntCst> {
191-
let (lb, ub) = self.bounds(var);
192-
if lb == ub {
193-
Some(lb)
194-
} else {
195-
None
196-
}
197-
}
198-
199190
pub fn entails(&self, lit: Lit) -> bool {
200191
debug_assert!(!self.doms.entails(lit) || !self.doms.entails(!lit));
201192
self.doms.entails(lit)

solver/src/core/state/snapshot.rs

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ impl<'a> DomainsSnapshot<'a> {
7272
(self.lb(var), self.ub(var))
7373
}
7474

75-
/// Returns Some(bound) is ub = lb
76-
pub fn get_bound(&self, var: impl Into<SignedVar>) -> Option<IntCst> {
77-
let var = var.into();
78-
let (lb, ub) = self.bounds(var);
79-
if lb == ub {
80-
Some(lb)
81-
} else {
82-
None
83-
}
84-
}
85-
8675
/// Returns true if the given literal is entailed by the current state;
8776
pub fn entails(&self, lit: Lit) -> bool {
8877
let curr_ub = self.ub(lit.svar());

0 commit comments

Comments
 (0)