Replace error code with macro for code generation

This commit is contained in:
Matthias Beyer 2016-05-15 16:41:25 +02:00
parent 627fa7de46
commit 42f7e086a3

View file

@ -3,14 +3,10 @@ use std::fmt::Error as FmtError;
use std::fmt::{Display, Formatter}; use std::fmt::{Display, Formatter};
use std::convert::Into; use std::convert::Into;
/** generate_error_types!(HookError, HookErrorKind,
* Kind of error HookExecutionError => "Hook exec error",
*/ AccessTypeViolation => "Hook access type violation"
#[derive(Clone, Copy, Debug)] );
pub enum HookErrorKind {
HookExecutionError,
AccessTypeViolation,
}
pub trait IntoHookError { pub trait IntoHookError {
fn into_hookerror(self) -> HookError; fn into_hookerror(self) -> HookError;
@ -33,73 +29,3 @@ impl Into<HookError> for (HookErrorKind, Box<Error>) {
} }
fn hook_error_type_as_str(e: &HookErrorKind) -> &'static str {
match *e {
HookErrorKind::HookExecutionError => "Hook exec error",
HookErrorKind::AccessTypeViolation => "Hook access type violation",
}
}
impl Display for HookErrorKind {
fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
try!(write!(fmt, "{}", hook_error_type_as_str(self)));
Ok(())
}
}
/**
* Error type
*/
#[derive(Debug)]
pub struct HookError {
err_type: HookErrorKind,
cause: Option<Box<Error>>,
}
impl HookError {
/**
* Build a new HookError from an HookErrorKind, optionally with cause
*/
pub fn new(errtype: HookErrorKind, cause: Option<Box<Error>>)
-> HookError
{
HookError {
err_type: errtype,
cause: cause,
}
}
/**
* Get the error type of this HookError
*/
pub fn err_type(&self) -> HookErrorKind {
self.err_type
}
}
impl Display for HookError {
fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
try!(write!(fmt, "[{}]", hook_error_type_as_str(&self.err_type)));
Ok(())
}
}
impl Error for HookError {
fn description(&self) -> &str {
hook_error_type_as_str(&self.err_type)
}
fn cause(&self) -> Option<&Error> {
self.cause.as_ref().map(|e| &**e)
}
}