matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace unwrap() by match

Browse source
This commit is contained in:
Matthias Beyer 2016-08-04 14:19:25 +02:00
parent a330cdd82f
commit 1762b2e7d5
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
libimagtimeui/src/time.rs
View file

@ -53,16 +53,17 @@ impl Parse for Time {
R.captures(s)
.and_then(|capts| {
let hour = capts.name("h").and_then(|o| FromStr::from_str(o).ok());
let minute = capts.name("m").and_then(|o| FromStr::from_str(o).ok()).unwrap_or(0);
let second = capts.name("s").and_then(|o| FromStr::from_str(o).ok()).unwrap_or(0);
if hour.is_none() {
let hour = match capts.name("h").and_then(|o| FromStr::from_str(o).ok()) {
None => {
debug!("No hour");
return None;
}
},
Some(x) => x,
};
Some(Time::new(hour.unwrap(), minute, second))
Some(Time::new(hour, minute, second))
})
}