From 6814e70aa439733f3191fc4ebfdfd27868b7b296 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 7 Aug 2025 00:19:49 +0200 Subject: [PATCH] refactor: Simplify some methods of FailuresCache Follow-up to #5490. --- crates/matrix-sdk-common/src/failures_cache.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/crates/matrix-sdk-common/src/failures_cache.rs b/crates/matrix-sdk-common/src/failures_cache.rs index 151d0866c..04fa5d45c 100644 --- a/crates/matrix-sdk-common/src/failures_cache.rs +++ b/crates/matrix-sdk-common/src/failures_cache.rs @@ -101,8 +101,7 @@ where T: Borrow, Q: Hash + Eq + ?Sized, { - let lock = self.inner.items.read(); - if let Some(item) = lock.get(key) { !item.expired() } else { false } + self.inner.items.read().get(key).is_some_and(|item| !item.expired()) } /// Get the failure count for a given key. @@ -120,8 +119,7 @@ where T: Borrow, Q: Hash + Eq + ?Sized, { - let lock = self.inner.items.read(); - lock.get(key).map(|i| i.failure_count) + self.inner.items.read().get(key).map(|i| i.failure_count) } /// This will calculate a duration that determines how long an item is @@ -187,8 +185,7 @@ where /// for immediate retry. #[doc(hidden)] pub fn expire(&self, item: &T) { - let mut lock = self.inner.items.write(); - lock.get_mut(item).map(FailuresItem::expire); + self.inner.items.write().get_mut(item).map(FailuresItem::expire); } }