matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Replace unwrap() with try!()

Browse source
This commit is contained in:
Matthias Beyer 2016-08-04 14:05:38 +02:00
parent 27009be687
commit a07047b61a
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libimagentrytag/src/tagable.rs
View file

@ -101,12 +101,7 @@ impl Tagable for EntryHeader {
} }
fn has_tag(&self, t: TagSlice) -> Result<bool> { fn has_tag(&self, t: TagSlice) -> Result<bool> {
let tags = self.read("imag.tags"); let tags = try!(self.read("imag.tags").map_err_into(TagErrorKind::HeaderReadError));
if tags.is_err() {
let kind = TagErrorKind::HeaderReadError;
return Err(kind.into_error_with_cause(Box::new(tags.unwrap_err())));
}
let tags = tags.unwrap();
if !tags.iter().all(|t| is_match!(*t, Value::String(_))) { if !tags.iter().all(|t| is_match!(*t, Value::String(_))) {
return Err(TagErrorKind::TagTypeError.into()); return Err(TagErrorKind::TagTypeError.into());