matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Rename ParseError to IdParseError

This commit is contained in:
Raphael Nestler 2016-11-20 16:45:50 +01:00
parent a676f4c148
commit c4b1f7ac8d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libimagdiary/src/diaryid.rs
View File

@ -191,7 +191,7 @@ fn component_to_str<'a>(com: Component<'a>) -> Result<&'a str, DE> {
Component::Normal(s) => Some(s), Component::Normal(s) => Some(s),
_ => None, _ => None,
}.and_then(|s| s.to_str()) }.and_then(|s| s.to_str())
.ok_or(DEK::ParseError.into_error()) .ok_or(DEK::IdParseError.into_error())
} }
impl FromStoreId for DiaryId { impl FromStoreId for DiaryId {
@ -204,7 +204,7 @@ impl FromStoreId for DiaryId {
fn next_component<'a>(components: &'a mut Rev<Components>) -> Result<&'a str, DE> { fn next_component<'a>(components: &'a mut Rev<Components>) -> Result<&'a str, DE> {
components.next() components.next()
.ok_or(DEK::ParseError.into_error()) .ok_or(DEK::IdParseError.into_error())
.and_then(component_to_str) .and_then(component_to_str)
} }
@ -222,21 +222,21 @@ impl FromStoreId for DiaryId {
match (hour, minute) { match (hour, minute) {
(Some(h), Some(m)) => Ok((h, m)), (Some(h), Some(m)) => Ok((h, m)),
_ => return Err(DE::new(DEK::ParseError, None)), _ => return Err(DE::new(DEK::IdParseError, None)),
} }
})); }));
let day: Result<u32,_> = next_component(&mut cmps) let day: Result<u32,_> = next_component(&mut cmps)
.and_then(|s| s.parse::<u32>() .and_then(|s| s.parse::<u32>()
.map_err_into(DEK::ParseError)); .map_err_into(DEK::IdParseError));
let month: Result<u32,_> = next_component(&mut cmps) let month: Result<u32,_> = next_component(&mut cmps)
.and_then(|s| s.parse::<u32>() .and_then(|s| s.parse::<u32>()
.map_err_into(DEK::ParseError)); .map_err_into(DEK::IdParseError));
let year: Result<i32,_> = next_component(&mut cmps) let year: Result<i32,_> = next_component(&mut cmps)
.and_then(|s| s.parse::<i32>() .and_then(|s| s.parse::<i32>()
.map_err_into(DEK::ParseError)); .map_err_into(DEK::IdParseError));
let name = next_component(&mut cmps).map(String::from); let name = next_component(&mut cmps).map(String::from);

2
libimagdiary/src/error.rs
View File

@ -28,7 +28,7 @@ generate_error_module!(
EntryNotInDiary => "Entry not in Diary", EntryNotInDiary => "Entry not in Diary",
IOError => "IO Error", IOError => "IO Error",
ViewError => "Error viewing diary entry", ViewError => "Error viewing diary entry",
ParseError => "Error while parsing" IdParseError => "Error while parsing ID"
); );
); );