Avoid clone in sign normalization too

rust-num · Jun 23, 2022 · 8506da1 · 8506da1
1 parent 3d80360
commit 8506da1
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -142,23 +142,24 @@ impl<T: Clone + Integer> Ratio<T> {
         let g: T = self.numer.gcd(&self.denom);
 
         // FIXME(#5992): assignment operator overloads
-        // self.numer /= g;
         // T: Clone + Integer != T: Clone + NumAssign
-        let numer = std::mem::replace(&mut self.numer, T::zero());
-        self.numer = numer / g.clone();
-        // self.numer = self.numer.clone() / g.clone();
 
-        // FIXME(#5992): assignment operator overloads
+        #[inline]
+        fn replace_with<T: Zero>(x: &mut T, f: impl FnOnce(T) -> T) {
+            let y = core::mem::replace(x, T::zero());
+            *x = f(y);
+        }
+
+        // self.numer /= g;
+        replace_with(&mut self.numer, |x| x / g.clone());
+
         // self.denom /= g;
-        // T: Clone + Integer != T: Clone + NumAssign
-        let denom = std::mem::replace(&mut self.denom, T::zero());
-        self.denom = denom / g;
-        // self.denom = self.denom.clone() / g;
+        replace_with(&mut self.denom, |x| x / g);
 
         // keep denom positive!
         if self.denom < T::zero() {
-            self.numer = T::zero() - self.numer.clone();
-            self.denom = T::zero() - self.denom.clone();
+            replace_with(&mut self.numer, |x| T::zero() - x);
+            replace_with(&mut self.denom, |x| T::zero() - x);
         }
     }