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

This commit is contained in:
Matthias Beyer 2017-10-30 20:17:21 +01:00
parent d60f7d72e6
commit 81ceb50f4a

View file

@ -116,7 +116,7 @@ impl LinkProcessor {
let spath = Some(store.path().clone()); let spath = Some(store.path().clone());
let id = StoreId::new(spath, PathBuf::from(&link.link))?; let id = StoreId::new(spath, PathBuf::from(&link.link))?;
let mut target = if self.create_internal_targets { let mut target = if self.create_internal_targets {
try!(store.retrieve(id)) store.retrieve(id)?
} else { } else {
store.get(id.clone())? store.get(id.clone())?
.ok_or(ME::from_kind(MEK::StoreGetError(id)))? .ok_or(ME::from_kind(MEK::StoreGetError(id)))?
@ -144,7 +144,7 @@ impl LinkProcessor {
trace!("URL.host_str() = {:?}", url.host_str()); trace!("URL.host_str() = {:?}", url.host_str());
let path = url.host_str().unwrap_or_else(|| url.path()); let path = url.host_str().unwrap_or_else(|| url.path());
let path = PathBuf::from(path); let path = PathBuf::from(path);
let mut target = try!(RefStore::create(store, path, flags)); let mut target = RefStore::create(store, path, flags)?;
entry.add_internal_link(&mut target)?; entry.add_internal_link(&mut target)?;
}, },