Merge 75db37b into 2ff32ce

src/cache/item.rs

@@ -54,6 +54,7 @@ mod tests {
     #[tokio::test]
     async fn expired_when_duration_is_zero() {
         let item = Item::new(OBJECT, Some(Duration::new(0, 0)));
+        tokio::time::sleep(Duration::new(0, 0)).await;
         assert_eq!(item.expired(), true);
     }
 }

src/cache/mod.rs

@@ -19,7 +19,7 @@ use tokio::sync::RwLock;
 #[derive(Debug)]
 pub struct Cache<T, V>
 where
-    T: Hash + Eq,
+    T: Hash + Eq + Copy,
 {
     items: RwLock<BTreeMap<T, Item<V>>>,
     item_duration: Option<Duration>,
@@ -29,7 +29,7 @@ where
 #[allow(clippy::len_without_is_empty)]
 impl<T, V> Cache<T, V>
 where
-    T: Ord + Hash,
+    T: Ord + Hash + Copy,
 {
     /// Creating capacity based `Cache`.
     pub fn with_capacity(capacity: usize) -> Self {
@@ -110,16 +110,20 @@ where
     }
 
     ///
+    #[allow(unused_assignments)]
     pub async fn remove_expired(&self) {
-        let read_items = self.items.read().await;
-        let expired_keys: Vec<_> = read_items
-            .iter()
-            .filter(|(_, item)| item.expired())
-            .map(|(key, _)| key)
-            .collect();
+        let mut expired_keys = Vec::new();
+        {
+            let read_items = self.items.read().await;
+            expired_keys = read_items
+                .iter()
+                .filter(|(_, item)| item.expired())
+                .map(|(key, _)| *key)
+                .collect();
+        }
 
         for key in expired_keys {
-            let _ = self.items.write().await.remove(key);
+            let _ = self.items.write().await.remove(&key);
         }
     }
 
@@ -208,7 +212,7 @@ mod tests {
     #[tokio::test]
     async fn remove_expired_item() {
         let cache = Cache::with_expiry_duration(Duration::from_secs(0));
-        let _ = cache.set(KEY, VALUE, None).await;
+        assert!(cache.set(KEY, VALUE, None).await.is_none());
         cache.remove_expired().await;
         assert!(
             cache.items.read().await.get(&KEY).is_none(),