diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2016-08-04 14:15:34 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2016-08-04 14:15:34 +0200 |
commit | 99612b4ecc606b6ee2a89d1ec534cce8e58cd5d0 (patch) | |
tree | 43db4323cbd4a5cb3448f1c23b45002dcde4cd2a /libimagdiary | |
parent | 669b5a936afc3c5db83c351d52fe24e2e00e8896 (diff) |
Replace unwrap with match
Diffstat (limited to 'libimagdiary')
-rw-r--r-- | libimagdiary/src/diaryid.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libimagdiary/src/diaryid.rs b/libimagdiary/src/diaryid.rs index 5549ac17..2cbdce56 100644 --- a/libimagdiary/src/diaryid.rs +++ b/libimagdiary/src/diaryid.rs @@ -205,10 +205,10 @@ impl FromStoreId for DiaryId { debug!("Year = {:?}", year); debug!("Name = {:?}", name); - let day = if day.is_none() { return None; } else { day.unwrap() }; - let month = if month.is_none() { return None; } else { month.unwrap() }; - let year = if year.is_none() { return None; } else { year.unwrap() }; - let name = if name.is_none() { return None; } else { name.unwrap() }; + let day = match day { None => return None, Some(day) => day }; + let month = match month { None => return None, Some(month) => month }; + let year = match year { None => return None, Some(year) => year }; + let name = match name { None => return None, Some(name) => name }; Some(DiaryId::new(name, year, month, day, hour, minute)) } |