matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace r#try! with the ? operator

Browse source 
Signed-off-by: flip1995 <hello@philkrones.com>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
flip1995 2019-08-26 17:49:19 +02:00 committed by Matthias Beyer
parent b3eb37dde8
commit 60fe113659
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -160,7 +160,7 @@ impl HabitTemplate for Entry {
debug!("Increment is {:?}", increment); debug!("Increment is {:?}", increment);
let until = self.habit_until_date()?.map(|s| -> Result<_> { let until = self.habit_until_date()?.map(|s| -> Result<_> {
r#try!(date_from_s(s)) date_from_s(s)?
.calculate()? .calculate()?
.get_moment() .get_moment()
.map(Clone::clone) .map(Clone::clone)
@ -349,10 +349,10 @@ pub mod builder {
debug!("Success: Date valid"); debug!("Success: Date valid");
let comment = self.comment.unwrap_or_else(|| String::new()); let comment = self.comment.unwrap_or_else(|| String::new());
let sid = r#try!(build_habit_template_sid(&name)); let sid = build_habit_template_sid(&name)?;
debug!("Creating entry in store for: {:?}", sid); debug!("Creating entry in store for: {:?}", sid);
let mut entry = r#try!(store.create(sid)); let mut entry = store.create(sid)?;
let _ = entry.set_isflag::<IsHabitTemplate>()?; let _ = entry.set_isflag::<IsHabitTemplate>()?;
{ {
@ -365,7 +365,7 @@ pub mod builder {
if let Some(until) = self.untildate { if let Some(until) = self.untildate {
let until = date_to_string(&until); let until = date_to_string(&until);
r#try!(entry.get_header_mut().insert("habit.template.until", Value::String(until))); entry.get_header_mut().insert("habit.template.until", Value::String(until))?;
} }
debug!("Success: Created entry in store and set headers"); debug!("Success: Created entry in store and set headers");