From e8abfb51ea3b12a8196ddfabb6fed202c8437401 Mon Sep 17 00:00:00 2001 From: dark64 Date: Mon, 6 Mar 2023 13:37:12 +0400 Subject: [PATCH] clippy --- zokrates_analysis/src/flat_propagation.rs | 2 +- zokrates_analysis/src/propagation.rs | 2 +- zokrates_analysis/src/uint_optimizer.rs | 6 +++--- zokrates_ark/src/lib.rs | 2 +- zokrates_ast/src/flat/utils.rs | 2 +- zokrates_ast/src/ir/expression.rs | 4 ++-- zokrates_ast/src/ir/mod.rs | 2 +- zokrates_ast/src/zir/lqc.rs | 16 ++++++++-------- zokrates_bellman/src/lib.rs | 2 +- zokrates_codegen/src/lib.rs | 2 +- zokrates_interpreter/src/lib.rs | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/zokrates_analysis/src/flat_propagation.rs b/zokrates_analysis/src/flat_propagation.rs index 155d803c..eb2ca797 100644 --- a/zokrates_analysis/src/flat_propagation.rs +++ b/zokrates_analysis/src/flat_propagation.rs @@ -32,7 +32,7 @@ impl<'ast, T: Field> Folder<'ast, T> for Propagator { match e { FlatExpression::Number(n) => FlatExpression::Number(n), FlatExpression::Identifier(id) => match self.constants.get(&id) { - Some(c) => FlatExpression::Number(c.clone()), + Some(c) => FlatExpression::Number(*c), None => FlatExpression::Identifier(id), }, FlatExpression::Add(box e1, box e2) => { diff --git a/zokrates_analysis/src/propagation.rs b/zokrates_analysis/src/propagation.rs index b7e5c0a1..708ebabb 100644 --- a/zokrates_analysis/src/propagation.rs +++ b/zokrates_analysis/src/propagation.rs @@ -517,7 +517,7 @@ impl<'ast, 'a, T: Field> ResultFolder<'ast, T> for Propagator<'ast, 'a, T> { .unwrap() { FieldElementExpression::Number(num) => { - let mut acc = num.clone(); + let mut acc = num; let mut res = vec![]; for i in (0..bit_width as usize).rev() { diff --git a/zokrates_analysis/src/uint_optimizer.rs b/zokrates_analysis/src/uint_optimizer.rs index ac96dbfe..6a6b217e 100644 --- a/zokrates_analysis/src/uint_optimizer.rs +++ b/zokrates_analysis/src/uint_optimizer.rs @@ -170,7 +170,7 @@ impl<'ast, T: Field> Folder<'ast, T> for UintOptimizer<'ast, T> { left_max .checked_add(&range_max.clone()) .map(|max| (false, true, max)) - .unwrap_or_else(|| (true, true, range_max.clone() + range_max)) + .unwrap_or_else(|| (true, true, range_max + range_max)) }) }); @@ -223,7 +223,7 @@ impl<'ast, T: Field> Folder<'ast, T> for UintOptimizer<'ast, T> { left_max .checked_add(&target_offset) .map(|max| (false, true, max)) - .unwrap_or_else(|| (true, true, range_max.clone() + target_offset)) + .unwrap_or_else(|| (true, true, range_max + target_offset)) } else { left_max .checked_add(&offset) @@ -294,7 +294,7 @@ impl<'ast, T: Field> Folder<'ast, T> for UintOptimizer<'ast, T> { left_max .checked_mul(&range_max.clone()) .map(|max| (false, true, max)) - .unwrap_or_else(|| (true, true, range_max.clone() * range_max)) + .unwrap_or_else(|| (true, true, range_max * range_max)) }) }); diff --git a/zokrates_ark/src/lib.rs b/zokrates_ark/src/lib.rs index 425be3a8..322785c3 100644 --- a/zokrates_ark/src/lib.rs +++ b/zokrates_ark/src/lib.rs @@ -150,7 +150,7 @@ impl<'a, T: Field + ArkFieldExtensions, I: IntoIterator> self.program .public_inputs_values(self.witness.as_ref().unwrap()) .iter() - .map(|v| v.clone().into_ark()) + .map(|v| v.into_ark()) .collect() } } diff --git a/zokrates_ast/src/flat/utils.rs b/zokrates_ast/src/flat/utils.rs index 03239687..c37d2f68 100644 --- a/zokrates_ast/src/flat/utils.rs +++ b/zokrates_ast/src/flat/utils.rs @@ -36,7 +36,7 @@ pub fn flat_expression_from_variable_summands(v: &[(T, usize)]) -> Fla match v.len() { 0 => FlatExpression::Number(T::zero()), 1 => { - let (val, var) = v[0].clone(); + let (val, var) = v[0]; FlatExpression::Mult( box FlatExpression::Number(val), box FlatExpression::Identifier(Variable::new(var)), diff --git a/zokrates_ast/src/ir/expression.rs b/zokrates_ast/src/ir/expression.rs index 28ac7993..ccebfa9a 100644 --- a/zokrates_ast/src/ir/expression.rs +++ b/zokrates_ast/src/ir/expression.rs @@ -164,8 +164,8 @@ impl LinComb { match acc.entry(val) { Entry::Occupied(o) => { // if the new value is non zero, update, else remove the term entirely - if o.get().clone() + coeff.clone() != T::zero() { - *o.into_mut() = o.get().clone() + coeff; + if *o.get() + coeff != T::zero() { + *o.into_mut() = *o.get() + coeff; } else { o.remove(); } diff --git a/zokrates_ast/src/ir/mod.rs b/zokrates_ast/src/ir/mod.rs index b401b757..66535d3c 100644 --- a/zokrates_ast/src/ir/mod.rs +++ b/zokrates_ast/src/ir/mod.rs @@ -181,7 +181,7 @@ impl<'ast, T: Field, I: IntoIterator>> ProgIterator<'a self.arguments .iter() .filter(|p| !p.private) - .map(|p| witness.0.get(&p.id).unwrap().clone()) + .map(|p| *witness.0.get(&p.id).unwrap()) .chain(witness.return_values()) .collect() } diff --git a/zokrates_ast/src/zir/lqc.rs b/zokrates_ast/src/zir/lqc.rs index 121b2a39..834f601f 100644 --- a/zokrates_ast/src/zir/lqc.rs +++ b/zokrates_ast/src/zir/lqc.rs @@ -43,7 +43,7 @@ impl<'ast, T: Field> std::ops::Sub for LinQuadComb<'ast, T> { linear: { let mut l = self.linear; other.linear.iter_mut().for_each(|(c, _)| { - *c = T::zero() - &*c; + *c = T::zero() - *c; }); l.append(&mut other.linear); l @@ -51,7 +51,7 @@ impl<'ast, T: Field> std::ops::Sub for LinQuadComb<'ast, T> { quadratic: { let mut q = self.quadratic; other.quadratic.iter_mut().for_each(|(c, _, _)| { - *c = T::zero() - &*c; + *c = T::zero() - *c; }); q.append(&mut other.quadratic); q @@ -68,18 +68,18 @@ impl<'ast, T: Field> LinQuadComb<'ast, T> { } Ok(Self { - constant: self.constant.clone() * rhs.constant.clone(), + constant: self.constant * rhs.constant, linear: { // lin0 * const1 + lin1 * const0 self.linear .clone() .into_iter() - .map(|(c, i)| (c * rhs.constant.clone(), i)) + .map(|(c, i)| (c * rhs.constant, i)) .chain( rhs.linear .clone() .into_iter() - .map(|(c, i)| (c * self.constant.clone(), i)), + .map(|(c, i)| (c * self.constant, i)), ) .collect() }, @@ -87,16 +87,16 @@ impl<'ast, T: Field> LinQuadComb<'ast, T> { // quad0 * const1 + quad1 * const0 + lin0 * lin1 self.quadratic .into_iter() - .map(|(c, i0, i1)| (c * rhs.constant.clone(), i0, i1)) + .map(|(c, i0, i1)| (c * rhs.constant, i0, i1)) .chain( rhs.quadratic .into_iter() - .map(|(c, i0, i1)| (c * self.constant.clone(), i0, i1)), + .map(|(c, i0, i1)| (c * self.constant, i0, i1)), ) .chain(self.linear.iter().flat_map(|(cl, l)| { rhs.linear .iter() - .map(|(cr, r)| (cl.clone() * cr.clone(), l.clone(), r.clone())) + .map(|(cr, r)| (*cl * *cr, l.clone(), r.clone())) })) .collect() }, diff --git a/zokrates_bellman/src/lib.rs b/zokrates_bellman/src/lib.rs index 821e3ea2..263cfc21 100644 --- a/zokrates_bellman/src/lib.rs +++ b/zokrates_bellman/src/lib.rs @@ -189,7 +189,7 @@ impl<'a, T: BellmanFieldExtensions + Field, I: IntoIterator Flattener<'ast, T> { // constants do not require directives if let Some(FlatExpression::Number(ref x)) = e.field { - let bits: Vec<_> = Interpreter::execute_solver(&Solver::bits(to), &[x.clone()], &[]) + let bits: Vec<_> = Interpreter::execute_solver(&Solver::bits(to), &[*x], &[]) .unwrap() .into_iter() .map(FlatExpression::Number) diff --git a/zokrates_interpreter/src/lib.rs b/zokrates_interpreter/src/lib.rs index 275624fe..8a7f8854 100644 --- a/zokrates_interpreter/src/lib.rs +++ b/zokrates_interpreter/src/lib.rs @@ -50,7 +50,7 @@ impl Interpreter { witness.insert(Variable::one(), T::one()); for (arg, value) in program.arguments.iter().zip(inputs.iter()) { - witness.insert(arg.id, value.clone()); + witness.insert(arg.id, *value); } for statement in program.statements.into_iter() { @@ -188,7 +188,7 @@ impl Interpreter { .map(|(a, v)| match &a.id._type { zir::Type::FieldElement => Ok(( a.id.id.clone(), - zokrates_ast::zir::FieldElementExpression::Number(v.clone()).into(), + zokrates_ast::zir::FieldElementExpression::Number(*v).into(), )), zir::Type::Boolean => match v { v if *v == T::from(0) => Ok((