libimaginteraction: Replace error code with code generator macro

libimaginteraction/Cargo.toml

@@ -20,3 +20,6 @@ path = "../libimagentryfilter"
 [dependencies.libimagutil]
 path = "../libimagutil"
 
+[dependencies.libimagerror]
+path = "../libimagerror"
+

libimaginteraction/src/error.rs

@@ -2,76 +2,7 @@ use std::error::Error;
 use std::fmt::Error as FmtError;
 use std::fmt::{Display, Formatter};
 
-/**
+generate_error_types!(InteractionError, InteractionErrorKind,
- * Kind of error
+    Unknown => "Unknown Error"
- */
+);
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum InteractionErrorKind {
-    Unknown
-}
-
-fn interaction_error_type_as_str(e: &InteractionErrorKind) -> &'static str {
-    match *e {
-        InteractionErrorKind::Unknown => "Unknown Error",
-    }
-}
-
-impl Display for InteractionErrorKind {
-
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
-        try!(write!(fmt, "{}", interaction_error_type_as_str(self)));
-        Ok(())
-    }
-
-}
-
-#[derive(Debug)]
-pub struct InteractionError {
-    err_type: InteractionErrorKind,
-    cause: Option<Box<Error>>,
-}
-
-impl InteractionError {
-
-    /**
-     * Build a new InteractionError from an InteractionErrorKind, optionally with cause
-     */
-    pub fn new(errtype: InteractionErrorKind, cause: Option<Box<Error>>)
-        -> InteractionError
-        {
-            InteractionError {
-                err_type: errtype,
-                cause: cause,
-            }
-        }
-
-    /**
-     * Get the error type of this InteractionError
-     */
-    pub fn err_type(&self) -> InteractionErrorKind {
-        self.err_type
-    }
-
-}
-
-impl Display for InteractionError {
-
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
-        try!(write!(fmt, "[{}]", interaction_error_type_as_str(&self.err_type)));
-        Ok(())
-    }
-
-}
-
-impl Error for InteractionError {
-
-    fn description(&self) -> &str {
-        interaction_error_type_as_str(&self.err_type)
-    }
-
-    fn cause(&self) -> Option<&Error> {
-        self.cause.as_ref().map(|e| &**e)
-    }
-
-}
 

libimaginteraction/src/lib.rs

@@ -8,6 +8,7 @@ extern crate regex;
 extern crate libimagentryfilter;
 extern crate libimagstore;
 #[macro_use] extern crate libimagutil;
+#[macro_use] extern crate libimagerror;
 
 pub mod ask;
 pub mod error;