Skip to content

Commit 9b82957

Browse files
committed
Fix clippy lints
1 parent f770b0d commit 9b82957

File tree

8 files changed

+175
-207
lines changed

8 files changed

+175
-207
lines changed

benches/groups.rs

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use bls12_381::*;
66

77
use criterion::{black_box, Criterion};
88

9+
#[allow(clippy::many_single_char_names)]
910
fn criterion_benchmark(c: &mut Criterion) {
1011
// Pairings
1112
{

src/fp.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ fn test_conditional_selection() {
679679
fn test_equality() {
680680
fn is_equal(a: &Fp, b: &Fp) -> bool {
681681
let eq = a == b;
682-
let ct_eq = a.ct_eq(&b);
682+
let ct_eq = a.ct_eq(b);
683683

684684
assert_eq!(eq, bool::from(ct_eq));
685685

src/fp2.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ fn test_conditional_selection() {
378378
fn test_equality() {
379379
fn is_equal(a: &Fp2, b: &Fp2) -> bool {
380380
let eq = a == b;
381-
let ct_eq = a.ct_eq(&b);
381+
let ct_eq = a.ct_eq(b);
382382

383383
assert_eq!(eq, bool::from(ct_eq));
384384

src/g1.rs

+16-7
Original file line numberDiff line numberDiff line change
@@ -1760,15 +1760,24 @@ fn test_commutative_scalar_subgroup_multiplication() {
17601760
let g1_a = G1Affine::generator();
17611761
let g1_p = G1Projective::generator();
17621762

1763-
// By reference.
1764-
assert_eq!(&g1_a * &a, &a * &g1_a);
1765-
assert_eq!(&g1_p * &a, &a * &g1_p);
1763+
// By reference. In subfunction to avoid "needlessly taken reference" lint.
1764+
fn by_ref(g1_a: &G1Affine, g1_p: &G1Projective, a: &Scalar) {
1765+
assert_eq!(g1_a * a, a * g1_a);
1766+
assert_eq!(g1_p * a, a * g1_p);
1767+
}
1768+
by_ref(&g1_a, &g1_p, &a);
17661769

17671770
// Mixed
1768-
assert_eq!(&g1_a * a.clone(), a.clone() * &g1_a);
1769-
assert_eq!(&g1_p * a.clone(), a.clone() * &g1_p);
1770-
assert_eq!(g1_a.clone() * &a, &a * g1_a.clone());
1771-
assert_eq!(g1_p.clone() * &a, &a * g1_p.clone());
1771+
fn group_ref(g1_a: &G1Affine, g1_p: &G1Projective, a: Scalar) {
1772+
assert_eq!(g1_a * a, a * g1_a);
1773+
assert_eq!(g1_p * a, a * g1_p);
1774+
}
1775+
fn scalar_ref(g1_a: G1Affine, g1_p: G1Projective, a: &Scalar) {
1776+
assert_eq!(g1_a * a, a * g1_a);
1777+
assert_eq!(g1_p * a, a * g1_p);
1778+
}
1779+
group_ref(&g1_a, &g1_p, a);
1780+
scalar_ref(g1_a, g1_p, &a);
17721781

17731782
// By value.
17741783
assert_eq!(g1_p * a, a * g1_p);

src/g2.rs

+16-7
Original file line numberDiff line numberDiff line change
@@ -2163,15 +2163,24 @@ fn test_commutative_scalar_subgroup_multiplication() {
21632163
let g2_a = G2Affine::generator();
21642164
let g2_p = G2Projective::generator();
21652165

2166-
// By reference.
2167-
assert_eq!(&g2_a * &a, &a * &g2_a);
2168-
assert_eq!(&g2_p * &a, &a * &g2_p);
2166+
// By reference. In subfunction to avoid "needlessly taken reference" lint.
2167+
fn by_ref(g2_a: &G2Affine, g2_p: &G2Projective, a: &Scalar) {
2168+
assert_eq!(g2_a * a, a * g2_a);
2169+
assert_eq!(g2_p * a, a * g2_p);
2170+
}
2171+
by_ref(&g2_a, &g2_p, &a);
21692172

21702173
// Mixed
2171-
assert_eq!(&g2_a * a.clone(), a.clone() * &g2_a);
2172-
assert_eq!(&g2_p * a.clone(), a.clone() * &g2_p);
2173-
assert_eq!(g2_a.clone() * &a, &a * g2_a.clone());
2174-
assert_eq!(g2_p.clone() * &a, &a * g2_p.clone());
2174+
fn group_ref(g2_a: &G2Affine, g2_p: &G2Projective, a: Scalar) {
2175+
assert_eq!(g2_a * a, a * g2_a);
2176+
assert_eq!(g2_p * a, a * g2_p);
2177+
}
2178+
fn scalar_ref(g2_a: G2Affine, g2_p: G2Projective, a: &Scalar) {
2179+
assert_eq!(g2_a * a, a * g2_a);
2180+
assert_eq!(g2_p * a, a * g2_p);
2181+
}
2182+
group_ref(&g2_a, &g2_p, a);
2183+
scalar_ref(g2_a, g2_p, &a);
21752184

21762185
// By value.
21772186
assert_eq!(g2_p * a, a * g2_p);

src/hash_to_curve/map_g1.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -788,14 +788,14 @@ pub const P_M1_OVER2: Fp = Fp::from_raw_unchecked([
788788

789789
#[test]
790790
fn test_sgn0() {
791-
assert_eq!(bool::from(Fp::zero().sgn0()), false);
792-
assert_eq!(bool::from(Fp::one().sgn0()), true);
793-
assert_eq!(bool::from((-Fp::one()).sgn0()), false);
794-
assert_eq!(bool::from((-Fp::zero()).sgn0()), false);
795-
assert_eq!(bool::from(P_M1_OVER2.sgn0()), true);
791+
assert!(!bool::from(Fp::zero().sgn0()));
792+
assert!(bool::from(Fp::one().sgn0()));
793+
assert!(!bool::from((-Fp::one()).sgn0()));
794+
assert!(!bool::from((-Fp::zero()).sgn0()));
795+
assert!(bool::from(P_M1_OVER2.sgn0()));
796796

797797
let p_p1_over2 = P_M1_OVER2 + Fp::one();
798-
assert_eq!(bool::from(p_p1_over2.sgn0()), false);
798+
assert!(!bool::from(p_p1_over2.sgn0()));
799799

800800
let neg_p_p1_over2 = {
801801
let mut tmp = p_p1_over2;

0 commit comments

Comments
 (0)