From 041a2a49425b9e1ba5a09cfeed0f4a46f716d8c4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Fri, 18 Mar 2016 13:46:16 +0100 Subject: [PATCH] Add encoding error if typeconversion fails --- libimagstore/src/error.rs | 2 ++ libimagstore/src/store.rs | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libimagstore/src/error.rs b/libimagstore/src/error.rs index 697143fc..4ad9c5f2 100644 --- a/libimagstore/src/error.rs +++ b/libimagstore/src/error.rs @@ -34,6 +34,7 @@ pub enum StoreErrorKind { PostHookExecuteError, StorePathLacksVersion, GlobError, + EncodingError, // maybe more } @@ -64,6 +65,7 @@ fn store_error_type_as_str(e: &StoreErrorKind) -> &'static str { &StoreErrorKind::PostHookExecuteError => "Post-Hook execution error", &StoreErrorKind::StorePathLacksVersion => "The supplied store path has no version part", &StoreErrorKind::GlobError => "glob() error", + &StoreErrorKind::EncodingError => "Encoding error", } } diff --git a/libimagstore/src/store.rs b/libimagstore/src/store.rs index 0122cf06..201386d5 100644 --- a/libimagstore/src/store.rs +++ b/libimagstore/src/store.rs @@ -315,10 +315,11 @@ impl Store { if let Some(path) = path.to_str() { let path = [ path, "/*" ].join(""); debug!("glob()ing with '{}'", path); - glob(&path[..]).map(StoreIdIterator::new) + glob(&path[..]) + .map(StoreIdIterator::new) .map_err(|e| StoreError::new(StoreErrorKind::GlobError, Some(Box::new(e)))) } else { - unimplemented!() + Err(StoreError::new(StoreErrorKind::EncodingError, None)) } }