Implement num::Saturating.

Part of iliekturtles#35.
radix · Dec 28, 2017 · 6d169a7 · 6d169a7
1 parent 641ebe5
commit 6d169a7
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 
 ### Added
  * [#26](https://github.com/iliekturtles/uom/issues/26) Implement `num::Zero`.
+ * [#35](https://github.com/iliekturtles/uom/issues/35) Implement `num::Saturating`.
 
 ## [v0.16.0] — 2017-12-21
 This release contains significant changes in order to support underlying storage types that

diff --git a/src/system.rs b/src/system.rs
@@ -839,6 +839,21 @@ macro_rules! system {
             }
         }
 
+        impl<D, U, V> $crate::num::Saturating for Quantity<D, U, V>
+        where
+            D: Dimension + ?Sized,
+            U: Units<V> + ?Sized,
+            V: $crate::num::Num + $crate::Conversion<V> + $crate::num::Saturating,
+        {
+            fn saturating_add(self, v: Self) -> Self {
+                Quantity { value: self.value.saturating_add(v.value), ..self }
+            }
+
+            fn saturating_sub(self, v: Self) -> Self {
+                Quantity { value: self.value.saturating_sub(v.value), ..self }
+            }
+        }
+
         impl<D, U, V> $crate::num::Zero for Quantity<D, U, V>
         where
             D: Dimension + ?Sized,

diff --git a/src/tests.rs b/src/tests.rs
@@ -3,7 +3,7 @@ use self::mass::kilogram;
 #[allow(unused_imports)]
 use {Conversion, ConversionFactor};
 #[allow(unused_imports)]
-use num::{Float, FromPrimitive, One, Signed, Zero};
+use num::{Float, FromPrimitive, One, Saturating, Signed, Zero};
 use quickcheck::TestResult;
 use lib::fmt::Debug;
 use lib::marker::PhantomData;
@@ -379,6 +379,7 @@ mod quantity_macro {
 }
 
 mod system_macro {
+
     storage_types! {
         use tests::*;
 
@@ -530,6 +531,32 @@ mod system_macro {
         }
     }
 
+    mod int {
+        storage_types! {
+            types: PrimInt, BigInt, BigUint;
+
+            use tests::*;
+
+            Q!(tests, V);
+
+            quickcheck! {
+                #[allow(trivial_casts)]
+                fn saturating_add(l: A<V>, r: A<V>) -> bool {
+                    Test::eq(&(l.saturating_add(*r)),
+                        &(Length::new::<meter>((*l).clone())
+                            .saturating_add(Length::new::<meter>((*r).clone())).get(meter)))
+                }
+
+                #[allow(trivial_casts)]
+                fn saturating_sub(l: A<V>, r: A<V>) -> bool {
+                    Test::eq(&(l.saturating_sub(*r)),
+                        &(Length::new::<meter>((*l).clone())
+                            .saturating_sub(Length::new::<meter>((*r).clone())).get(meter)))
+                }
+            }
+        }
+    }
+
     mod float {
         storage_types! {
             types: Float;