Parcourir la source

Add more Pow implementations.

Clar Charr il y a 7 ans
Parent
commit
61a6acc9c2
1 fichiers modifiés avec 80 ajouts et 21 suppressions
  1. 80 21
      src/pow.rs

+ 80 - 21
src/pow.rs

@@ -1,4 +1,5 @@
 use core::ops::Mul;
+use core::num::Wrapping;
 use {One, CheckedMul};
 
 /// Binary operator for raising a value to a power.
@@ -18,13 +19,22 @@ pub trait Pow<RHS> {
 }
 
 macro_rules! pow_impl {
-    ($t:ty, $rhs:ty, $method:ident) => {
+    ($t:ty) => {
+        pow_impl!($t, u8);
+        pow_impl!($t, u16);
+        pow_impl!($t, u32);
+        pow_impl!($t, u64);
+        pow_impl!($t, usize);
+    };
+    ($t:ty, $rhs:ty) => {
+        pow_impl!($t, $rhs, |x, p| pow(x, p as usize));
+    };
+    ($t:ty, $rhs:ty, $method:expr) => {
         impl Pow<$rhs> for $t {
             type Output = $t;
-
             #[inline]
             fn pow(self, rhs: $rhs) -> $t {
-                <$t>::$method(self, rhs)
+                ($method)(self, rhs)
             }
         }
 
@@ -32,7 +42,7 @@ macro_rules! pow_impl {
             type Output = $t;
             #[inline]
             fn pow(self, rhs: &'a $rhs) -> $t {
-                <$t>::$method(self, *rhs)
+                ($method)(self, *rhs)
             }
         }
 
@@ -40,7 +50,7 @@ macro_rules! pow_impl {
             type Output = $t;
             #[inline]
             fn pow(self, rhs: $rhs) -> $t {
-                <$t>::$method(*self, rhs)
+                ($method)(*self, rhs)
             }
         }
 
@@ -48,31 +58,80 @@ macro_rules! pow_impl {
             type Output = $t;
             #[inline]
             fn pow(self, rhs: &'a $rhs) -> $t {
-                <$t>::$method(*self, *rhs)
+                ($method)(*self, *rhs)
             }
         }
-    }
+    };
 }
 
-pow_impl!(u8, u32, pow);
-pow_impl!(i8, u32, pow);
-pow_impl!(u16, u32, pow);
-pow_impl!(i16, u32, pow);
-pow_impl!(u32, u32, pow);
-pow_impl!(i32, u32, pow);
-pow_impl!(u64, u32, pow);
-pow_impl!(i64, u32, pow);
-pow_impl!(usize, u32, pow);
-pow_impl!(isize, u32, pow);
+pow_impl!(u8, u8, |x: u8, p| x.pow(p as u32));
+pow_impl!(u8, u16, |x: u8, p| x.pow(p as u32));
+pow_impl!(u8, u32, u8::pow);
+pow_impl!(u8, usize);
+pow_impl!(i8, u8, |x: i8, p| x.pow(p as u32));
+pow_impl!(i8, u16, |x: i8, p| x.pow(p as u32));
+pow_impl!(i8, u32, i8::pow);
+pow_impl!(i8, usize);
+pow_impl!(u16, u8, |x: u16, p| x.pow(p as u32));
+pow_impl!(u16, u16, |x: u16, p| x.pow(p as u32));
+pow_impl!(u16, u32, u16::pow);
+pow_impl!(u16, usize);
+pow_impl!(i16, u8, |x: i16, p| x.pow(p as u32));
+pow_impl!(i16, u16, |x: i16, p| x.pow(p as u32));
+pow_impl!(i16, u32, i16::pow);
+pow_impl!(i16, usize);
+pow_impl!(u32, u8, |x: u32, p| x.pow(p as u32));
+pow_impl!(u32, u16, |x: u32, p| x.pow(p as u32));
+pow_impl!(u32, u32, u32::pow);
+pow_impl!(u32, usize);
+pow_impl!(i32, u8, |x: i32, p| x.pow(p as u32));
+pow_impl!(i32, u16, |x: i32, p| x.pow(p as u32));
+pow_impl!(i32, u32, i32::pow);
+pow_impl!(i32, usize);
+pow_impl!(u64, u8, |x: u64, p| x.pow(p as u32));
+pow_impl!(u64, u16, |x: u64, p| x.pow(p as u32));
+pow_impl!(u64, u32, u64::pow);
+pow_impl!(u64, usize);
+pow_impl!(i64, u8, |x: i64, p| x.pow(p as u32));
+pow_impl!(i64, u16, |x: i64, p| x.pow(p as u32));
+pow_impl!(i64, u32, i64::pow);
+pow_impl!(i64, usize);
+pow_impl!(usize, u8, |x: usize, p| x.pow(p as u32));
+pow_impl!(usize, u16, |x: usize, p| x.pow(p as u32));
+pow_impl!(usize, u32, usize::pow);
+pow_impl!(usize, usize);
+pow_impl!(isize, u8, |x: isize, p| x.pow(p as u32));
+pow_impl!(isize, u16, |x: isize, p| x.pow(p as u32));
+pow_impl!(isize, u32, isize::pow);
+pow_impl!(isize, usize);
+pow_impl!(Wrapping<u8>);
+pow_impl!(Wrapping<i8>);
+pow_impl!(Wrapping<u16>);
+pow_impl!(Wrapping<i16>);
+pow_impl!(Wrapping<u32>);
+pow_impl!(Wrapping<i32>);
+pow_impl!(Wrapping<u64>);
+pow_impl!(Wrapping<i64>);
+pow_impl!(Wrapping<usize>);
+pow_impl!(Wrapping<isize>);
 
 #[cfg(feature = "std")]
 mod float_impls {
     use super::Pow;
 
-    pow_impl!(f32, i32, powi);
-    pow_impl!(f64, i32, powi);
-    pow_impl!(f32, f32, powf);
-    pow_impl!(f64, f64, powf);
+    pow_impl!(f32, i8, |x: f32, p| x.powi(p as i32));
+    pow_impl!(f32, u8, |x: f32, p| x.powi(p as i32));
+    pow_impl!(f32, i16, |x: f32, p| x.powi(p as i32));
+    pow_impl!(f32, u16, |x: f32, p| x.powi(p as i32));
+    pow_impl!(f32, i32, f32::powi);
+    pow_impl!(f64, i8, |x: f64, p| x.powi(p as i32));
+    pow_impl!(f64, u8, |x: f64, p| x.powi(p as i32));
+    pow_impl!(f64, i16, |x: f64, p| x.powi(p as i32));
+    pow_impl!(f64, u16, |x: f64, p| x.powi(p as i32));
+    pow_impl!(f64, i32, f64::powi);
+    pow_impl!(f32, f32, f32::powf);
+    pow_impl!(f64, f32, |x: f64, p| x.powf(p as f64));
+    pow_impl!(f64, f64, f64::powf);
 }