matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace uses of try!() macro with "?" operator

Browse source
This commit is contained in:
Matthias Beyer 2017-10-30 20:19:29 +01:00
parent 29c9ad71b5
commit f82ad2b6d1
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/domain/libimagtodo/src/taskstore.rs
View file

@ -54,7 +54,7 @@ impl<'a> TaskStore<'a> for Store {
fn import_task_from_reader<R: BufRead>(&'a self, mut r: R) -> Result<(FileLockEntry<'a>, String, Uuid)> { fn import_task_from_reader<R: BufRead>(&'a self, mut r: R) -> Result<(FileLockEntry<'a>, String, Uuid)> {
let mut line = String::new(); let mut line = String::new();
try!(r.read_line(&mut line).map_err(|_| TE::from_kind(TEK::UTF8Error))); r.read_line(&mut line).map_err(|_| TE::from_kind(TEK::UTF8Error))?;
import_task(&line.as_str()) import_task(&line.as_str())
.map_err(|_| TE::from_kind(TEK::ImportError)) .map_err(|_| TE::from_kind(TEK::ImportError))
.and_then(|t| { .and_then(|t| {
@ -74,7 +74,7 @@ impl<'a> TaskStore<'a> for Store {
/// ///
fn get_task_from_import<R: BufRead>(&'a self, mut r: R) -> Result<RResult<FileLockEntry<'a>, String>> { fn get_task_from_import<R: BufRead>(&'a self, mut r: R) -> Result<RResult<FileLockEntry<'a>, String>> {
let mut line = String::new(); let mut line = String::new();
try!(r.read_line(&mut line).chain_err(|| TEK::UTF8Error)); r.read_line(&mut line).chain_err(|| TEK::UTF8Error)?;
self.get_task_from_string(line) self.get_task_from_string(line)
} }
@ -107,7 +107,7 @@ impl<'a> TaskStore<'a> for Store {
/// implicitely create the task if it does not exist. /// implicitely create the task if it does not exist.
fn retrieve_task_from_import<R: BufRead>(&'a self, mut r: R) -> Result<FileLockEntry<'a>> { fn retrieve_task_from_import<R: BufRead>(&'a self, mut r: R) -> Result<FileLockEntry<'a>> {
let mut line = String::new(); let mut line = String::new();
try!(r.read_line(&mut line).chain_err(|| TEK::UTF8Error)); r.read_line(&mut line).chain_err(|| TEK::UTF8Error)?;
self.retrieve_task_from_string(line) self.retrieve_task_from_string(line)
} }
@ -186,14 +186,14 @@ impl<'a> TaskStore<'a> for Store {
.and_then(|mut fle| { .and_then(|mut fle| {
{ {
let hdr = fle.get_header_mut(); let hdr = fle.get_header_mut();
if try!(hdr.read("todo").chain_err(|| TEK::StoreError)).is_none() { if hdr.read("todo").chain_err(|| TEK::StoreError)?.is_none() {
try!(hdr hdr
.set("todo", Value::Table(BTreeMap::new())) .set("todo", Value::Table(BTreeMap::new()))
.chain_err(|| TEK::StoreError)); .chain_err(|| TEK::StoreError)?;
} }
try!(hdr.set("todo.uuid", Value::String(format!("{}",uuid))) hdr.set("todo.uuid", Value::String(format!("{}",uuid)))
.chain_err(|| TEK::StoreError)); .chain_err(|| TEK::StoreError)?;
} }
// If none of the errors above have returned the function, everything is fine // If none of the errors above have returned the function, everything is fine