github-mig/ZoKrates
github-mig/ZoKrates
1
0
Fork 0
mirror of synced 2025-09-22 11:47:57 +00:00
Code Issues Projects Releases Wiki Activity

fix clippy issues (#1342)

Browse source
This commit is contained in:
Darko Macesic 2023-08-31 22:51:54 +02:00 committed by GitHub
parent 296921e558
commit 96250e4d45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zokrates_analysis/src/flatten_complex_types.rs
View file

@ -652,7 +652,7 @@ fn fold_statement<'ast, T: Field>(
let e = f.fold_expression(statements_buffer, e);
assert_eq!(a.len(), e.len());
a.into_iter()
.zip(e.into_iter())
.zip(e)
.map(|(a, e)| zir::ZirStatement::definition(a, e))
.collect()
}
@ -1023,7 +1023,7 @@ fn fold_conditional_expression<'ast, T: Field, E: Flatten<'ast, T>>(
consequence
.into_iter()
.zip(alternative.into_iter())
.zip(alternative)
.map(|(c, a)| match (c, a) {
(zir::ZirExpression::FieldElement(c), zir::ZirExpression::FieldElement(a)) => {
zir::FieldElementExpression::conditional(condition.clone(), c, a)

2
zokrates_ast/src/typed/integer.rs
View file

@ -107,7 +107,7 @@ impl<'ast, T: Clone> IntegerInference for StructType<'ast, T> {
members: self
.members
.into_iter()
.zip(other.members.into_iter())
.zip(other.members)
.map(|(m_t, m_u)| match m_t.ty.get_common_pattern(*m_u.ty) {
Ok(ty) => DeclarationStructMember {
ty: Box::new(ty),

2
zokrates_ast/src/typed/types.rs
View file

@ -1377,7 +1377,7 @@ pub mod signature {
constants.0.extend(
decl_generics
.zip(values.into_iter())
.zip(values)
.filter_map(|(g, v)| v.map(|v| (g, v))),
);

14
zokrates_codegen/src/lib.rs
View file

@ -1314,7 +1314,7 @@ impl<'ast, T: Field> Flattener<'ast, T> {
let xor: Vec<FlatExpression<T>> = left_bits
.into_iter()
.zip(right_bits.into_iter())
.zip(right_bits)
.map(|(x, y)| match (x, y) {
(FlatExpression::Value(n), e) | (e, FlatExpression::Value(n)) => {
if n.value == T::from(0) {
@ -1686,8 +1686,8 @@ impl<'ast, T: Field> Flattener<'ast, T> {
let res: Vec<FlatExpression<T>> = a_bits
.into_iter()
.zip(b_bits.into_iter())
.zip(c_bits.into_iter())
.zip(b_bits)
.zip(c_bits)
.map(|((a, b), c)| {
// a(b - c) = ch - c
@ -1753,8 +1753,8 @@ impl<'ast, T: Field> Flattener<'ast, T> {
let res: Vec<FlatExpression<T>> = a_bits
.into_iter()
.zip(b_bits.into_iter())
.zip(c_bits.into_iter())
.zip(b_bits)
.zip(c_bits)
.map(|((a, b), c)| {
// (b) * (c) = (bc)
// (2bc - b - c) * (a) = bc - maj
@ -1856,7 +1856,7 @@ impl<'ast, T: Field> Flattener<'ast, T> {
let and: Vec<_> = left_bits
.into_iter()
.zip(right_bits.into_iter())
.zip(right_bits)
.map(|(x, y)| match (x, y) {
(FlatExpression::Value(n), e) | (e, FlatExpression::Value(n)) => {
if n.value == T::from(0) {
@ -1890,7 +1890,7 @@ impl<'ast, T: Field> Flattener<'ast, T> {
let or: Vec<FlatExpression<T>> = left_bits
.into_iter()
.zip(right_bits.into_iter())
.zip(right_bits)
.map(|(x, y)| match (x, y) {
(FlatExpression::Value(n), e) | (e, FlatExpression::Value(n)) => {
if n.value == T::from(0) {

4
zokrates_embed/src/ark.rs
View file

@ -163,8 +163,8 @@ pub fn generate_verify_constraints(
let constraints: Vec<Constraint<_>> = matrices
.a
.into_iter()
.zip(matrices.b.into_iter())
.zip(matrices.c.into_iter())
.zip(matrices.b)
.zip(matrices.c)
.map(|((a, b), c)| Constraint { a, b, c })
.collect();

8
zokrates_interpreter/src/lib.rs
View file

@ -434,7 +434,7 @@ mod tests {
#[test]
fn execute() {
let cond_eq = Solver::ConditionEq;
let inputs = vec![0];
let inputs = [0];
let r = Interpreter::execute_solver(
&cond_eq,
&inputs
@ -444,14 +444,14 @@ mod tests {
&[],
)
.unwrap();
let res: Vec<Bn128Field> = vec![0, 1].iter().map(|&i| Bn128Field::from(i)).collect();
let res: Vec<Bn128Field> = [0, 1].iter().map(|&i| Bn128Field::from(i)).collect();
assert_eq!(r, &res[..]);
}
#[test]
fn execute_non_eq() {
let cond_eq = Solver::ConditionEq;
let inputs = vec![1];
let inputs = [1];
let r = Interpreter::execute_solver(
&cond_eq,
&inputs
@ -461,7 +461,7 @@ mod tests {
&[],
)
.unwrap();
let res: Vec<Bn128Field> = vec![1, 1].iter().map(|&i| Bn128Field::from(i)).collect();
let res: Vec<Bn128Field> = [1, 1].iter().map(|&i| Bn128Field::from(i)).collect();
assert_eq!(r, &res[..]);
}
}

4
zokrates_proof_systems/src/scheme/gm17.rs
View file

@ -136,7 +136,7 @@ impl<T: SolidityCompatibleField> SolidityCompatibleScheme<T> for GM17 {
}
}
const CONTRACT_TEMPLATE: &str = r#"
const CONTRACT_TEMPLATE: &str = r"
contract Verifier {
using Pairing for *;
struct VerifyingKey {
@ -196,4 +196,4 @@ contract Verifier {
}
}
}
"#;
";