Skip to content

Commit f80e77b

Browse files
committed
Run cargo fmt after automated changes
1 parent 30c3b09 commit f80e77b

File tree

4 files changed

+34
-27
lines changed

4 files changed

+34
-27
lines changed

evaluator/src/builtins.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -698,12 +698,7 @@ pub fn compile_eager_op(op: &str) -> CompiledExprWithArgs {
698698
Ok(Value::map(set.iter().map(|v| v.as_tuple2()).collect()))
699699
},
700700
// A set of all possible maps with keys and values from the given sets.
701-
"setOfMaps" => |_env, args| {
702-
Ok(Value::map_set(
703-
args[0].clone(),
704-
args[1].clone(),
705-
))
706-
},
701+
"setOfMaps" => |_env, args| Ok(Value::map_set(args[0].clone(), args[1].clone())),
707702
// Expect a value to be false
708703
"fail" => |_env, args| Ok(Value::bool(!args[0].as_bool())),
709704
// Expect a value to be true, returning a runtime error if it is not

evaluator/src/itf.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@ impl Value {
8989
| ValueInner::MapSet(_, _) => {
9090
itf::Value::Set(self.as_set().iter().map(|v| v.to_itf()).collect())
9191
}
92-
ValueInner::Tuple(elems) => itf::Value::Tuple(elems.iter().map(|v| v.to_itf()).collect()),
92+
ValueInner::Tuple(elems) => {
93+
itf::Value::Tuple(elems.iter().map(|v| v.to_itf()).collect())
94+
}
9395
ValueInner::Record(fields) => itf::Value::Record(
9496
fields
9597
.iter()

evaluator/src/normalizer.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ impl Value {
2020
.map(|v| v.normalize())
2121
.collect(),
2222
),
23-
ValueInner::Tuple(elems) => Value::tuple(elems.iter().cloned().map(|v| v.normalize()).collect()),
23+
ValueInner::Tuple(elems) => {
24+
Value::tuple(elems.iter().cloned().map(|v| v.normalize()).collect())
25+
}
2426
ValueInner::Record(fields) => Value::record(
2527
fields
2628
.iter()
@@ -32,7 +34,9 @@ impl Value {
3234
.map(|(k, v)| (k.clone().normalize(), v.clone().normalize()))
3335
.collect(),
3436
),
35-
ValueInner::List(elems) => Value::list(elems.iter().cloned().map(|v| v.normalize()).collect()),
37+
ValueInner::List(elems) => {
38+
Value::list(elems.iter().cloned().map(|v| v.normalize()).collect())
39+
}
3640
ValueInner::Variant(label, value) => {
3741
Value::variant(label.clone(), value.clone().normalize())
3842
}

evaluator/src/value.rs

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ use std::borrow::Cow;
2525
use std::cell::RefCell;
2626
use std::fmt;
2727
use std::hash::{Hash, Hasher};
28-
use std::rc::Rc;
2928
use std::ops::Deref;
29+
use std::rc::Rc;
3030

3131
/// Quint values that hold sets are immutable, use `GenericHashSet` immutable
3232
/// structure to hold them
@@ -187,7 +187,7 @@ impl Eq for ValueInner {}
187187

188188
impl Deref for Value {
189189
type Target = ValueInner;
190-
190+
191191
fn deref(&self) -> &Self::Target {
192192
&self.0
193193
}
@@ -198,55 +198,55 @@ impl Value {
198198
pub fn int(n: i64) -> Self {
199199
Value(Rc::new(ValueInner::Int(n)))
200200
}
201-
201+
202202
pub fn bool(b: bool) -> Self {
203203
Value(Rc::new(ValueInner::Bool(b)))
204204
}
205-
205+
206206
pub fn str(s: Str) -> Self {
207207
Value(Rc::new(ValueInner::Str(s)))
208208
}
209-
209+
210210
pub fn set(s: ImmutableSet<Value>) -> Self {
211211
Value(Rc::new(ValueInner::Set(s)))
212212
}
213-
213+
214214
pub fn tuple(t: ImmutableVec<Value>) -> Self {
215215
Value(Rc::new(ValueInner::Tuple(t)))
216216
}
217-
217+
218218
pub fn record(r: ImmutableMap<QuintName, Value>) -> Self {
219219
Value(Rc::new(ValueInner::Record(r)))
220220
}
221-
221+
222222
pub fn map(m: ImmutableMap<Value, Value>) -> Self {
223223
Value(Rc::new(ValueInner::Map(m)))
224224
}
225-
225+
226226
pub fn list(l: ImmutableVec<Value>) -> Self {
227227
Value(Rc::new(ValueInner::List(l)))
228228
}
229-
229+
230230
pub fn lambda(registers: Vec<Rc<RefCell<EvalResult>>>, body: CompiledExpr) -> Self {
231231
Value(Rc::new(ValueInner::Lambda(registers, body)))
232232
}
233-
233+
234234
pub fn variant(name: QuintName, value: Value) -> Self {
235235
Value(Rc::new(ValueInner::Variant(name, value)))
236236
}
237-
237+
238238
pub fn interval(start: i64, end: i64) -> Self {
239239
Value(Rc::new(ValueInner::Interval(start, end)))
240240
}
241-
241+
242242
pub fn cross_product(values: Vec<Value>) -> Self {
243243
Value(Rc::new(ValueInner::CrossProduct(values)))
244244
}
245-
245+
246246
pub fn power_set(value: Value) -> Self {
247247
Value(Rc::new(ValueInner::PowerSet(value)))
248248
}
249-
249+
250250
pub fn map_set(a: Value, b: Value) -> Self {
251251
Value(Rc::new(ValueInner::MapSet(a, b)))
252252
}
@@ -260,7 +260,9 @@ impl Value {
260260
ValueInner::Map(map) => map.len(),
261261
ValueInner::List(elems) => elems.len(),
262262
ValueInner::Interval(start, end) => (end - start + 1).try_into().unwrap(),
263-
ValueInner::CrossProduct(sets) => sets.iter().fold(1, |acc, set| acc * set.cardinality()),
263+
ValueInner::CrossProduct(sets) => {
264+
sets.iter().fold(1, |acc, set| acc * set.cardinality())
265+
}
264266
ValueInner::PowerSet(value) => {
265267
// 2^(cardinality of value)
266268
2_usize.pow(value.cardinality().try_into().unwrap())
@@ -314,7 +316,9 @@ impl Value {
314316
.zip(supersets)
315317
.all(|(subset, superset)| subset.subseteq(superset))
316318
}
317-
(ValueInner::PowerSet(subset), ValueInner::PowerSet(superset)) => subset.subseteq(superset),
319+
(ValueInner::PowerSet(subset), ValueInner::PowerSet(superset)) => {
320+
subset.subseteq(superset)
321+
}
318322
(
319323
ValueInner::MapSet(subset_domain, subset_range),
320324
ValueInner::MapSet(superset_domain, superset_range),
@@ -374,7 +378,9 @@ impl Value {
374378
pub fn as_set(&self) -> Cow<'_, ImmutableSet<Value>> {
375379
match self.0.as_ref() {
376380
ValueInner::Set(set) => Cow::Borrowed(set),
377-
ValueInner::Interval(start, end) => Cow::Owned((*start..=*end).map(Value::int).collect()),
381+
ValueInner::Interval(start, end) => {
382+
Cow::Owned((*start..=*end).map(Value::int).collect())
383+
}
378384
ValueInner::CrossProduct(sets) => {
379385
let size = self.cardinality();
380386
if size == 0 {

0 commit comments

Comments
 (0)