From fdb1e5a902d653d7df66f9f7a4743bd2c9af2738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michele=20Orr=C3=B9?= <michele.orru@berkeley.edu>
Date: Mon, 24 Jul 2023 20:53:40 +0200
Subject: [PATCH] Fix outstanding compiler errors

---
 ec/src/scalar_mul/glv.rs         | 3 +--
 ec/src/scalar_mul/mod.rs         | 6 ++++--
 ff-macros/src/montgomery/mod.rs  | 2 +-
 ff/src/fields/mod.rs             | 4 ++--
 ff/src/fields/models/fp/mod.rs   | 5 +----
 ff/src/lib.rs                    | 1 +
 test-curves/src/bls12_381/fq2.rs | 2 +-
 test-curves/src/lib.rs           | 6 ++----
 8 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/ec/src/scalar_mul/glv.rs b/ec/src/scalar_mul/glv.rs
index 21ef70077..4bc979641 100644
--- a/ec/src/scalar_mul/glv.rs
+++ b/ec/src/scalar_mul/glv.rs
@@ -1,7 +1,6 @@
-use crate::AdditiveGroup;
 use crate::{
     short_weierstrass::{Affine, Projective, SWCurveConfig},
-    CurveGroup,
+    AdditiveGroup, CurveGroup,
 };
 use ark_ff::{PrimeField, Zero};
 use num_bigint::{BigInt, BigUint, Sign};
diff --git a/ec/src/scalar_mul/mod.rs b/ec/src/scalar_mul/mod.rs
index 295597576..10f0f7109 100644
--- a/ec/src/scalar_mul/mod.rs
+++ b/ec/src/scalar_mul/mod.rs
@@ -4,8 +4,10 @@ pub mod wnaf;
 pub mod fixed_base;
 pub mod variable_base;
 
-use crate::short_weierstrass::{Affine, Projective, SWCurveConfig};
-use crate::PrimeGroup;
+use crate::{
+    short_weierstrass::{Affine, Projective, SWCurveConfig},
+    PrimeGroup,
+};
 use ark_ff::{AdditiveGroup, Zero};
 use ark_std::{
     ops::{Add, AddAssign, Mul, Neg, Sub, SubAssign},
diff --git a/ff-macros/src/montgomery/mod.rs b/ff-macros/src/montgomery/mod.rs
index 4b3cdd146..90b355e54 100644
--- a/ff-macros/src/montgomery/mod.rs
+++ b/ff-macros/src/montgomery/mod.rs
@@ -103,7 +103,7 @@ pub fn mont_config_helper(
     let scope_name = format_ident!("{}___", config_name.to_string().to_lowercase());
     quote::quote! {
         fn #scope_name() {
-            use ark_ff::{fields::Fp, BigInt, BigInteger, biginteger::arithmetic as fa, fields::*};
+            use ark_ff::{AdditiveGroup, fields::Fp, BigInt, BigInteger, biginteger::arithmetic as fa, fields::*};
             type B = BigInt<#limbs>;
             type F = Fp<MontBackend<#config_name, #limbs>, #limbs>;
 
diff --git a/ff/src/fields/mod.rs b/ff/src/fields/mod.rs
index d43cb1207..55a124b9e 100644
--- a/ff/src/fields/mod.rs
+++ b/ff/src/fields/mod.rs
@@ -9,7 +9,7 @@ use ark_serialize::{
 use ark_std::{
     fmt::{Debug, Display},
     hash::Hash,
-    ops::{Add, AddAssign, Div, DivAssign, Mul, MulAssign, Neg, Sub, SubAssign},
+    ops::{AddAssign, Div, DivAssign, MulAssign, Neg, SubAssign},
     vec::Vec,
 };
 
@@ -414,7 +414,7 @@ mod no_std_tests {
         let felt2 = Fr::one() + Fr::one();
         let felt16 = felt2 * felt2 * felt2 * felt2;
 
-        assert_eq!(Fr::from(1u8),  Fr::one());
+        assert_eq!(Fr::from(1u8), Fr::one());
         assert_eq!(Fr::from(1u16), Fr::one());
         assert_eq!(Fr::from(1u32), Fr::one());
         assert_eq!(Fr::from(1u64), Fr::one());
diff --git a/ff/src/fields/models/fp/mod.rs b/ff/src/fields/models/fp/mod.rs
index 0a603937b..f50ebb633 100644
--- a/ff/src/fields/models/fp/mod.rs
+++ b/ff/src/fields/models/fp/mod.rs
@@ -19,10 +19,7 @@ use ark_std::{
 mod montgomery_backend;
 pub use montgomery_backend::*;
 
-use crate::{
-    BigInt, BigInteger, FftField, Field, LegendreSymbol, PrimeField,
-    SqrtPrecomputation,
-};
+use crate::{BigInt, BigInteger, FftField, Field, LegendreSymbol, PrimeField, SqrtPrecomputation};
 /// A trait that specifies the configuration of a prime field.
 /// Also specifies how to perform arithmetic on field elements.
 pub trait FpConfig<const N: usize>: Send + Sync + 'static + Sized {
diff --git a/ff/src/lib.rs b/ff/src/lib.rs
index fce601ab8..b07b97ed2 100644
--- a/ff/src/lib.rs
+++ b/ff/src/lib.rs
@@ -32,6 +32,7 @@ pub use bits::*;
 
 pub(crate) mod const_helpers;
 
+pub use ark_group::AdditiveGroup;
 pub use ark_std::UniformRand;
 
 mod to_field_vec;
diff --git a/test-curves/src/bls12_381/fq2.rs b/test-curves/src/bls12_381/fq2.rs
index f228d6b51..f289ee9df 100644
--- a/test-curves/src/bls12_381/fq2.rs
+++ b/test-curves/src/bls12_381/fq2.rs
@@ -1,5 +1,5 @@
 use crate::bls12_381::*;
-use ark_ff::{fields::*, MontFp};
+use ark_ff::{fields::*, AdditiveGroup, MontFp};
 
 pub type Fq2 = Fp2<Fq2Config>;
 
diff --git a/test-curves/src/lib.rs b/test-curves/src/lib.rs
index 9337089fa..0ebe128f5 100644
--- a/test-curves/src/lib.rs
+++ b/test-curves/src/lib.rs
@@ -1,10 +1,8 @@
 #![no_std]
 
-pub use ark_ff;
-pub use ark_ff::{fields::models::*, FftField, Field, LegendreSymbol, MontFp, PrimeField};
+pub use ark_ff::{self, fields::models::*, FftField, Field, LegendreSymbol, MontFp, PrimeField};
 
-pub use ark_ec;
-pub use ark_ec::*;
+pub use ark_ec::{self, *};
 
 #[cfg(any(feature = "bls12_381_scalar_field", feature = "bls12_381_curve"))]
 pub mod bls12_381;