Replace configuration error code with macro generator
This commit is contained in:
parent
2e80c29f47
commit
70b6a4f587
1 changed files with 5 additions and 68 deletions
|
@ -4,77 +4,14 @@ use std::ops::Deref;
|
|||
|
||||
use toml::{Parser, Value};
|
||||
|
||||
/**
|
||||
* Errors which are related to configuration-file loading
|
||||
*/
|
||||
pub mod error {
|
||||
use std::error::Error;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::fmt::Error as FmtError;
|
||||
|
||||
/// The kind of an error
|
||||
#[derive(Clone, Debug, PartialEq)]
|
||||
pub enum ConfigErrorKind {
|
||||
NoConfigFileFound,
|
||||
}
|
||||
|
||||
/// Configuration error type
|
||||
#[derive(Debug)]
|
||||
pub struct ConfigError {
|
||||
kind: ConfigErrorKind,
|
||||
cause: Option<Box<Error>>,
|
||||
}
|
||||
|
||||
impl ConfigError {
|
||||
|
||||
/// Instantiate a new `ConfigError`, optionally with cause
|
||||
pub fn new(kind: ConfigErrorKind, cause: Option<Box<Error>>) -> ConfigError {
|
||||
ConfigError {
|
||||
kind: kind,
|
||||
cause: cause,
|
||||
}
|
||||
}
|
||||
|
||||
///get the Kind of the Error
|
||||
pub fn err_type(&self) -> ConfigErrorKind {
|
||||
self.kind.clone()
|
||||
}
|
||||
|
||||
/// Get the string, the `ConfigError` can be described with
|
||||
pub fn as_str(e: &ConfigError) -> &'static str {
|
||||
match e.err_type() {
|
||||
ConfigErrorKind::NoConfigFileFound => "No config file found",
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Display for ConfigError {
|
||||
|
||||
fn fmt(&self, fmt: &mut Formatter) -> Result<(), FmtError> {
|
||||
try!(write!(fmt, "{}", ConfigError::as_str(self)));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
impl Error for ConfigError {
|
||||
|
||||
fn description(&self) -> &str {
|
||||
ConfigError::as_str(self)
|
||||
}
|
||||
|
||||
fn cause(&self) -> Option<&Error> {
|
||||
self.cause.as_ref().map(|e| &**e)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
generate_error_module!(
|
||||
generate_error_types!(ConfigError, ConfigErrorKind,
|
||||
NoConfigFileFound => "No config file found"
|
||||
);
|
||||
);
|
||||
|
||||
use self::error::{ConfigError, ConfigErrorKind};
|
||||
|
||||
|
||||
/**
|
||||
* Result type of this module. Either `T` or `ConfigError`
|
||||
*/
|
||||
|
|
Loading…
Reference in a new issue