refactor: cleaned up expression-related functions

src/expressions/mod.rs

@@ -61,27 +61,23 @@ impl<T: Debug + Clone + Eq + Hash> Expression<T> {
     }
 
     pub fn n_ary_and(es: Vec<Expression<T>>) -> Expression<T> {
-        And(es.into_iter().map(|e| Box::new(e)).collect())
+        And(es.into_iter().map(Box::new).collect())
     }
 
     pub fn binary_or(e1: Expression<T>, e2: Expression<T>) -> Expression<T> {
         Or(vec![Box::new(e1), Box::new(e2)])
     }
 
     pub fn n_ary_or(es: Vec<Expression<T>>) -> Expression<T> {
-        Or(es.into_iter().map(|e| Box::new(e)).collect())
+        Or(es.into_iter().map(Box::new).collect())
     }
 
     pub fn evaluate(&self, literal_values: &HashMap<T, bool>) -> bool {
         match self {
             Literal(ref t) => *literal_values.get(t).unwrap_or(&false),
             Constant(ref value) => *value,
-            And(ref values) => values
-                .iter()
-                .fold(true, |acc, e| acc && e.evaluate(literal_values)),
-            Or(ref values) => values
-                .iter()
-                .fold(false, |acc, e| acc || e.evaluate(literal_values)),
+            And(ref values) => values.iter().all(|e| e.evaluate(literal_values)),
+            Or(ref values) => values.iter().any(|e| e.evaluate(literal_values)),
             Not(ref x) => !x.evaluate(literal_values),
         }
     }