v0.25.1

src/cache/lifecycle.rs

@@ -95,9 +95,7 @@ impl Cache {
         let weak = Arc::downgrade(&cache);
         tokio::spawn(async move {
             loop {
-                let Some(cache) = weak.upgrade() else {
-                    break;
-                };
+                let Some(cache) = weak.upgrade() else { break; };
                 let interval = cache
                     .tier_settings
                     .lock()
@@ -159,8 +157,8 @@ impl Cache {
         }
         let lease = self.try_reserve_transient(bytes, settings)?;
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
-        let fill_now =
-            usize::try_from(self.fill_bytes_active.load(Ordering::Relaxed)).unwrap_or(usize::MAX);
+        let fill_now = usize::try_from(self.fill_bytes_active.load(Ordering::Relaxed))
+            .unwrap_or(usize::MAX);
         let allowed = settings
             .max_bytes
             .saturating_add(Self::fill_headroom_bytes(settings.max_bytes));
@@ -168,14 +166,20 @@ impl Cache {
         let generation = store.generation;
         let mut removed = 0usize;
         let mut released_hot = false;
-        while store.bytes.saturating_add(fill_now).saturating_add(bytes) > allowed {
+        while store
+            .bytes
+            .saturating_add(fill_now)
+            .saturating_add(bytes)
+            > allowed
+        {
             if removed >= settings.hot_eviction_max_objects {
                 self.counters
                     .hot_eviction_limited
                     .fetch_add(1, Ordering::Relaxed);
                 break;
             }
-            let Some((_, key)) = store.lru.first_key_value().map(|(seq, key)| (*seq, *key)) else {
+            let Some((_, key)) = store.lru.first_key_value().map(|(seq, key)| (*seq, *key))
+            else {
                 break;
             };
             let Some(old) = store.remove(&key) else {
@@ -207,7 +211,11 @@ impl Cache {
                 self.counters.evictions.fetch_add(1, Ordering::Relaxed);
             }
         }
-        let fits = store.bytes.saturating_add(fill_now).saturating_add(bytes) <= allowed;
+        let fits = store
+            .bytes
+            .saturating_add(fill_now)
+            .saturating_add(bytes)
+            <= allowed;
         if fits {
             self.fill_bytes_active
                 .fetch_add(bytes as u64, Ordering::Relaxed);
@@ -227,6 +235,7 @@ impl Cache {
         }
     }
 
+
     /// Bound long-lived HOT RSS without flushing the working set. Only entries
     /// idle for the configured age are considered, and only while HOT usage is
     /// above the configured target waterline.
@@ -263,29 +272,14 @@ impl Cache {
                 // LRU order is also last-access order, so newer entries cannot qualify.
                 break;
             }
-            let Some(entry) = store.remove(&key) else {
-                continue;
-            };
+            let Some(entry) = store.remove(&key) else { continue; };
             removed += 1;
-            let scope_generation = store
-                .scope_generations
-                .get(&entry.scope)
-                .copied()
-                .unwrap_or(0);
-            let key_generation = store
-                .key_generations
-                .get(&entry.base_key)
-                .copied()
-                .unwrap_or(0);
+            let scope_generation = store.scope_generations.get(&entry.scope).copied().unwrap_or(0);
+            let key_generation = store.key_generations.get(&entry.base_key).copied().unwrap_or(0);
             if !(settings.cold_enabled
                 && settings.cold_on_lru
                 && self.enqueue_demotion(
-                    key,
-                    entry,
-                    revision,
-                    generation,
-                    scope_generation,
-                    key_generation,
+                    key, entry, revision, generation, scope_generation, key_generation,
                 ))
             {
                 self.counters.evictions.fetch_add(1, Ordering::Relaxed);
@@ -307,7 +301,8 @@ impl Cache {
         let generation = store.generation;
         let mut released_hot = false;
         while store.entries.len() > settings.max_entries || store.bytes > settings.max_bytes {
-            let Some((_, key)) = store.lru.first_key_value().map(|(seq, key)| (*seq, *key)) else {
+            let Some((_, key)) = store.lru.first_key_value().map(|(seq, key)| (*seq, *key))
+            else {
                 break;
             };
             let Some(old) = store.remove(&key) else {