0.34.6_repo_cleanup

src/cache/lookup/hot.rs

@@ -1,20 +1,22 @@
 impl Cache {
     fn get_hot(&self, ticket: &Ticket, count_miss: bool) -> Option<Hit> {
-        // Only metadata, hit counters and exact LRU ordering require the store
-        // mutex. Materializing an HTTP response may allocate (headers, Body,
-        // Age formatting) and must be done *after* dropping that mutex.
         let mut store = self.store.lock().unwrap_or_else(|e| e.into_inner());
         if store.revision != ticket.revision
             || store.generation != ticket.generation
-            || store.scope_generations.get(&ticket.scope).copied().unwrap_or(0)
+            || store
+                .scope_generations
+                .get(&ticket.scope)
+                .copied()
+                .unwrap_or(0)
                 != ticket.scope_generation
-            || store.key_generations.get(&ticket.key).copied().unwrap_or(0)
-                != ticket.key_generation
+            || store.key_generations.get(&ticket.key).copied().unwrap_or(0) != ticket.key_generation
         {
             return None;
         }
         if let Some(storage_key) = matching_hot_key(&store, ticket) {
-            let banned = store.entries.get(&storage_key)
+            let banned = store
+                .entries
+                .get(&storage_key)
                 .is_some_and(|entry| self.hot_entry_banned(&storage_key, entry));
             if banned {
                 store.remove(&storage_key);
@@ -27,7 +29,10 @@ impl Cache {
             }
             let entry = store.entries.get(&storage_key)?;
             let resident_age_seconds = hot_resident_age(entry).as_secs();
-            let age = entry.initial_age.saturating_add(entry.received.elapsed()).as_secs();
+            let age = entry
+                .initial_age
+                .saturating_add(entry.received.elapsed())
+                .as_secs();
             let state = cache_state(
                 age,
                 entry.ttl,
@@ -39,8 +44,16 @@ impl Cache {
             );
             if state.servable() {
                 let sequence = store.next_sequence();
-                let (old_sequence, headers, body, hits, transformed, skip_compression,
-                    remaining_ttl, body_bytes) = {
+                let (
+                    old_sequence,
+                    headers,
+                    body,
+                    hits,
+                    transformed,
+                    skip_compression,
+                    remaining_ttl,
+                    body_bytes,
+                ) = {
                     let entry = store.entries.get_mut(&storage_key)?;
                     let old_sequence = entry.sequence;
                     entry.hits = entry.hits.saturating_add(1);
@@ -59,15 +72,15 @@ impl Cache {
                 };
                 store.lru.remove(&old_sequence);
                 store.lru.insert(sequence, storage_key);
-                // Preserve the exact LRU and domain-byte counters, without
-                // allocating a replacement variant index or String keys.
                 self.counters.hits.fetch_add(1, Ordering::Relaxed);
                 drop(store);
 
                 let mut response = Response::new(Body::from(body.clone()));
                 *response.headers_mut() = headers.as_ref().clone();
                 if transformed {
-                    response.extensions_mut().insert(crate::transform::CachedTransformed);
+                    response
+                        .extensions_mut()
+                        .insert(crate::transform::CachedTransformed);
                 }
                 if skip_compression {
                     response.extensions_mut().insert(crate::compression::Skip);
@@ -76,7 +89,8 @@ impl Cache {
                     "age",
                     HeaderValue::from_str(&age.to_string()).expect("integer header"),
                 );
-                self.domain_stats.saved_body_hit(&ticket.scope, &ticket.domain, body_bytes);
+                self.domain_stats
+                    .saved_body_hit(&ticket.scope, &ticket.domain, body_bytes);
                 return Some(Hit {
                     response,
                     body,
@@ -274,7 +288,8 @@ impl Cache {
             "age",
             HeaderValue::from_str(&age.to_string()).expect("integer header"),
         );
-        self.domain_stats.saved_body_hit(&ticket.scope, &ticket.domain, entry.body_bytes);
+        self.domain_stats
+            .saved_body_hit(&ticket.scope, &ticket.domain, entry.body_bytes);
         self.counters.hits.fetch_add(1, Ordering::Relaxed);
         self.counters.cold_hits.fetch_add(1, Ordering::Relaxed);
         self.counters