clippy

zokrates_cli/src/ops/check.rs

@@ -74,7 +74,7 @@ fn cli_check<T: Field>(sub_matches: &ArgMatches) -> Result<(), String> {
         format!(
             "{}:{}",
             file.strip_prefix(std::env::current_dir().unwrap())
-                .unwrap_or_else(|_| file.as_path())
+                .unwrap_or(file.as_path())
                 .display(),
             e.value()
         )

zokrates_cli/src/ops/compile.rs

@@ -90,7 +90,7 @@ fn cli_compile<T: Field>(sub_matches: &ArgMatches) -> Result<(), String> {
         format!(
             "{}:{}",
             file.strip_prefix(std::env::current_dir().unwrap())
-                .unwrap_or_else(|_| file.as_path())
+                .unwrap_or(file.as_path())
                 .display(),
             e.value()
         )

zokrates_core/src/absy/mod.rs

@@ -137,6 +137,7 @@ pub enum SymbolDefinition<'ast> {
     Function(FunctionNode<'ast>),
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(Debug, PartialEq, Clone)]
 pub enum Symbol<'ast> {
     Here(SymbolDefinition<'ast>),

zokrates_core/src/static_analysis/reducer/mod.rs

@@ -257,8 +257,7 @@ impl<'ast, 'a, T: Field> ResultFolder<'ast, T> for Reducer<'ast, 'a, T> {
             }
             Err(InlineError::Generic(decl, conc)) => Err(Error::Incompatible(format!(
                 "Call site `{}` incompatible with declaration `{}`",
-                conc.to_string(),
+                conc, decl
-                decl.to_string()
             ))),
             Err(InlineError::NonConstant(key, generics, arguments, _)) => {
                 self.complete = false;
@@ -388,8 +387,7 @@ impl<'ast, 'a, T: Field> ResultFolder<'ast, T> for Reducer<'ast, 'a, T> {
                     }
                     Err(InlineError::Generic(decl, conc)) => Err(Error::Incompatible(format!(
                         "Call site `{}` incompatible with declaration `{}`",
-                        conc.to_string(),
+                        conc, decl
-                        decl.to_string()
                     ))),
                     Err(InlineError::NonConstant(key, generics, arguments, output_types)) => {
                         self.complete = false;
@@ -442,8 +440,7 @@ impl<'ast, 'a, T: Field> ResultFolder<'ast, T> for Reducer<'ast, 'a, T> {
                                     UExpression::from(index as u32).into(),
                                 ))
                                 .chain(statements.clone().into_iter())
-                                .map(|s| transformer.fold_statement(s))
+                                .flat_map(|s| transformer.fold_statement(s))
-                                .flatten()
                                 .collect();
 
                             out_statements.extend(statements);

zokrates_core/src/static_analysis/zir_propagation.rs

@@ -147,7 +147,7 @@ impl<'ast, T: Field> ResultFolder<'ast, T> for ZirPropagator<'ast, T> {
                     UExpressionInner::Value(v) => e
                         .get(v as usize)
                         .cloned()
-                        .ok_or_else(|| Error::OutOfBounds(v, e.len() as u128)),
+                        .ok_or(Error::OutOfBounds(v, e.len() as u128)),
                     i => Ok(FieldElementExpression::Select(
                         e,
                         box i.annotate(UBitwidth::B32),
@@ -279,7 +279,7 @@ impl<'ast, T: Field> ResultFolder<'ast, T> for ZirPropagator<'ast, T> {
                     UExpressionInner::Value(v) => e
                         .get(*v as usize)
                         .cloned()
-                        .ok_or_else(|| Error::OutOfBounds(*v, e.len() as u128)),
+                        .ok_or(Error::OutOfBounds(*v, e.len() as u128)),
                     _ => Ok(BooleanExpression::Select(e, box index)),
                 }
             }
@@ -498,7 +498,7 @@ impl<'ast, T: Field> ResultFolder<'ast, T> for ZirPropagator<'ast, T> {
                     UExpressionInner::Value(v) => e
                         .get(v as usize)
                         .cloned()
-                        .ok_or_else(|| Error::OutOfBounds(v, e.len() as u128))
+                        .ok_or(Error::OutOfBounds(v, e.len() as u128))
                         .map(|e| e.into_inner()),
                     i => Ok(UExpressionInner::Select(e, box i.annotate(UBitwidth::B32))),
                 }

zokrates_core/src/typed_absy/mod.rs

@@ -190,6 +190,7 @@ impl<'ast, T> TypedConstantSymbolDeclaration<'ast, T> {
     }
 }
 
+#[allow(clippy::large_enum_variant)]
 #[derive(PartialEq, Debug, Clone)]
 pub enum TypedSymbolDeclaration<'ast, T> {
     Function(TypedFunctionSymbolDeclaration<'ast, T>),
@@ -424,6 +425,7 @@ impl<'ast, T: Field> Typed<'ast, T> for TypedConstant<'ast, T> {
 }
 
 /// Something we can assign to.
+#[allow(clippy::large_enum_variant)]
 #[derive(Clone, PartialEq, Debug, Hash, Eq, PartialOrd, Ord)]
 pub enum TypedAssignee<'ast, T> {
     Identifier(Variable<'ast, T>),
@@ -1243,8 +1245,7 @@ impl<'ast, T: Clone> ArrayValue<'ast, T> {
     ) -> Option<U> {
         self.0
             .iter()
-            .map(|v| Self::expression_at_aux(v.clone()))
+            .flat_map(|v| Self::expression_at_aux(v.clone()))
-            .flatten()
             .take_while(|e| e.is_some())
             .map(|e| e.unwrap())
             .nth(index)

zokrates_core/src/zir/mod.rs

@@ -344,17 +344,14 @@ impl<'ast, T> Iterator for ConjunctionIterator<BooleanExpression<'ast, T>> {
     type Item = BooleanExpression<'ast, T>;
 
     fn next(&mut self) -> Option<Self::Item> {
-        self.current
+        self.current.pop().and_then(|n| match n {
-            .pop()
+            BooleanExpression::And(box left, box right) => {
-            .map(|n| match n {
+                self.current.push(left);
-                BooleanExpression::And(box left, box right) => {
+                self.current.push(right);
-                    self.current.push(left);
+                self.next()
-                    self.current.push(right);
+            }
-                    self.next()
+            n => Some(n),
-                }
+        })
-                n => Some(n),
-            })
-            .flatten()
     }
 }
 

zokrates_embed/src/ark.rs

@@ -144,17 +144,12 @@ pub fn generate_verify_constraints(
         var_to_index(&vk.h_gamma_g2.y.c1, num_instance_variables),
     ];
 
-    vk_indices.extend(
+    vk_indices.extend(vk.query.iter().flat_map(|q| {
-        vk.query
+        vec![
-            .iter()
+            var_to_index(&q.x, num_instance_variables),
-            .map(|q| {
+            var_to_index(&q.y, num_instance_variables),
-                vec![
+        ]
-                    var_to_index(&q.x, num_instance_variables),
+    }));
-                    var_to_index(&q.y, num_instance_variables),
-                ]
-            })
-            .flatten(),
-    );
 
     let out_index = match &res {
         Boolean::Is(x) => x

zokrates_pest_ast/src/lib.rs

@@ -705,7 +705,7 @@ mod ast {
     #[derive(Debug, FromPest, PartialEq, Clone)]
     #[pest_ast(rule(Rule::assignee_access))]
     pub enum AssigneeAccess<'ast> {
-        Select(ArrayAccess<'ast>),
+        Select(Box<ArrayAccess<'ast>>),
         Member(MemberAccess<'ast>),
     }
 

zokrates_test_derive/src/lib.rs

@@ -28,9 +28,9 @@ fn write_test<W: Write>(test_file: &mut W, test_path: &Path, base_path: &Path) {
             .unwrap()
             .display()
             .to_string()
-            .replace("/", "_")
+            .replace('/', "_")
             .replace(".json", "")
-            .replace(".", "")
+            .replace('.', "")
     );
 
     write!(