Extend lifecycle trait with on_evict_(cold|hot)

src/lib.rs

@@ -196,7 +196,26 @@ pub trait Lifecycle<Key, Val> {
     fn before_evict(&self, state: &mut Self::RequestState, key: &Key, val: &mut Val) {}
 
     /// Called when an item is evicted.
-    fn on_evict(&self, state: &mut Self::RequestState, key: Key, val: Val);
+    #[deprecated(
+        since = "0.6.22",
+        note = "Use `on_evict_hot` or `on_evict_cold` instead, depending on the desired semantics. This method will still be called by default to preserve backwards compatibility, but it won't be called if either of the new methods are implemented."
+    )]
+    #[allow(unused_variables)]
+    fn on_evict(&self, state: &mut Self::RequestState, key: Key, val: Val) {}
+
+    /// Called when an item is evicted from the cold queue.
+    #[inline]
+    fn on_evict_cold(&self, state: &mut Self::RequestState, key: Key, val: Val) {
+        #[allow(deprecated)]
+        self.on_evict(state, key, val)
+    }
+
+    /// Called when an item is evicted from the hot queue.
+    #[inline]
+    fn on_evict_hot(&self, state: &mut Self::RequestState, key: Key, val: Val) {
+        #[allow(deprecated)]
+        self.on_evict(state, key, val)
+    }
 
     /// Called after a request finishes, e.g.: insert, replace.
     ///

src/shard.rs

@@ -783,7 +783,8 @@ impl<
             if self.num_non_resident > self.capacity_non_resident {
                 self.advance_ghost();
             }
-            self.lifecycle.on_evict(lcs, evicted.key, evicted.value);
+            self.lifecycle
+                .on_evict_cold(lcs, evicted.key, evicted.value);
             return true;
         }
     }
@@ -835,7 +836,7 @@ impl<
                     unsafe { core::hint::unreachable_unchecked() };
                 };
                 self.hot_head = next;
-                self.lifecycle.on_evict(lcs, evicted.key, evicted.value);
+                self.lifecycle.on_evict_hot(lcs, evicted.key, evicted.value);
                 self.map_remove(hash, idx);
             }
             return true;
@@ -920,7 +921,15 @@ impl<
                 } else if evicted_weight != 0 && weight == 0 {
                     *list_head = self.entries.unlink(idx);
                 }
-                self.lifecycle.on_evict(lcs, evicted.key, evicted.value);
+                match enter_state {
+                    ResidentState::Hot => {
+                        self.lifecycle.on_evict_hot(lcs, evicted.key, evicted.value)
+                    }
+                    ResidentState::Cold => {
+                        self.lifecycle
+                            .on_evict_cold(lcs, evicted.key, evicted.value)
+                    }
+                }
             }
             Entry::Ghost(_) => {
                 self.weight_hot += weight;
@@ -1052,7 +1061,7 @@ impl<
     ) -> Result<(), Val> {
         self.entries.remove(placeholder.idx());
         self.map_remove(placeholder.hash(), placeholder.idx());
-        self.lifecycle.on_evict(lcs, key, value);
+        self.lifecycle.on_evict_hot(lcs, key, value);
         Ok(())
     }
 
@@ -1122,13 +1131,13 @@ impl<
         // Make sure to remove any existing entry
         if let Some((idx, _)) = self.search_resident(hash, &key) {
             if let Some((ek, ev)) = self.remove_internal(hash, idx) {
-                self.lifecycle.on_evict(lcs, ek, ev);
+                self.lifecycle.on_evict_hot(lcs, ek, ev);
             }
         }
         if matches!(strategy, InsertStrategy::Replace { .. }) {
             return Err((key, value));
         }
-        self.lifecycle.on_evict(lcs, key, value);
+        self.lifecycle.on_evict_hot(lcs, key, value);
         Ok(())
     }