Skip to content

Commit 80385c6

Browse files
author
GBathie
committed
Apply clippy
1 parent f361566 commit 80385c6

4 files changed

Lines changed: 9 additions & 12 deletions

File tree

src/algos/beam_search/cache.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl EnumFormulaCache<BoolCharac> for BeamSearchCache {
7676
let iter_size = size - 1;
7777
let iter_formulas = old_lines[iter_size].iter().map(|pf| &pf.f);
7878

79-
let iter_pairs_size = (size + 1) / 2;
79+
let iter_pairs_size = size.div_ceil(2);
8080
let iter_pairs = old_lines
8181
.iter()
8282
.zip(old_lines.iter().rev())
@@ -120,7 +120,7 @@ pub(crate) struct BeamSearchBoolCacheLine<'a> {
120120
max_line_size: usize,
121121
}
122122

123-
impl<'a> BeamSearchBoolCacheLine<'a> {
123+
impl BeamSearchBoolCacheLine<'_> {
124124
fn dominates(&self, f: &BoolFormula) -> Option<<BoolCharac as Hashed>::HashType> {
125125
self.line.iter().find_map(|sv| {
126126
if sv.dominates(f) {
@@ -132,7 +132,7 @@ impl<'a> BeamSearchBoolCacheLine<'a> {
132132
}
133133
}
134134

135-
impl<'a> EnumFormulaCacheLine<BoolCharac> for BeamSearchBoolCacheLine<'a> {
135+
impl EnumFormulaCacheLine<BoolCharac> for BeamSearchBoolCacheLine<'_> {
136136
fn push(&mut self, f: BoolFormula) -> bool {
137137
if self.dominates(&f).is_some() {
138138
return false;

src/bool/cache.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ impl EnumFormulaCache<BoolCharac> for BoolCache {
9090
let iter_size = size - 1;
9191
let iter_formulas = old_lines[iter_size].iter();
9292

93-
let iter_pairs_size = (size + 1) / 2;
93+
let iter_pairs_size = size.div_ceil(2);
9494
let iter_pairs = old_lines
9595
.iter()
9696
.zip(old_lines.iter().rev())
@@ -141,7 +141,7 @@ pub(crate) struct BoolCacheLine<'a> {
141141
size_index: usize,
142142
}
143143

144-
impl<'a> BoolCacheLine<'a> {
144+
impl BoolCacheLine<'_> {
145145
fn dominates(&self, f: &BoolFormula) -> Option<<BoolCharac as Hashed>::HashType> {
146146
// Iterate in reverse order to start with the densest formulas,
147147
// which are more likely to dominate.
@@ -162,7 +162,7 @@ impl<'a> BoolCacheLine<'a> {
162162
}
163163
}
164164

165-
impl<'a> EnumFormulaCacheLine<BoolCharac> for BoolCacheLine<'a> {
165+
impl EnumFormulaCacheLine<BoolCharac> for BoolCacheLine<'_> {
166166
fn push(&mut self, f: BoolFormula) -> bool {
167167
assert_eq!(f.size, self.size_index);
168168
if self.dominates(&f).is_some() {

src/ltl/cache.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl EnumFormulaCache<LtlCharac> for LtlCache {
6262
let iter_size = new_size - 1;
6363
let iter_formulas = old_lines[iter_size].iter();
6464

65-
let iter_pairs_size = (new_size + 1) / 2;
65+
let iter_pairs_size = new_size.div_ceil(2);
6666
let iter_pairs = old_lines
6767
.iter()
6868
.zip(old_lines.iter().rev())
@@ -113,7 +113,7 @@ pub(crate) struct LtlCacheLine<'a> {
113113
hashes: &'a mut FxHashMap<LtlHash, (usize, usize)>,
114114
}
115115

116-
impl<'a> EnumFormulaCacheLine<LtlCharac> for LtlCacheLine<'a> {
116+
impl EnumFormulaCacheLine<LtlCharac> for LtlCacheLine<'_> {
117117
fn push(&mut self, f: LtlFormula) -> bool {
118118
assert_eq!(f.size, self.size_index);
119119
match self.hashes.entry(f.hashed()) {

src/ops/binary.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,7 @@ impl LtlBinaryOp {
2727

2828
/// Whether this LTL operator is boolean.
2929
pub(crate) fn is_boolean(&self) -> bool {
30-
match self {
31-
LtlBinaryOp::Or | LtlBinaryOp::And => true,
32-
_ => false,
33-
}
30+
matches!(self, LtlBinaryOp::Or | LtlBinaryOp::And)
3431
}
3532

3633
/// Apply the operator to two characteristic vectors.

0 commit comments

Comments
 (0)