Merge pull request #199 from 9999years/cache-remove-expiration

Make `cache_set_lifespan` the inverse of `cache_get_lifespan`

src/lib.rs

@@ -373,6 +373,14 @@ pub trait Cached<K, V> {
  fn cache_set_lifespan(&mut self, _seconds: u64) -> Option<u64> {
  None
  }
+
+ /// Remove the lifespan for cached values, returns the old value.
+ ///
+ /// For cache implementations that don't support retaining values indefinitely, this method is
+ /// a no-op.
+ fn cache_unset_lifespan(&mut self) -> Option<u64> {
+ None
+ }
 }
 
 /// Extra cache operations for types that implement `Clone`
@@ -434,10 +442,18 @@ pub trait IOCached<K, V> {
  None
  }
 
- /// Set the lifespan of cached values, returns the old value
+ /// Set the lifespan of cached values, returns the old value.
  fn cache_set_lifespan(&mut self, _seconds: u64) -> Option<u64> {
  None
  }
+
+ /// Remove the lifespan for cached values, returns the old value.
+ ///
+ /// For cache implementations that don't support retaining values indefinitely, this method is
+ /// a no-op.
+ fn cache_unset_lifespan(&mut self) -> Option<u64> {
+ None
+ }
 }
 
 #[cfg(feature = "async")]
@@ -464,4 +480,12 @@ pub trait IOCachedAsync<K, V> {
  fn cache_set_lifespan(&mut self, _seconds: u64) -> Option<u64> {
  None
  }
+
+ /// Remove the lifespan for cached values, returns the old value.
+ ///
+ /// For cache implementations that don't support retaining values indefinitely, this method is
+ /// a no-op.
+ fn cache_unset_lifespan(&mut self) -> Option<u64> {
+ None
+ }
 }

src/stores/disk.rs

@@ -364,6 +364,10 @@ where
  self.refresh = refresh;
  old
  }
+
+ fn cache_unset_lifespan(&mut self) -> Option<u64> {
+ self.seconds.take()
+ }
 }
 
 #[cfg(test)]