Use enum-error-derive

Author: termoshtt

Cargo.toml

@@ -15,6 +15,7 @@ openblas = ["blas/openblas", "lapack/openblas"]
 netlib   = ["blas/netlib", "lapack/netlib"]
 
 [dependencies]
+enum-error-derive = "0.1"
 num-traits  = "0.1"
 num-complex = "0.1"
 ndarray = { version = "0.9",  default-features = false, features = ["blas"] }

src/error.rs

@@ -4,6 +4,14 @@ use std::error;
 use std::fmt;
 use ndarray::{Ixs, ShapeError};
 
+#[derive(Debug, EnumError)]
+pub enum LinalgError {
+    NotSquare(NotSquareError),
+    Lapack(LapackError),
+    Stride(StrideError),
+    Shape(ShapeError),
+}
+
 #[derive(Debug)]
 pub struct LapackError {
     pub return_code: i32,
@@ -62,56 +70,3 @@ impl error::Error for StrideError {
         "invalid stride"
     }
 }
-
-#[derive(Debug)]
-pub enum LinalgError {
-    NotSquare(NotSquareError),
-    Lapack(LapackError),
-    Stride(StrideError),
-    Shape(ShapeError),
-}
-
-impl fmt::Display for LinalgError {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        match *self {
-            LinalgError::NotSquare(ref err) => err.fmt(f),
-            LinalgError::Lapack(ref err) => err.fmt(f),
-            LinalgError::Stride(ref err) => err.fmt(f),
-            LinalgError::Shape(ref err) => err.fmt(f),
-        }
-    }
-}
-
-impl error::Error for LinalgError {
-    fn description(&self) -> &str {
-        match *self {
-            LinalgError::NotSquare(ref err) => err.description(),
-            LinalgError::Lapack(ref err) => err.description(),
-            LinalgError::Stride(ref err) => err.description(),
-            LinalgError::Shape(ref err) => err.description(),
-        }
-    }
-}
-
-impl From<NotSquareError> for LinalgError {
-    fn from(err: NotSquareError) -> LinalgError {
-        LinalgError::NotSquare(err)
-    }
-}
-
-impl From<LapackError> for LinalgError {
-    fn from(err: LapackError) -> LinalgError {
-        LinalgError::Lapack(err)
-    }
-}
-
-impl From<StrideError> for LinalgError {
-    fn from(err: StrideError) -> LinalgError {
-        LinalgError::Stride(err)
-    }
-}
-impl From<ShapeError> for LinalgError {
-    fn from(err: ShapeError) -> LinalgError {
-        LinalgError::Shape(err)
-    }
-}

src/impls/opnorm.rs

@@ -3,21 +3,21 @@
 use lapack::c::*;
 
 pub trait ImplOpNorm: Sized {
-    fn opnorm_1(m: usize, n: usize, a: Vec<Self>) -> Self;
-    fn opnorm_i(m: usize, n: usize, a: Vec<Self>) -> Self;
-    fn opnorm_f(m: usize, n: usize, a: Vec<Self>) -> Self;
+    fn opnorm_1(m: usize, n: usize, a: &[Self]) -> Self;
+    fn opnorm_i(m: usize, n: usize, a: &[Self]) -> Self;
+    fn opnorm_f(m: usize, n: usize, a: &[Self]) -> Self;
 }
 
 macro_rules! impl_opnorm {
     ($scalar:ty, $lange:path) => {
 impl ImplOpNorm for $scalar {
-    fn opnorm_1(m: usize, n: usize, mut a: Vec<Self>) -> Self {
+    fn opnorm_1(m: usize, n: usize, mut a: &[Self]) -> Self {
         $lange(Layout::ColumnMajor, b'o', m as i32, n as i32, &mut a, m as i32)
     }
-    fn opnorm_i(m: usize, n: usize, mut a: Vec<Self>) -> Self {
+    fn opnorm_i(m: usize, n: usize, mut a: &[Self]) -> Self {
         $lange(Layout::ColumnMajor, b'i', m as i32, n as i32, &mut a, m as i32)
     }
-    fn opnorm_f(m: usize, n: usize, mut a: Vec<Self>) -> Self {
+    fn opnorm_f(m: usize, n: usize, mut a: &[Self]) -> Self {
         $lange(Layout::ColumnMajor, b'f', m as i32, n as i32, &mut a, m as i32)
     }
 }

src/lib.rs

@@ -37,6 +37,8 @@ extern crate num_traits;
 extern crate num_complex;
 #[macro_use(s)]
 extern crate ndarray;
+#[macro_use]
+extern crate enum_error_derive;
 
 pub mod impls;
 pub mod error;