matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace matching with function chaining

Browse source
This commit is contained in:
Matthias Beyer 2018-01-04 20:26:42 +01:00
parent c1ff2b14f0
commit dbd9a2faaf
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/domain/libimaghabit/src/habit.rs
View file

@ -219,11 +219,10 @@ impl HabitTemplate for Entry {
}
fn habit_until_date(&self) -> Result<Option<String>> {
match self.get_header().read("habit.template.until")? {
Some(&Value::String(ref s)) => Ok(Some(s.clone())),
Some(_) => Err(HEK::HeaderTypeError("habit.template.until", "String").into()),
None => Ok(None),
}
self.get_header()
.read("habit.template.until")?
.map(|v| v.as_str().map(String::from))
.ok_or(HEK::HeaderTypeError("habit.template.until", "String").into())
}
fn instance_id_for(habit_name: &String, habit_date: &NaiveDate) -> Result<StoreId> {