From ea0594035a495be61a9f357df2a61b548667cbe4 Mon Sep 17 00:00:00 2001 From: schaeff Date: Wed, 4 Aug 2021 23:00:10 +0200 Subject: [PATCH] clippy --- zokrates_core/src/static_analysis/uint_optimizer.rs | 4 ++-- zokrates_core/src/typed_absy/mod.rs | 8 ++------ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/zokrates_core/src/static_analysis/uint_optimizer.rs b/zokrates_core/src/static_analysis/uint_optimizer.rs index ecca499a..232c4424 100644 --- a/zokrates_core/src/static_analysis/uint_optimizer.rs +++ b/zokrates_core/src/static_analysis/uint_optimizer.rs @@ -738,7 +738,7 @@ mod tests { assert_eq!( UintOptimizer::new() - .fold_uint_expression(UExpression::right_shift(left.clone(), right.clone())), + .fold_uint_expression(UExpression::right_shift(left.clone(), right)), UExpression::right_shift(left_expected, right_expected).with_max(output_max) ); } @@ -761,7 +761,7 @@ mod tests { assert_eq!( UintOptimizer::new() - .fold_uint_expression(UExpression::left_shift(left.clone(), right.clone())), + .fold_uint_expression(UExpression::left_shift(left.clone(), right)), UExpression::left_shift(left_expected, right_expected).with_max(output_max) ); } diff --git a/zokrates_core/src/typed_absy/mod.rs b/zokrates_core/src/typed_absy/mod.rs index e4f500b5..07f18a63 100644 --- a/zokrates_core/src/typed_absy/mod.rs +++ b/zokrates_core/src/typed_absy/mod.rs @@ -2062,8 +2062,7 @@ impl<'ast, T: Field> Constant for ArrayExpression<'ast, T> { .collect::>() .into(), ) - .annotate(*array_ty.ty, array_ty.size) - .into(), + .annotate(*array_ty.ty, array_ty.size), ArrayExpressionInner::Slice(box a, box from, box to) => { let from = match from.into_inner() { UExpressionInner::Value(from) => from as usize, @@ -2091,7 +2090,6 @@ impl<'ast, T: Field> Constant for ArrayExpression<'ast, T> { .into(), ) .annotate(*array_ty.ty, array_ty.size) - .into() } ArrayExpressionInner::Repeat(box e, box count) => { let count = match count.into_inner() { @@ -2105,7 +2103,6 @@ impl<'ast, T: Field> Constant for ArrayExpression<'ast, T> { vec![TypedExpressionOrSpread::Expression(e); count].into(), ) .annotate(*array_ty.ty, array_ty.size) - .into() } _ => unreachable!(), } @@ -2130,8 +2127,7 @@ impl<'ast, T: Field> Constant for StructExpression<'ast, T> { .map(|e| e.into_canonical_constant()) .collect(), ) - .annotate(struct_ty) - .into(), + .annotate(struct_ty), _ => unreachable!(), } }