clippy fixes

This commit is contained in:
Nicholas Ward 2021-11-30 15:56:12 -08:00
parent f1dc1d4446
commit 406092f358
5 changed files with 7 additions and 9 deletions

View File

@ -1,7 +1,6 @@
use std::ops::Mul;
use crate::curve::curve_summation::affine_multisummation_batch_inversion;
use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar, ProjectivePoint};
use crate::curve::curve_types::{Curve, CurveScalar, ProjectivePoint};
use crate::field::field_types::Field;
const WINDOW_BITS: usize = 4;

View File

@ -152,7 +152,7 @@ pub fn affine_multisummation_batch_inversion<C: Curve>(
// This is the doubling case.
let mut numerator = x1.square().triple();
if C::A.is_nonzero() {
numerator = numerator + C::A;
numerator += C::A;
}
let quotient = numerator * inverse;
let x3 = quotient.square() - x1.double();

View File

@ -183,7 +183,7 @@ impl<C: Curve> ProjectivePoint<C> {
let zz = z.square();
let mut w = xx.triple();
if C::A.is_nonzero() {
w = w + C::A * zz;
w += C::A * zz;
}
let s = y.double() * z;
let r = y * s;

View File

@ -134,7 +134,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
) -> AffinePointTarget<C> {
let one = self.constant_nonnative(C::BaseField::ONE);
let bits = self.split_nonnative_to_bits(&n);
let bits = self.split_nonnative_to_bits(n);
let bits_as_base: Vec<NonNativeTarget<C::BaseField>> =
bits.iter().map(|b| self.bool_to_nonnative(b)).collect();
@ -173,9 +173,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
}
}
#[cfg(test)]
mod tests {
use std::ops::{Mul, Neg};
use anyhow::Result;
use crate::curve::curve_types::{AffinePoint, Curve, CurveScalar};

View File

@ -1,6 +1,6 @@
use std::marker::PhantomData;
use num::{BigUint, One, Zero};
use num::{BigUint, Zero};
use crate::field::field_types::RichField;
use crate::field::{extension_field::Extendable, field_types::Field};
@ -115,7 +115,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
_phantom: PhantomData,
});
let product = self.mul_nonnative(&x, &inv);
let product = self.mul_nonnative(x, &inv);
let one = self.constant_nonnative(FF::ONE);
self.connect_nonnative(&product, &one);