Merge pull request #41 from evavh/fixes

Remove some of the doubly wrapped errors, add remove, and add example for Clone

note clone is not yet implemented

examples/map_wrapper.rs

@@ -0,0 +1,16 @@
+#[dbstruct::dbstruct(db=sled)]
+#[derive(Clone)]
+pub struct Test {
+    computers: HashMap<String, usize>,
+}
+
+fn main() {
+    let dir = tempdir::TempDir::new("dbstruct_examples").unwrap();
+    let path = dir.path().join("map_wrapper");
+
+    let db = Test::new(&path).unwrap();
+    db.computers().insert(&"Deep Thought".to_owned(), &42).unwrap();
+    db.computers().remove(&"Deep Thought".to_owned()).unwrap();
+
+    let clone = db.clone();
+}

src/wrapper/map.rs

@@ -5,7 +5,6 @@ use std::marker::PhantomData;
 use tracing::{instrument, trace};
 
 use crate::traits::DataStore;
-use crate::Error;
 
 mod extend;
 mod iterator;
@@ -57,18 +56,29 @@ where
 
     /// returns existing value if any was set
     #[instrument(skip_all, level = "debug")]
-    pub fn insert(&self, key: &'a Key, value: &'a Value) -> Result<Option<Value>, Error<E>> {
+    pub fn insert(
+        &self,
+        key: &'a Key,
+        value: &'a Value,
+    ) -> Result<Option<Value>, E> {
         let key = self.prefix(key);
         let existing = self.tree.insert(&key, value)?;
         Ok(existing)
     }
 
     #[instrument(skip_all, level = "debug")]
-    pub fn get(&self, key: &'a Key) -> Result<Option<Value>, Error<E>> {
+    pub fn get(&self, key: &'a Key) -> Result<Option<Value>, E> {
         let key = self.prefix(key);
         let value = self.tree.get(&key)?;
         Ok(value)
     }
+
+    #[instrument(skip_all, level = "debug")]
+    pub fn remove(&self, key: &'a Key) -> Result<Option<Value>, E> {
+        let key = self.prefix(key);
+        let value = self.tree.remove(&key)?;
+        Ok(value)
+    }
 }
 
 #[cfg(test)]

src/wrapper/map/extend.rs

@@ -14,7 +14,7 @@ where
     Key: Serialize + DeserializeOwned,
     Value: Serialize + DeserializeOwned,
 {
-    type Error = crate::Error<DS::Error>;
+    type Error = DS::Error;
 
     fn try_extend<I>(
         &mut self,
@@ -48,7 +48,7 @@ where
     Key: Serialize + DeserializeOwned,
     Value: Serialize + DeserializeOwned,
 {
-    type Error = crate::Error<DS::Error>;
+    type Error = DS::Error;
 
     fn try_extend<I>(
         &mut self,