From 70b3d3906ec1dd624a59343e9325efc48b33728c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sat, 14 May 2016 19:14:11 +0200 Subject: [PATCH] Replace unwrap() by matching --- libimagstore/src/store.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libimagstore/src/store.rs b/libimagstore/src/store.rs index 4b30a025..ec6353c4 100644 --- a/libimagstore/src/store.rs +++ b/libimagstore/src/store.rs @@ -409,12 +409,10 @@ impl Store { /// the one on disk pub fn retrieve_copy(&self, id: S) -> Result { let id = self.storify_id(id.into_storeid()); - let entries_lock = self.entries.write(); - if entries_lock.is_err() { - return Err(SE::new(SEK::LockPoisoned, None)) - } - - let entries = entries_lock.unwrap(); + let entries = match self.entries.write() { + Err(_) => return Err(SE::new(SEK::LockPoisoned, None)), + Ok(e) => e, + }; // if the entry is currently modified by the user, we cannot drop it if entries.get(&id).map(|e| e.is_borrowed()).unwrap_or(false) {