matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace unwrap() with match

Browse source
This commit is contained in:
Matthias Beyer 2016-08-04 14:13:09 +02:00
parent 1872dcd5e6
commit 669b5a936a
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libimagdiary/src/iter.rs
View file

@ -79,12 +79,13 @@ impl<'a> Iterator for DiaryEntryIterator<'a> {
if next.is_in_diary(self.name) {
debug!("Seems to be in diary: {:?}", next);
let id = DiaryId::from_storeid(&next);
if id.is_none() {
debug!("Couldn't parse {:?} into DiaryId", next);
continue;
}
let id = id.unwrap();
let id = match DiaryId::from_storeid(&next) {
Some(i) => i,
None => {
debug!("Couldn't parse {:?} into DiaryId", next);
continue;
}
};
debug!("Success parsing id = {:?}", id);
let y = match self.year { None => true, Some(y) => y == id.year() };