Clippy Fixes (#174)

* Clean up

* Tweak

Author: Pratyush

src/boolean/and.rs

@@ -107,7 +107,7 @@ impl<F: PrimeField> Boolean<F> {
     }
 }
 
-impl<'a, F: Field> BitAnd<Self> for &'a Boolean<F> {
+impl<F: Field> BitAnd<Self> for &Boolean<F> {
     type Output = Boolean<F>;
     /// Outputs `self & other`.
     ///
@@ -142,16 +142,16 @@ impl<'a, F: Field> BitAnd<Self> for &'a Boolean<F> {
     }
 }
 
-impl<'a, F: Field> BitAnd<&'a Self> for Boolean<F> {
+impl<F: Field> BitAnd<&Self> for Boolean<F> {
     type Output = Boolean<F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]
     fn bitand(self, other: &Self) -> Self::Output {
-        self._and(&other).unwrap()
+        self._and(other).unwrap()
     }
 }
 
-impl<'a, F: Field> BitAnd<Boolean<F>> for &'a Boolean<F> {
+impl<F: Field> BitAnd<Boolean<F>> for &Boolean<F> {
     type Output = Boolean<F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]

src/fields/cubic_extension.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use ark_ff::{
     fields::{CubicExtField, Field},
-    CubicExtConfig, Zero,
+    AdditiveGroup, CubicExtConfig,
 };
 use ark_relations::gr1cs::{ConstraintSystemRef, Namespace, SynthesisError};
 use core::{borrow::Borrow, marker::PhantomData};
@@ -277,7 +277,7 @@ where
             self.cs(),
             || {
                 self.value()
-                    .map(|f| f.inverse().unwrap_or_else(CubicExtField::zero))
+                    .map(|f| f.inverse().unwrap_or(CubicExtField::ZERO))
             },
             mode,
         )?;

src/fields/emulated_fp/allocated_field_var.rs

@@ -290,7 +290,7 @@ impl<TargetF: PrimeField, BaseF: PrimeField> AllocatedEmulatedFpVar<TargetF, Bas
     #[tracing::instrument(target = "gr1cs")]
     pub fn inverse(&self) -> R1CSResult<Self> {
         let inverse = Self::new_witness(self.cs(), || {
-            Ok(self.value()?.inverse().unwrap_or_else(TargetF::zero))
+            Ok(self.value()?.inverse().unwrap_or(TargetF::ZERO))
         })?;
 
         let actual_result = self.clone().mul(&inverse)?;

src/fields/mod.rs

@@ -191,7 +191,7 @@ pub trait FieldVar<F: Field, ConstraintF: PrimeField>:
             // and check that `result * d = self`.
             _ => {
                 let result = Self::new_witness(ark_relations::ns!(cs, "self  * d_inv"), || {
-                    Ok(self.value()? * &d.value()?.inverse().unwrap_or(F::zero()))
+                    Ok(self.value()? * &d.value()?.inverse().unwrap_or(F::ZERO))
                 })?;
                 result.mul_equals(d, self)?;
                 Ok(result)

src/fields/quadratic_extension.rs

@@ -6,7 +6,7 @@ use crate::{
 };
 use ark_ff::{
     fields::{Field, QuadExtConfig, QuadExtField},
-    Zero,
+    AdditiveGroup,
 };
 use ark_relations::gr1cs::{ConstraintSystemRef, Namespace, SynthesisError};
 use core::{borrow::Borrow, marker::PhantomData};
@@ -285,7 +285,7 @@ where
             self.cs(),
             || {
                 self.value()
-                    .map(|f| f.inverse().unwrap_or_else(QuadExtField::zero))
+                    .map(|f| f.inverse().unwrap_or(QuadExtField::ZERO))
             },
             mode,
         )?;

src/groups/curves/short_weierstrass/mod.rs

@@ -504,10 +504,8 @@ where
         &self,
         bits: impl Iterator<Item = &'a Boolean<BasePrimeField<P>>>,
     ) -> Result<Self, SynthesisError> {
-        if self.is_constant() {
-            if self.value().unwrap().is_zero() {
-                return Ok(self.clone());
-            }
+        if self.is_constant() && self.value().unwrap().is_zero() {
+            return Ok(self.clone());
         }
         let self_affine = self.to_affine()?;
         let (x, y, infinity) = (self_affine.x, self_affine.y, self_affine.infinity);

src/uint/convert.rs

@@ -14,7 +14,7 @@ impl<const N: usize, F: Field, T: PrimUInt> UInt<N, T, F> {
     where
         F: PrimeField,
     {
-        assert!(N <= F::MODULUS_BIT_SIZE as usize - 1);
+        assert!(N < F::MODULUS_BIT_SIZE as usize);
 
         Boolean::le_bits_to_fp(&self.bits)
     }

src/uint/mod.rs

@@ -83,9 +83,9 @@ impl<const N: usize, T: PrimUInt, F: Field> UInt<N, T, F> {
         let mut bits = [Boolean::FALSE; N];
         let mut bit_values = value;
 
-        for i in 0..N {
-            bits[i] = Boolean::constant((bit_values & T::one()) == T::one());
-            bit_values = bit_values >> 1u8;
+        for bit in &mut bits {
+            *bit = Boolean::constant((bit_values & T::one()) == T::one());
+            bit_values >>= 1u8;
         }
 
         Self {

src/uint/prim_uint.rs

@@ -1,7 +1,4 @@
-use core::{
-    ops::{Shl, ShlAssign, Shr, ShrAssign},
-    usize,
-};
+use core::ops::{Shl, ShlAssign, Shr, ShrAssign};
 
 #[doc(hidden)]
 // Adapted from <https://github.com/rust-num/num-traits/pull/224>

src/uint/xor.rs

@@ -60,7 +60,7 @@ impl<'a, const N: usize, T: PrimUInt, F: Field> BitXor<&'a Self> for UInt<N, T,
     }
 }
 
-impl<'a, const N: usize, T: PrimUInt, F: Field> BitXor<UInt<N, T, F>> for &'a UInt<N, T, F> {
+impl<const N: usize, T: PrimUInt, F: Field> BitXor<UInt<N, T, F>> for &UInt<N, T, F> {
     type Output = UInt<N, T, F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]
@@ -78,7 +78,7 @@ impl<const N: usize, T: PrimUInt, F: Field> BitXor<Self> for UInt<N, T, F> {
     }
 }
 
-impl<'a, const N: usize, T: PrimUInt, F: Field> BitXor<T> for UInt<N, T, F> {
+impl<const N: usize, T: PrimUInt, F: Field> BitXor<T> for UInt<N, T, F> {
     type Output = UInt<N, T, F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]
@@ -105,7 +105,7 @@ impl<'a, const N: usize, T: PrimUInt, F: Field> BitXor<&'a T> for &'a UInt<N, T,
     }
 }
 
-impl<'a, const N: usize, T: PrimUInt, F: Field> BitXor<T> for &'a UInt<N, T, F> {
+impl<const N: usize, T: PrimUInt, F: Field> BitXor<T> for &UInt<N, T, F> {
     type Output = UInt<N, T, F>;
 
     #[tracing::instrument(target = "gr1cs", skip(self, other))]