adrian/schematics
1
0
Fork 0
Code Issues Pull requests Releases Activity

Get rid of Error::description()

Browse source
This commit is contained in:
Adrian Heine 2020-08-06 17:38:27 +02:00
parent 7f5daa3c0e
commit d3236903fc
2 changed files with 7 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/schema.rs
View file

@ -22,12 +22,6 @@ pub enum SymbolRunError {
} }
impl Error for SymbolRunError { impl Error for SymbolRunError {
fn description(&self) -> &str {
match self {
Self::Symbol(_) => "Symbol execution error",
Self::ExecuteDidNotReach(_) => "Target not reached after executing symbol",
}
}
fn cause(&self) -> Option<&dyn Error> { fn cause(&self) -> Option<&dyn Error> {
match self { match self {
Self::Symbol(ref e) => Some(&**e), Self::Symbol(ref e) => Some(&**e),
@ -40,7 +34,7 @@ impl fmt::Display for SymbolRunError {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self { match self {
Self::Symbol(ref e) => write!(f, "{}", e), Self::Symbol(ref e) => write!(f, "{}", e),
Self::ExecuteDidNotReach(_) => write!(f, "{}", self.description()), Self::ExecuteDidNotReach(_) => write!(f, "Target not reached after executing symbol"),
} }
} }
} }

18
tests/storage.rs
View file

@ -103,12 +103,12 @@ fn empty_storage() {
); );
assert!(storage.read_filename().is_err()); assert!(storage.read_filename().is_err());
assert_eq!( assert_eq!(
storage.read_filename().unwrap_err().description(), storage.read_filename().unwrap_err().to_string(),
"entity not found" "entity not found"
); );
assert!(storage.recent_date().is_err()); assert!(storage.recent_date().is_err());
assert_eq!( assert_eq!(
storage.recent_date().unwrap_err().description(), storage.recent_date().unwrap_err().to_string(),
"entity not found" "entity not found"
); );
} }
@ -125,14 +125,11 @@ fn empty_storage_for_filename() {
); );
assert!(storage.read_filename().is_err()); assert!(storage.read_filename().is_err());
assert_eq!( assert_eq!(
storage.read_filename().unwrap_err().description(), storage.read_filename().unwrap_err().to_string(),
"Not found" "Not found"
); );
assert!(storage.recent_date().is_err()); assert!(storage.recent_date().is_err());
assert_eq!( assert_eq!(storage.recent_date().unwrap_err().to_string(), "Not found");
storage.recent_date().unwrap_err().description(),
"Not found"
);
} }
#[test] #[test]
@ -147,12 +144,9 @@ fn bad_file() {
); );
assert!(storage.read_filename().is_err()); assert!(storage.read_filename().is_err());
assert_eq!( assert_eq!(
storage.read_filename().unwrap_err().description(), storage.read_filename().unwrap_err().to_string(),
"Not found" "Not found"
); );
assert!(storage.recent_date().is_err()); assert!(storage.recent_date().is_err());
assert_eq!( assert_eq!(storage.recent_date().unwrap_err().to_string(), "Not found");
storage.recent_date().unwrap_err().description(),
"Not found"
);
} }