Adapt error generating code in libimagstore
This commit is contained in:
parent
b117d7fb9f
commit
e45d9200bf
1 changed files with 7 additions and 2 deletions
|
@ -1,7 +1,10 @@
|
||||||
generate_error_imports!();
|
generate_error_imports!();
|
||||||
use std::convert::From;
|
use std::convert::From;
|
||||||
|
|
||||||
generate_error_types!(StoreError, StoreErrorKind,
|
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Copy)]
|
||||||
|
pub struct CustomErrorData {}
|
||||||
|
|
||||||
|
generate_custom_error_types!(StoreError, StoreErrorKind, CustomErrorData,
|
||||||
ConfigurationError => "Store Configuration Error",
|
ConfigurationError => "Store Configuration Error",
|
||||||
FileError => "File Error",
|
FileError => "File Error",
|
||||||
IoError => "IO Error",
|
IoError => "IO Error",
|
||||||
|
@ -31,7 +34,7 @@ generate_error_types!(StoreError, StoreErrorKind,
|
||||||
EncodingError => "Encoding error"
|
EncodingError => "Encoding error"
|
||||||
);
|
);
|
||||||
|
|
||||||
generate_error_types!(ParserError, ParserErrorKind,
|
generate_custom_error_types!(ParserError, ParserErrorKind, CustomErrorData,
|
||||||
TOMLParserErrors => "Several TOML-Parser-Errors",
|
TOMLParserErrors => "Several TOML-Parser-Errors",
|
||||||
MissingMainSection => "Missing main section",
|
MissingMainSection => "Missing main section",
|
||||||
MissingVersionInfo => "Missing version information in main section",
|
MissingVersionInfo => "Missing version information in main section",
|
||||||
|
@ -44,6 +47,7 @@ impl From<ParserError> for StoreError {
|
||||||
StoreError {
|
StoreError {
|
||||||
err_type: StoreErrorKind::MalformedEntry,
|
err_type: StoreErrorKind::MalformedEntry,
|
||||||
cause: Some(Box::new(ps)),
|
cause: Some(Box::new(ps)),
|
||||||
|
custom_data: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -53,6 +57,7 @@ impl From<::std::io::Error> for StoreError {
|
||||||
StoreError {
|
StoreError {
|
||||||
err_type: StoreErrorKind::IoError,
|
err_type: StoreErrorKind::IoError,
|
||||||
cause: Some(Box::new(ps)),
|
cause: Some(Box::new(ps)),
|
||||||
|
custom_data: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue