Remove macros and impl mul_add by hand

Author: Schultzer

src/lib.rs

@@ -454,17 +454,6 @@ impl<'a, T: Clone + Num> From<&'a T> for Complex<T> {
 }
 
 macro_rules! forward_ref_ref_binop {
-    (impl $imp:ident, mul_add) => {
-        impl<'a, 'b, T: Clone + Num> $imp<&'b Complex<T>> for &'a Complex<T> {
-            type Output = Complex<T>;
-
-            #[inline]
-            fn mul_add(self, other: &Complex<T>, add: &Complex<T>) -> Complex<T> {
-                self.clone().mul_add(other, add.clone())
-            }
-        }
-    };
-
     (impl $imp:ident, $method:ident) => {
         impl<'a, 'b, T: Clone + Num> $imp<&'b Complex<T>> for &'a Complex<T> {
             type Output = Complex<T>;
@@ -478,17 +467,6 @@ macro_rules! forward_ref_ref_binop {
 }
 
 macro_rules! forward_ref_val_binop {
-    (impl $imp:ident, mul_add) => {
-        impl<'a, T: Clone + Num> $imp<Complex<T>> for &'a Complex<T> {
-            type Output = Complex<T>;
-
-            #[inline]
-            fn mul_add(self, other: Complex<T>, add: &Complex<T>) -> Complex<T> {
-                self.clone().mul_add(&other, add.clone())
-            }
-        }
-    };
-
     (impl $imp:ident, $method:ident) => {
         impl<'a, T: Clone + Num> $imp<Complex<T>> for &'a Complex<T> {
             type Output = Complex<T>;
@@ -502,17 +480,6 @@ macro_rules! forward_ref_val_binop {
 }
 
 macro_rules! forward_val_ref_binop {
-    (impl $imp:ident, mul_add) => {
-        impl<'a, T: Clone + Num> $imp<&'a Complex<T>> for Complex<T> {
-            type Output = Complex<T>;
-
-            #[inline]
-            fn mul_add(self, other: &Complex<T>, add: Complex<T>) -> Complex<T> {
-                self.mul_add(other, add)
-            }
-        }
-    };
-
     (impl $imp:ident, $method:ident) => {
         impl<'a, T: Clone + Num> $imp<&'a Complex<T>> for Complex<T> {
             type Output = Complex<T>;
@@ -573,20 +540,25 @@ impl<T: Clone + Num> Mul<Complex<T>> for Complex<T> {
 }
 
 
-forward_all_binop!(impl MulAdd, mul_add);
-
 // (a + i b) - (c + i d) == (a - c) + i (b - d)
 impl<T: Clone + Num + MulAdd<Output = T>> MulAdd<Complex<T>> for Complex<T> {
     type Output = Complex<T>;
 
     #[inline]
-    fn mul_add(self, other: Complex<T>, x: Complex<T>) -> Complex<T> {
-        let re = self.re.clone().mul_add(other.re.clone(), x.re.clone()) - self.im.clone() * other.im.clone(); // FIXME: use mulsub when available in rust
-        let im = self.re.mul_add(other.im, self.im.mul_add(other.re, x.im));
+    fn mul_add(self, other: Complex<T>, add: Complex<T>) -> Complex<T> {
+        let re = self.re.clone().mul_add(other.re.clone(), add.re.clone()) - self.im.clone() * other.im.clone(); // FIXME: use mulsub when available in rust
+        let im = self.re.mul_add(other.im, self.im.mul_add(other.re, add.im));
         Complex::new(re, im)
     }
 }
+impl<'a, 'b, T: Clone + Num + MulAdd<Output = T>> MulAdd<&'b Complex<T>> for &'a Complex<T> {
+    type Output = Complex<T>;
 
+    #[inline]
+    fn mul_add(self, other: &Complex<T>, add: &Complex<T>) -> Complex<T> {
+        self.clone().mul_add(other.clone(), add.clone())
+    }
+}
 
 forward_all_binop!(impl Div, div);
 
@@ -650,9 +622,9 @@ mod opassign {
         }
     }
 
-    impl<T: Clone + NumAssign + MulAddAssign> MulAddAssign for Complex<T> {
-        fn mul_add_assign(&mut self, a: Complex<T>, b: Complex<T>) {
-            *self = self.clone().mul_add(&a, b);
+    impl<T: Clone + NumAssign + MulAdd<Output = T>> MulAddAssign for Complex<T> {
+        fn mul_add_assign(&mut self, other: Complex<T>, add: Complex<T>) {
+            *self = self.clone().mul_add(other, add);
         }
     }
 
@@ -701,15 +673,6 @@ mod opassign {
     }
 
     macro_rules! forward_op_assign {
-        (impl $imp:ident, mul_add_assign) => {
-            impl<'a, T: Clone + NumAssign> $imp<&'a Complex<T>> for Complex<T> {
-                #[inline]
-                fn mul_add_assign(&mut self, other: &Complex<T>, add: Complex<T>) {
-                    self.mul_add_assign(other, add)
-                }
-            }
-        };
-
         (impl $imp:ident, $method:ident) => {
             impl<'a, T: Clone + NumAssign> $imp<&'a Complex<T>> for Complex<T> {
                 #[inline]
@@ -729,7 +692,6 @@ mod opassign {
     forward_op_assign!(impl AddAssign, add_assign);
     forward_op_assign!(impl SubAssign, sub_assign);
     forward_op_assign!(impl MulAssign, mul_assign);
-    forward_op_assign!(impl MulAddAssign, mul_add_assign);
     forward_op_assign!(impl DivAssign, div_assign);
 
     impl<'a, T: Clone + NumAssign> RemAssign<&'a Complex<T>> for Complex<T> {