matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add parameter to IdNotFound error

Browse source
This commit is contained in:
Matthias Beyer 2017-09-09 21:27:10 +02:00
parent b682e7f8db
commit ca9123c740
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/core/libimagstore/src/error.rs
View file

@ -17,6 +17,8 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
// //
use storeid::StoreId;
error_chain! { error_chain! {
types { types {
StoreError, StoreErrorKind, ResultExt, Result; StoreError, StoreErrorKind, ResultExt, Result;
@ -69,9 +71,9 @@ error_chain! {
display("ID locked") display("ID locked")
} }
IdNotFound { IdNotFound(sid: StoreId) {
description("ID not found") description("ID not found")
display("ID not found") display("ID not found: {}", sid)
} }
OutOfMemory { OutOfMemory {

4
lib/core/libimagstore/src/store.rs
View file

@ -554,7 +554,9 @@ impl Store {
Ok(e) => e, Ok(e) => e,
}; };
let se = try!(hsmap.get_mut(&entry.location).ok_or(SE::from_kind(SEK::IdNotFound))); let se = try!(hsmap.get_mut(&entry.location).ok_or_else(|| {
SE::from_kind(SEK::IdNotFound(entry.location.clone()))
}));
assert!(se.is_borrowed(), "Tried to update a non borrowed entry."); assert!(se.is_borrowed(), "Tried to update a non borrowed entry.");