Fix lint

Author: Avaneesh-axiom

.github/workflows/lints.yml

@@ -60,12 +60,12 @@ jobs:
               if [[ "$crate_path" == *"extensions/ecc/tests/programs"* ]]; then
                 echo "Running cargo clippy with k256 and p256 features for $crate_path"
                 cargo clippy --manifest-path "$crate_path/Cargo.toml" --all-targets --features "std k256 p256" -- -D warnings
-              elif [[ "$crate_path" == *"extensions/pairing/tests/programs"* ]]; then
+              elif [[ "$crate_path" == *"guest-libs/pairing/tests/programs"* ]]; then
                 echo "Running cargo clippy with openvm_pairing_guest::bn254 feature for $crate_path"
                 cargo clippy --manifest-path "$crate_path/Cargo.toml" --all-targets --features "std bn254" -- -D warnings
                 echo "Running cargo clippy with openvm_pairing_guest::bls12_381 feature for $crate_path"
                 cargo clippy --manifest-path "$crate_path/Cargo.toml" --all-targets --features "std bls12_381" -- -D warnings
-              elif [[ "$crate_path" == *"extensions/"* ]]; then
+              elif [[ "$crate_path" == *"extensions/"* || "$crate_path" == *"guest-libs/"* ]]; then
                 echo "Running cargo clippy for $crate_path"
                 cargo clippy --manifest-path "$crate_path/Cargo.toml" --all-targets --features "std" -- -D warnings
               else

examples/algebra/src/main.rs

@@ -1,3 +1,5 @@
+extern crate alloc;
+
 use openvm_algebra_guest::{moduli_macros::*, IntMod};
 
 // This macro will create two structs, `Mod1` and `Mod2`,

examples/pairing/Cargo.toml

@@ -13,6 +13,9 @@ openvm-algebra-guest = { path = "../../extensions/algebra/guest" }
 openvm-algebra-moduli-macros = { path = "../../extensions/algebra/moduli-macros" }
 openvm-algebra-complex-macros = { path = "../../extensions/algebra/complex-macros" }
 openvm-ecc-guest = { path = "../../extensions/ecc/guest" }
+openvm-pairing = { path = "../../guest-libs/pairing/guest", features = [
+    "bls12_381",
+] }
 openvm-pairing-guest = { path = "../../extensions/pairing/guest", features = [
     "bls12_381",
 ] }

examples/pairing/src/main.rs

@@ -4,9 +4,9 @@ use hex_literal::hex;
 // ANCHOR: imports
 use openvm_algebra_guest::{field::FieldExtension, IntMod};
 use openvm_ecc_guest::AffinePoint;
-use openvm_pairing_guest::{
+use openvm_pairing::{
     bls12_381::{Bls12_381, Fp, Fp2},
-    pairing::PairingCheck,
+    PairingCheck,
 };
 // ANCHOR_END: imports
 

guest-libs/ff_derive/guest/src/lib.rs

@@ -1190,6 +1190,8 @@ fn prime_field_impl(
         // on our zkvm-compatible struct, so we need to conditionally implement them
         #[cfg(not(target_os = "zkvm"))]
         mod #impl_module_ident {
+            use super::{#name, MODULUS_LIMBS};
+
             impl ::core::clone::Clone for #name {
                 fn clone(&self) -> #name {
                     *self

guest-libs/ff_derive/tests/programs/examples/constants.rs

@@ -35,13 +35,13 @@ fn main() {
 
     // ROOT_OF_UNITY^{2^s} mod m == 1
     assert_eq!(
-        Bls381K12Scalar::ROOT_OF_UNITY.pow(&[1u64 << Bls381K12Scalar::S, 0, 0, 0]),
+        Bls381K12Scalar::ROOT_OF_UNITY.pow([1u64 << Bls381K12Scalar::S, 0, 0, 0]),
         Bls381K12Scalar::ONE,
     );
 
     // DELTA^{t} mod m == 1
     assert_eq!(
-        Bls381K12Scalar::DELTA.pow(&[
+        Bls381K12Scalar::DELTA.pow([
             0xfffe5bfeffffffff,
             0x09a1d80553bda402,
             0x299d7d483339d808,

guest-libs/ff_derive/tests/programs/examples/operations.rs

@@ -29,9 +29,12 @@ fn main() {
     );
 
     // Test Eq
-    assert_eq!(Bls381K12Scalar::ZERO, Bls381K12Scalar::ZERO);
-    assert_eq!(Bls381K12Scalar::ONE, Bls381K12Scalar::ONE);
-    assert_eq!(neg_one, neg_one);
+    #[allow(clippy::eq_op)]
+    {
+        assert_eq!(Bls381K12Scalar::ZERO, Bls381K12Scalar::ZERO);
+        assert_eq!(Bls381K12Scalar::ONE, Bls381K12Scalar::ONE);
+        assert_eq!(neg_one, neg_one);
+    }
 
     // Test is_zero
     assert!(bool::from(Bls381K12Scalar::ZERO.is_zero()));

guest-libs/k256/tests/programs/examples/mul.rs

@@ -3,7 +3,6 @@
 
 use elliptic_curve::{CurveArithmetic, Group, PrimeField};
 use openvm_k256::Secp256k1;
-
 // clippy thinks this is unused, but it's used in the init! macro
 #[allow(unused)]
 use openvm_k256::Secp256k1Point;
@@ -34,7 +33,7 @@ pub fn main() {
             )
         }))
     {
-        let p = generator * &k;
+        let p = generator * k;
         assert_eq!(p.x_be_bytes(), coords.0);
         assert_eq!(p.y_be_bytes(), coords.1);
     }

guest-libs/k256/tests/programs/examples/test_vectors/mod.rs

@@ -93,6 +93,8 @@ pub const ADD_TEST_VECTORS: &[([u8; 32], [u8; 32])] = &[
 ///
 /// Vectors for secp256k1 are difficult to find. These are the vectors from:
 /// <https://web.archive.org/web/20190724010836/https://chuckbatson.wordpress.com/2014/11/26/secp256k1-test-vectors/>
+// clippy thinks this is unused for some reason, but it's used in mul.rs
+#[allow(dead_code)]
 pub const MUL_TEST_VECTORS: &[([u8; 32], [u8; 32], [u8; 32])] = &[
     (
         hex!("000000000000000000000000000000000000000000000000018EBBB95EED0E13"),

guest-libs/p256/tests/programs/examples/mul.rs

@@ -34,7 +34,7 @@ pub fn main() {
             )
         }))
     {
-        let p = generator * &k;
+        let p = generator * k;
         assert_eq!(p.x_be_bytes(), coords.0);
         assert_eq!(p.y_be_bytes(), coords.1);
     }

guest-libs/p256/tests/programs/examples/test_vectors/mod.rs

@@ -88,10 +88,12 @@ pub const ADD_TEST_VECTORS: &[([u8; 32], [u8; 32])] = &[
     ),
 ];
 
-//// Scalar multiplication with the generator.
+/// Scalar multiplication with the generator.
 ///
 /// These are the test vectors from <http://point-at-infinity.org/ecc/nisttv> that are not
 /// part of [`ADD_TEST_VECTORS`].
+// clippy thinks this is unused for some reason, but it's used in mul.rs
+#[allow(dead_code)]
 pub const MUL_TEST_VECTORS: &[([u8; 32], [u8; 32], [u8; 32])] = &[
     (
         hex!("000000000000000000000000000000000000000000000000018EBBB95EED0E13"),

guest-libs/pairing/guest/src/bls12_381/mod.rs

@@ -2,7 +2,7 @@ extern crate alloc;
 
 use core::ops::Neg;
 
-use openvm_algebra_guest::{Field, IntMod};
+use openvm_algebra_guest::IntMod;
 use openvm_algebra_moduli_macros::moduli_declare;
 use openvm_ecc_guest::{weierstrass::IntrinsicCurve, CyclicGroup, Group};
 

guest-libs/pairing/guest/src/bn254/mod.rs

@@ -3,7 +3,7 @@ extern crate alloc;
 use core::ops::{Add, Neg};
 
 use hex_literal::hex;
-use openvm_algebra_guest::{Field, IntMod};
+use openvm_algebra_guest::IntMod;
 use openvm_algebra_moduli_macros::moduli_declare;
 use openvm_ecc_guest::{
     weierstrass::{CachedMulTable, IntrinsicCurve},

guest-libs/pairing/tests/programs/examples/bn_ec.rs

@@ -2,6 +2,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 #[allow(unused_imports)]
+#[cfg(feature = "bn254")]
 use openvm_pairing::bn254::Bn254G1Affine;
 
 openvm::init!("openvm_init_bn_ec_bn254.rs");

guest-libs/ruint/tests/programs/examples/matrix_power.rs

@@ -22,7 +22,7 @@ pub fn mult(a: &Matrix, b: &Matrix) -> Matrix {
     for i in 0..N {
         for j in 0..N {
             for k in 0..N {
-                c[i][j] += &a[i][k] * &b[k][j];
+                c[i][j] += a[i][k] * b[k][j];
             }
         }
     }
@@ -42,11 +42,11 @@ pub fn bin_exp(mut base: Matrix, mut exp: U256) -> Matrix {
     let mut result = get_identity_matrix();
     let one = U256::from_u8(1).unwrap();
     while exp > U256::from_u8(0).unwrap() {
-        if (&exp & &one) == one {
+        if (exp & one) == one {
             result = mult(&result, &base);
         }
         base = mult(&base, &base);
-        exp >>= &one;
+        exp >>= one;
     }
     result
 }
@@ -64,7 +64,7 @@ pub fn main() {
 
     let a: Matrix = get_matrix(1);
     let c = bin_exp(a, U256::from_u8(51).unwrap());
-    let two_to_200 = one << &U256::from_u8(200).unwrap();
+    let two_to_200 = one << U256::from_u8(200).unwrap();
 
     for i in 0..N {
         for j in 0..N {
@@ -76,54 +76,54 @@ pub fn main() {
     }
 
     // Shift right tests
-    if two_to_200 >> &U256::from_u8(200).unwrap() != one {
+    if two_to_200 >> U256::from_u8(200).unwrap() != one {
         print("FAIL: 2^200 >> 200 == 1 test failed");
         panic!();
     }
-    if two_to_200 >> &U256::from_u8(201).unwrap() != zero {
+    if two_to_200 >> U256::from_u8(201).unwrap() != zero {
         print("FAIL: 2^200 >> 201 == 0 test failed");
         panic!();
     }
 
     // Xor tests
-    if &two_to_200 ^ &two_to_200 != zero {
+    if two_to_200 ^ two_to_200 != zero {
         print("FAIL: 2^200 ^ 2^200 == 0 test failed");
         panic!();
     }
 
-    if &two_to_200 ^ &one != &two_to_200 + &one {
+    if two_to_200 ^ one != two_to_200 + one {
         print("FAIL: 2^200 ^ 1 == 2^200 + 1 test failed");
         panic!();
     }
 
     // Or tests
-    if &one | &one != one {
+    if one | one != one {
         print("FAIL: 1 | 1 == 1 test failed");
         panic!();
     }
 
-    if &two_to_200 | &one != &two_to_200 + &one {
+    if two_to_200 | one != two_to_200 + one {
         print("FAIL: 2^200 | 1 = 2^200 + 1 test failed");
         panic!();
     }
 
     // Other tests
-    if &zero - &one <= zero {
+    if zero - one <= zero {
         print("FAIL: 0 - 1 > 0 test failed (should have wrapped)");
         panic!();
     }
 
-    if &zero - &one + &one != zero {
+    if zero - one + one != zero {
         print("FAIL: 0 - 1 + 1 == 0 test failed (should have wrapped)");
         panic!();
     }
 
-    if one << &U256::from_u32(256).unwrap() != zero {
+    if one << U256::from_u32(256).unwrap() != zero {
         print("FAIL: 1 << 256 == 0 test failed");
         panic!();
     }
 
-    if two_to_200.clone() != two_to_200 {
+    if two_to_200 != two_to_200 {
         print("FAIL: 2^200 clone test failed");
         panic!();
     }

guest-libs/sha2/tests/programs/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2021"
 
 [dependencies]
 openvm = { path = "../../../../crates/toolchain/openvm" }
+openvm-platform = { path = "../../../../crates/toolchain/platform" }
 openvm-sha2 = { path = "../../guest" }
 
 hex = { version = "0.4.3", default-features = false, features = ["alloc"] }

guest-libs/sha2/tests/programs/examples/sha.rs

@@ -5,6 +5,7 @@ extern crate alloc;
 
 use alloc::vec::Vec;
 use core::hint::black_box;
+
 use hex::FromHex;
 use openvm_sha2::sha256;