diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2017-10-30 20:17:21 +0100 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2017-10-31 15:04:50 +0100 |
| commit | 14bacaf01f6fb900cbab18c2663869b41ebc9162 (patch) | |
| tree | 95daa820ce27e19c49bc0777efb297bb94c19414 /lib/entry/libimagentrydatetime | |
| parent | 51a7429283d6a06fc8266c425f684acf84ba83aa (diff) | |
Replace uses of try!() macro with "?" operator
Diffstat (limited to 'lib/entry/libimagentrydatetime')
| -rw-r--r-- | lib/entry/libimagentrydatetime/src/datetime.rs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/entry/libimagentrydatetime/src/datetime.rs b/lib/entry/libimagentrydatetime/src/datetime.rs index 420f65f0..692f1d53 100644 --- a/lib/entry/libimagentrydatetime/src/datetime.rs +++ b/lib/entry/libimagentrydatetime/src/datetime.rs @@ -112,11 +112,11 @@ impl EntryDate for Entry { /// header in an inconsistent state. /// fn delete_date_range(&mut self) -> Result<()> { - let _ = try!(self + let _ = self .get_header_mut() .delete(&DATE_RANGE_START_HEADER_LOCATION) .map(|_| ()) - .chain_err(|| DEK::DeleteDateTimeRangeError)); + .chain_err(|| DEK::DeleteDateTimeRangeError)?; self.get_header_mut() .delete(&DATE_RANGE_END_HEADER_LOCATION) @@ -125,7 +125,7 @@ impl EntryDate for Entry { } fn read_date_range(&self) -> Result<DateTimeRange> { - let start = try!(self + let start = self .get_header() .read(&DATE_RANGE_START_HEADER_LOCATION) .chain_err(|| DEK::ReadDateTimeRangeError) @@ -136,9 +136,9 @@ impl EntryDate for Entry { Some(_) => Err(DE::from_kind(DEK::DateHeaderFieldTypeError)), _ => Err(DE::from_kind(DEK::ReadDateError)), } - })); + })?; - let end = try!(self + let end = self .get_header() .read(&DATE_RANGE_START_HEADER_LOCATION) .chain_err(|| DEK::ReadDateTimeRangeError) @@ -149,7 +149,7 @@ impl EntryDate for Entry { Some(_) => Err(DE::from_kind(DEK::DateHeaderFieldTypeError)), _ => Err(DE::from_kind(DEK::ReadDateError)), } - })); + })?; DateTimeRange::new(start, end) .chain_err(|| DEK::DateTimeRangeError) @@ -168,7 +168,7 @@ impl EntryDate for Entry { let start = start.format(&DATE_FMT).to_string(); let end = end.format(&DATE_FMT).to_string(); - let opt_old_start = try!(self + let opt_old_start = self .get_header_mut() .insert(&DATE_RANGE_START_HEADER_LOCATION, Value::String(start)) .map(|opt| opt.map(|stri| { @@ -178,9 +178,9 @@ impl EntryDate for Entry { _ => Err(DE::from_kind(DEK::DateHeaderFieldTypeError)), } })) - .chain_err(|| DEK::SetDateTimeRangeError)); + .chain_err(|| DEK::SetDateTimeRangeError)?; - let opt_old_end = try!(self + let opt_old_end = self .get_header_mut() .insert(&DATE_RANGE_END_HEADER_LOCATION, Value::String(end)) .map(|opt| opt.map(|stri| { @@ -190,7 +190,7 @@ impl EntryDate for Entry { _ => Err(DE::from_kind(DEK::DateHeaderFieldTypeError)), } })) - .chain_err(|| DEK::SetDateTimeRangeError)); + .chain_err(|| DEK::SetDateTimeRangeError)?; match (opt_old_start, opt_old_end) { (Some(Ok(old_start)), Some(Ok(old_end))) => { |