From 8177e7aab050ef897e658371f5941f9f7cf2b29e Mon Sep 17 00:00:00 2001
From: Thomas Coratger <60488569+tcoratger@users.noreply.github.com>
Date: Mon, 11 Mar 2024 15:16:35 +0100
Subject: [PATCH] Small refactoring in mul mod (#582)

---
 src/uint/mul_mod.rs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/uint/mul_mod.rs b/src/uint/mul_mod.rs
index 8010ebb7..b1a130f7 100644
--- a/src/uint/mul_mod.rs
+++ b/src/uint/mul_mod.rs
@@ -21,10 +21,7 @@ impl<const LIMBS: usize> Uint<LIMBS> {
         match p.to_odd().into() {
             Some(odd_p) => {
                 let params = MontyParams::new_vartime(odd_p);
-                let lhs = MontyForm::new(self, params);
-                let rhs = MontyForm::new(rhs, params);
-                let ret = lhs * rhs;
-                ret.retrieve()
+                (MontyForm::new(self, params) * MontyForm::new(rhs, params)).retrieve()
             }
             None => todo!("even moduli are currently unsupported"),
         }
@@ -83,9 +80,7 @@ const fn mac_by_limb<const LIMBS: usize>(
     let mut carry = carry;
 
     while i < LIMBS {
-        let (n, c) = a.limbs[i].mac(b.limbs[i], c, carry);
-        a.limbs[i] = n;
-        carry = c;
+        (a.limbs[i], carry) = a.limbs[i].mac(b.limbs[i], c, carry);
         i += 1;
     }