From ea98cc41da8e6d8ac843265f70c2e4345c42920e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sun, 15 May 2016 16:53:31 +0200
Subject: [PATCH] libimagentryview: Replace error code with code generator
 macro

---
 libimagentryview/Cargo.toml   |  3 ++
 libimagentryview/src/error.rs | 77 ++---------------------------------
 libimagentryview/src/lib.rs   |  1 +
 3 files changed, 7 insertions(+), 74 deletions(-)

diff --git a/libimagentryview/Cargo.toml b/libimagentryview/Cargo.toml
index e9711be0..7c0124a3 100644
--- a/libimagentryview/Cargo.toml
+++ b/libimagentryview/Cargo.toml
@@ -8,3 +8,6 @@ authors = ["Matthias Beyer <mail@beyermatthias.de>"]
 [dependencies.libimagstore]
 path = "../libimagstore"
 
+[dependencies.libimagerror]
+path = "../libimagerror"
+
diff --git a/libimagentryview/src/error.rs b/libimagentryview/src/error.rs
index 4bc8af54..32982342 100644
--- a/libimagentryview/src/error.rs
+++ b/libimagentryview/src/error.rs
@@ -2,78 +2,7 @@ use std::error::Error;
 use std::fmt::Error as FmtError;
 use std::fmt::{Display, Formatter};
 
-/**
- * Kind of error
- */
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum ViewErrorKind {
-}
-
-fn counter_error_type_as_str(e: &ViewErrorKind) -> &'static str {
-    match e {
-        _ => "",
-    }
-}
-
-impl Display for ViewErrorKind {
-
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
-        try!(write!(fmt, "{}", counter_error_type_as_str(self)));
-        Ok(())
-    }
-
-}
-
-/**
- * Store error type
- */
-#[derive(Debug)]
-pub struct ViewError {
-    err_type: ViewErrorKind,
-    cause: Option<Box<Error>>,
-}
-
-impl ViewError {
-
-    /**
-     * Build a new ViewError from an ViewErrorKind, optionally with cause
-     */
-    pub fn new(errtype: ViewErrorKind, cause: Option<Box<Error>>)
-        -> ViewError
-        {
-            ViewError {
-                err_type: errtype,
-                cause: cause,
-            }
-        }
-
-    /**
-     * Get the error type of this ViewError
-     */
-    pub fn err_type(&self) -> ViewErrorKind {
-        self.err_type
-    }
-
-}
-
-impl Display for ViewError {
-
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
-        try!(write!(fmt, "[{}]", counter_error_type_as_str(&self.err_type)));
-        Ok(())
-    }
-
-}
-
-impl Error for ViewError {
-
-    fn description(&self) -> &str {
-        counter_error_type_as_str(&self.err_type)
-    }
-
-    fn cause(&self) -> Option<&Error> {
-        self.cause.as_ref().map(|e| &**e)
-    }
-
-}
+generate_error_types!(ViewError, ViewErrorKind,
+    Unknown => "Unknown view error"
+);
 
diff --git a/libimagentryview/src/lib.rs b/libimagentryview/src/lib.rs
index 73833b7d..950332c5 100644
--- a/libimagentryview/src/lib.rs
+++ b/libimagentryview/src/lib.rs
@@ -15,6 +15,7 @@
 )]
 
 extern crate libimagstore;
+#[macro_use] extern crate libimagerror;
 
 pub mod error;
 pub mod builtin;