Merge Absolute traint into types.rs

Author: termoshtt

src/types.rs

@@ -11,21 +11,55 @@ pub trait AssociatedComplex: Sized {
     type Complex;
 }
 
-macro_rules! impl_assoc {
+/// Field with norm
+pub trait Absolute {
+    type Output: Float;
+    fn squared(&self) -> Self::Output;
+    fn abs(&self) -> Self::Output {
+        self.squared().sqrt()
+    }
+}
+
+macro_rules! impl_traits {
     ($real:ty, $complex:ty) => {
+
 impl AssociatedReal for $real {
     type Real = $real;
 }
+
 impl AssociatedReal for $complex {
     type Real = $real;
 }
+
 impl AssociatedComplex for $real {
     type Complex = $complex;
 }
+
 impl AssociatedComplex for $complex {
     type Complex = $complex;
 }
-}} // impl_assoc!
 
-impl_assoc!(f64, c64);
-impl_assoc!(f32, c32);
+impl Absolute for $real {
+    type Output = Self;
+    fn squared(&self) -> Self::Output {
+        *self * *self
+    }
+    fn abs(&self) -> Self::Output {
+        Float::abs(*self)
+    }
+}
+
+impl Absolute for $complex {
+    type Output = $real;
+    fn squared(&self) -> Self::Output {
+        self.norm_sqr()
+    }
+    fn abs(&self) -> Self::Output {
+        self.norm()
+    }
+}
+
+}} // impl_traits!
+
+impl_traits!(f64, c64);
+impl_traits!(f32, c32);

src/vector.rs

@@ -43,40 +43,3 @@ impl<A, S, D, T> Norm for ArrayBase<S, D>
         })
     }
 }
-
-/// Field with norm
-pub trait Absolute {
-    type Output: Float;
-    fn squared(&self) -> Self::Output;
-    fn abs(&self) -> Self::Output {
-        self.squared().sqrt()
-    }
-}
-
-macro_rules! impl_abs {
-    ($f:ty, $c:ty) => {
-
-impl Absolute for $f {
-    type Output = Self;
-    fn squared(&self) -> Self::Output {
-        *self * *self
-    }
-    fn abs(&self) -> Self::Output {
-        Float::abs(*self)
-    }
-}
-
-impl Absolute for $c {
-    type Output = $f;
-    fn squared(&self) -> Self::Output {
-        self.norm_sqr()
-    }
-    fn abs(&self) -> Self::Output {
-        self.norm()
-    }
-}
-
-}} // impl_abs!
-
-impl_abs!(f64, c64);
-impl_abs!(f32, c32);