Implement initial num-traits

.travis.yml

@@ -8,5 +8,7 @@ rust:
 env:
   - FLAGS="--no-default-features"
   - FLAGS="--features std"
+  - FLAGS="--no-default-features --features num"
+  - FLAGS="--features std --features num"
 
 script: cargo test $FLAGS

Cargo.toml

@@ -14,11 +14,15 @@ keywords = ["integer", "unaligned", "misaligned"]
 categories = ["embedded", "no-std", "data-structures"]
 
 
-[dependencies]
+[dependencies.num-traits]
+version = "0.2.6"
+optional = true
+default-features = false
 
 [features]
 default = ["std"]
 std = []
+num = ["num-traits"]
 
 [badges]
 travis-ci = {repository = "kjetilkjeka/uX", branch = "master"}

src/conversion.rs

@@ -318,6 +318,65 @@ impl From<u1> for bool {
     }
 }
 
+#[cfg(feature="num")]
+macro_rules! num_convert {
+    {[$($name:ident),*]} => {$(num_convert!($name);)*};
+    ($name:ident) => {
+        macro_rules! from_int {
+            ($method:ident, $ty:ident) => {
+                fn $method(n: $ty) -> Option<$name> {
+                    let v = num_traits::cast::NumCast::from(n)?;
+                    if v <= $name::MAX.0 && v >= $name::MIN.0 {
+                        Some($name(v))
+                    } else {
+                        None
+                    }
+                }
+            }
+        }
+        macro_rules! to_int {
+            ($method:ident, $ty:ident) => {
+                fn $method(&self) -> Option<$ty> {
+                    (self.mask().0).$method()
+                }
+            }
+        }
+        impl num_traits::FromPrimitive for $name {
+            from_int!(from_i8, i8);
+            from_int!(from_u8, u8);
+            from_int!(from_i16, i16);
+            from_int!(from_u16, u16);
+            from_int!(from_i32, i32);
+            from_int!(from_u32, u32);
+            from_int!(from_i64, i64);
+            from_int!(from_u64, u64);
+            #[cfg(has_i128)]
+            from_int!(from_i128, i128);
+            #[cfg(has_i128)]
+            from_int!(from_u128, u128);
+        }
+
+        impl num_traits::ToPrimitive for $name {
+            to_int!(to_i8, i8);
+            to_int!(to_u8, u8);
+            to_int!(to_i16, i16);
+            to_int!(to_u16, u16);
+            to_int!(to_i32, i32);
+            to_int!(to_u32, u32);
+            to_int!(to_i64, i64);
+            to_int!(to_u64, u64);
+            #[cfg(has_i128)]
+            to_int!(to_i128, i128);
+            #[cfg(has_i128)]
+            to_int!(to_u128, u128);
+        }
+    }
+}
+
+#[cfg(feature="num")]
+num_convert!([i2, i3, i4, i5, i6, i7, i9, i10, i11, i12, i13, i14, i15, i17, i18, i19, i20, i21, i22, i23, i24, i25, i26, i27, i28, i29, i30, i31,
+                     i33, i34, i35, i36, i37, i38, i39, i40, i41, i42, i43, i44, i45, i46, i47, i48, i49, i50, i51, i52, i53, i54, i55, i56, i57, i58, i59, i60, i61, i62, i63]);
+
 #[cfg(test)]
 mod tests {
     use super::*;

src/lib.rs

@@ -11,6 +11,8 @@
 
 #![cfg_attr(not(feature="std"), no_std)]
 
+#[cfg(feature="num")]
+extern crate num_traits;
 
 mod lib {
     pub mod core {
@@ -432,9 +434,40 @@ macro_rules! implement_common {
             }
         }
 
+        #[cfg(num)]
+        impl num_traits::Bounded for $name {
+            fn min_value() -> $name {
+                $name::MIN
+            }
+            fn max_value() -> $name {
+                $name::MAX
+            }
+        }
 
+        #[cfg(num)]
+        impl num_traits::Zero for $name {
+            fn zero() -> $name {
+                $name(0)
+            }
 
+            fn is_zero(&self) -> bool {
+                self.mask().0 == 0
+            }
+        }
+
+        #[cfg(num)]
+        impl num_traits::WrappingAdd for $name {
+            fn wrapping_add(&self, rhs: &$name) -> $name {
+                <$name>::wrapping_add(*self, *rhs)
+            }
+        }
 
+        #[cfg(num)]
+        impl num_traits::WrappingSub for $name {
+            fn wrapping_sub(&self, rhs: &$name) -> $name {
+                <$name>::wrapping_sub(*self, *rhs)
+            }
+        }
     };
 }