Simplify hashmap fetching and error construction

1 files changed, 9 insertions, 6 deletions

diff --git a/libimagstore/src/store.rs b/libimagstore/src/store.rs
index e21bb2ce..321e4496 100644
--- a/libimagstore/src/store.rs
+++ b/libimagstore/src/store.rs
@@ -636,12 +636,15 @@ impl Store {
         -> Result<()>
     {
         let new_id = new_id.with_base(self.path().clone());
-        let hsmap = self.entries.write();
-        if hsmap.is_err() {
-            return Err(SE::new(SEK::LockPoisoned, None)).map_err_into(SEK::MoveCallError)
-        }
-        if hsmap.unwrap().contains_key(&new_id) {
-            return Err(SE::new(SEK::EntryAlreadyExists, None)).map_err_into(SEK::MoveCallError)
+        let hsmap = try!(
+            self.entries
+                .write()
+                .map_err(|_| SEK::LockPoisoned.into_error())
+                .map_err_into(SEK::MoveCallError)
+        );
+
+        if hsmap.contains_key(&new_id) {
+            return Err(SEK::EntryAlreadyExists.into_error()).map_err_into(SEK::MoveCallError)
         }
 
         let old_id = entry.get_location().clone();