From b8ef58c0023a9bb608756a815738fb07b0e852d8 Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@debian.org>
Date: Wed, 29 Jul 2020 19:47:44 +0200
Subject: [PATCH] factor::Factors: Split off a Decomposition type

The new type can be used to represent in-progress factorisations,
which contain non-prime factors.
---
 src/uu/factor/src/factor.rs | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/uu/factor/src/factor.rs b/src/uu/factor/src/factor.rs
index 6a7f688ac..d26315172 100644
--- a/src/uu/factor/src/factor.rs
+++ b/src/uu/factor/src/factor.rs
@@ -62,22 +62,42 @@ impl PartialEq for Decomposition {
         true
     }
 #[derive(Clone, Debug, Eq, PartialEq)]
-pub struct Factors {
-    f: BTreeMap<u64, Exponent>,
+struct Decomposition(BTreeMap<u64, Exponent>);
+
+impl Decomposition {
+    fn one() -> Decomposition {
+        Decomposition(BTreeMap::new())
+    }
+
+    fn add(&mut self, factor: u64, exp: Exponent) {
+        debug_assert!(exp > 0);
+        let n = *self.0.get(&factor).unwrap_or(&0);
+        self.0.insert(factor, exp + n);
+    }
+
+    #[cfg(test)]
+    fn product(&self) -> u64 {
+        self.0
+            .iter()
+            .fold(1, |acc, (p, exp)| acc * p.pow(*exp as u32))
+    }
 }
 impl Eq for Decomposition {}
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct Factors(RefCell<Decomposition>);
 
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct Factors(Decomposition);
+
 impl Factors {
     pub fn one() -> Factors {
-        Factors(RefCell::new(Decomposition::one()))
+        Factors(Decomposition::one())
     }
 
     pub fn add(&mut self, prime: u64, exp: Exponent) {
         debug_assert!(miller_rabin::is_prime(prime));
-        self.0.borrow_mut().add(prime, exp)
+        self.0.add(prime, exp)
     }
 
     pub fn push(&mut self, prime: u64) {
@@ -86,16 +106,13 @@ impl Factors {
 
     #[cfg(test)]
     fn product(&self) -> u64 {
-        self.0.borrow().product()
+        self.0.product()
     }
 }
 
 impl fmt::Display for Factors {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let v = &mut (self.0).borrow_mut().0;
-        v.sort_unstable();
-
-        for (p, exp) in v.iter() {
+        for (p, exp) in (self.0).0.iter() {
             for _ in 0..*exp {
                 write!(f, " {}", p)?
             }