matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Remove unwrap() calls by matching

Browse source
This commit is contained in:
Matthias Beyer 2016-05-14 19:24:01 +02:00
parent 2a6e4c62fe
commit 604e59ae3c
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
libimagstore/src/store.rs
View file

@ -701,24 +701,23 @@ impl EntryHeader {
} }
pub fn insert_with_sep(&mut self, spec: &str, sep: char, v: Value) -> Result<bool> { pub fn insert_with_sep(&mut self, spec: &str, sep: char, v: Value) -> Result<bool> {
let tokens = EntryHeader::tokenize(spec, sep); let tokens = match EntryHeader::tokenize(spec, sep) {
if tokens.is_err() { // return parser error if any Err(e) => return Err(e),
return tokens.map(|_| false); Ok(t) => t
} };
let tokens = tokens.unwrap();
let destination = tokens.iter().last(); let destination = match tokens.iter().last() {
if destination.is_none() { None => return Err(SE::new(SEK::HeaderPathSyntaxError, None)),
return Err(SE::new(SEK::HeaderPathSyntaxError, None)); Some(d) => d,
} };
let destination = destination.unwrap();
let path_to_dest = tokens[..(tokens.len() - 1)].into(); // N - 1 tokens let path_to_dest = tokens[..(tokens.len() - 1)].into(); // N - 1 tokens
let value = EntryHeader::walk_header(&mut self.header, path_to_dest); // walk N-1 tokens
if value.is_err() { // walk N-1 tokens
return value.map(|_| false); let value = match EntryHeader::walk_header(&mut self.header, path_to_dest) {
} Err(e) => return Err(e),
let mut value = value.unwrap(); Ok(v) => v
};
// There is already an value at this place // There is already an value at this place
if EntryHeader::extract(value, destination).is_ok() { if EntryHeader::extract(value, destination).is_ok() {