v0.35.0

src/cache/model/cache.rs

@@ -296,6 +296,7 @@ struct ColdDraft {
     _memory_lease: TransientLease,
 }
 
+#[allow(clippy::large_enum_variant)]
 enum ColdCommand {
     Store(ColdDraft),
     Delete(Vec<PathBuf>),

src/cache/model/maintenance.rs

@@ -171,9 +171,9 @@ impl Revalidation {
         self.reusable_without_validation
     }
     pub fn cache_status_forward_reason(&self, request_forces_validation: bool) -> &'static str {
-        if self.age >= self.ttl {
+        if self.age >= self.ttl || !self.reusable_without_validation {
             "stale"
-        } else if request_forces_validation && self.reusable_without_validation {
+        } else if request_forces_validation {
             "request"
         } else {
             "miss"

src/cache/model/settings.rs

@@ -48,9 +48,10 @@ fn release_allocator_memory() {
     }
 }
 
-#[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
+#[derive(Debug, Clone, Copy, Default, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]
 pub enum CollapseTimeoutFallback {
+    #[default]
     Origin,
     StaleIfAvailable,
 }
@@ -63,11 +64,6 @@ pub enum StaleErrorClass {
     Tls,
 }
 
-impl Default for CollapseTimeoutFallback {
-    fn default() -> Self {
-        Self::Origin
-    }
-}
 
 #[derive(Debug, Clone, Copy, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "snake_case")]

src/cache/model/views.rs

@@ -3,7 +3,7 @@ fn parse_key_hex(value: &str) -> Option<Key> {
         return None;
     }
     let mut key = [0_u8; 32];
-    for (index, chunk) in value.as_bytes().chunks_exact(2).enumerate() {
+    for (index, chunk) in value.as_bytes().as_chunks::<2>().0.iter().enumerate() {
         let text = std::str::from_utf8(chunk).ok()?;
         key[index] = u8::from_str_radix(text, 16).ok()?;
     }
@@ -137,13 +137,13 @@ fn stale_mode(
     if matches!(max_stale, Some(Some(limit)) if stale_for > limit) {
         return None;
     }
+    if max_stale.is_some() {
+        return Some(false);
+    }
     if stale_while_revalidate > 0 && stale_for <= stale_while_revalidate {
         return Some(true);
     }
-    match max_stale {
-        Some(None) | Some(Some(_)) => Some(false),
-        None => None,
-    }
+    None
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]