matthiasbeyer
/
imag
1
0
Fork 0
Code Releases Activity

Add param to StoreIdHasNoBaseError

This commit is contained in:
Matthias Beyer 2017-09-09 21:52:44 +02:00
parent a670172880
commit 785e17a4a3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/libimagstore/src/error.rs
View File

@ -184,9 +184,9 @@ error_chain! {
display("Building StoreId from full file path failed")
}
StoreIdHasNoBaseError {
StoreIdHasNoBaseError(pb: PathBuf) {
description("StoreId has no 'base' part")
display("StoreId has no 'base' part")
display("StoreId has no 'base' part: {:?}", pb)
}
CreateCallError {

7
lib/core/libimagstore/src/storeid.rs
View File

@ -89,8 +89,9 @@ impl StoreId {
/// Transform the StoreId object into a PathBuf, error if the base of the StoreId is not
/// specified.
pub fn into_pathbuf(self) -> Result<PathBuf> {
let mut base = try!(self.base.ok_or(SEK::StoreIdHasNoBaseError));
pub fn into_pathbuf(mut self) -> Result<PathBuf> {
let base = self.base.take();
let mut base = try!(base.ok_or_else(|| SEK::StoreIdHasNoBaseError(self.id.clone())));
base.push(self.id);
Ok(base)
}
@ -346,7 +347,7 @@ mod test {
let pb = id.unwrap().into_pathbuf();
assert!(pb.is_err());
assert!(is_match!(pb.unwrap_err().kind(), &SEK::StoreIdHasNoBaseError));
assert!(is_match!(pb.unwrap_err().kind(), &SEK::StoreIdHasNoBaseError(_)));
}
#[test]