Reorder arithmetic definition

Author: darth-cy

spartan_parallel/src/scalar/fp.rs

@@ -15,36 +15,6 @@ use zeroize::Zeroize;
 #[derive(Clone, Copy, Eq, Serialize, Deserialize, Hash, Debug)]
 pub struct Scalar(Goldilocks);
 
-impl Mul<Goldilocks> for Scalar {
-  type Output = Scalar;
-
-  #[inline]
-  fn mul(self, rhs: Goldilocks) -> Self::Output {
-    (*self.inner() * rhs).into()
-  }
-}
-impl<'a> Mul<&'a Goldilocks> for Scalar {
-  type Output = Self;
-
-  #[inline]
-  fn mul(mut self, rhs: &'a Goldilocks) -> Self::Output {
-    self *= rhs;
-    self
-  }
-}
-impl MulAssign<&Goldilocks> for Scalar {
-  #[inline]
-  fn mul_assign(&mut self, rhs: &Goldilocks) {
-    self.0 *= rhs;
-  }
-}
-impl MulAssign<Goldilocks> for Scalar {
-  #[inline]
-  fn mul_assign(&mut self, rhs: Goldilocks) {
-    self.mul_assign(&rhs)
-  }
-}
-
 impl SpartanExtensionField for Scalar {
   type InnerType = Goldilocks;
   type BaseField = Goldilocks;
@@ -197,6 +167,38 @@ impl<'a, 'b> Mul<&'b Scalar> for &'a Scalar {
   }
 }
 
+impl Mul<Goldilocks> for Scalar {
+  type Output = Scalar;
+
+  #[inline]
+  fn mul(self, rhs: Goldilocks) -> Self::Output {
+    (*self.inner() * rhs).into()
+  }
+}
+
+impl<'a> Mul<&'a Goldilocks> for Scalar {
+  type Output = Self;
+
+  #[inline]
+  fn mul(mut self, rhs: &'a Goldilocks) -> Self::Output {
+    self *= rhs;
+    self
+  }
+}
+
+impl MulAssign<&Goldilocks> for Scalar {
+  #[inline]
+  fn mul_assign(&mut self, rhs: &Goldilocks) {
+    self.0 *= rhs;
+  }
+}
+impl MulAssign<Goldilocks> for Scalar {
+  #[inline]
+  fn mul_assign(&mut self, rhs: Goldilocks) {
+    self.mul_assign(&rhs)
+  }
+}
+
 impl<T> Sum<T> for Scalar
 where
   T: Borrow<Scalar>,

spartan_parallel/src/scalar/fp2.rs

@@ -20,35 +20,6 @@ impl From<GoldilocksExt2> for ScalarExt2 {
   }
 }
 
-impl Mul<Goldilocks> for ScalarExt2 {
-  type Output = ScalarExt2;
-
-  #[inline]
-  fn mul(self, rhs: Goldilocks) -> Self::Output {
-    (self.inner() * &rhs).into()
-  }
-}
-impl<'a> Mul<&'a Goldilocks> for ScalarExt2 {
-  type Output = Self;
-
-  #[inline]
-  fn mul(mut self, rhs: &'a Goldilocks) -> Self::Output {
-    self *= rhs;
-    self
-  }
-}
-impl MulAssign<&Goldilocks> for ScalarExt2 {
-  #[inline]
-  fn mul_assign(&mut self, rhs: &Goldilocks) {
-    self.0 *= rhs;
-  }
-}
-impl MulAssign<Goldilocks> for ScalarExt2 {
-  #[inline]
-  fn mul_assign(&mut self, rhs: Goldilocks) {
-    self.mul_assign(&rhs)
-  }
-}
 impl SpartanExtensionField for ScalarExt2 {
   type InnerType = GoldilocksExt2;
   type BaseField = Goldilocks;
@@ -205,6 +176,39 @@ impl<'a, 'b> Mul<&'b ScalarExt2> for &'a ScalarExt2 {
   }
 }
 
+impl Mul<Goldilocks> for ScalarExt2 {
+  type Output = ScalarExt2;
+
+  #[inline]
+  fn mul(self, rhs: Goldilocks) -> Self::Output {
+    (self.inner() * &rhs).into()
+  }
+}
+
+impl<'a> Mul<&'a Goldilocks> for ScalarExt2 {
+  type Output = Self;
+
+  #[inline]
+  fn mul(mut self, rhs: &'a Goldilocks) -> Self::Output {
+    self *= rhs;
+    self
+  }
+}
+
+impl MulAssign<&Goldilocks> for ScalarExt2 {
+  #[inline]
+  fn mul_assign(&mut self, rhs: &Goldilocks) {
+    self.0 *= rhs;
+  }
+}
+
+impl MulAssign<Goldilocks> for ScalarExt2 {
+  #[inline]
+  fn mul_assign(&mut self, rhs: Goldilocks) {
+    self.mul_assign(&rhs)
+  }
+}
+
 impl<T> Sum<T> for ScalarExt2
 where
   T: Borrow<ScalarExt2>,