From 11f2bf0ad68445b4f2b4e9daa61221cfca82a180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Thu, 19 Feb 2026 11:46:03 +0100 Subject: [PATCH] refactor: Minor improvements, some extra comments --- crates/matrix-sdk-base/src/event_cache/store/mod.rs | 9 +++------ crates/matrix-sdk-common/src/cross_process_lock.rs | 2 ++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/crates/matrix-sdk-base/src/event_cache/store/mod.rs b/crates/matrix-sdk-base/src/event_cache/store/mod.rs index 6d3f1ab3a..c0617e185 100644 --- a/crates/matrix-sdk-base/src/event_cache/store/mod.rs +++ b/crates/matrix-sdk-base/src/event_cache/store/mod.rs @@ -82,12 +82,9 @@ impl EventCacheStoreLock { /// Acquire a spin lock (see [`CrossProcessLock::spin_lock`]). pub async fn lock(&self) -> Result { - let lock_state = - self.cross_process_lock.spin_lock(None).await??.map(|cross_process_lock_guard| { - EventCacheStoreLockGuard { cross_process_lock_guard, store: self.store.clone() } - }); - - Ok(lock_state) + Ok(self.cross_process_lock.spin_lock(None).await??.map(|cross_process_lock_guard| { + EventCacheStoreLockGuard { cross_process_lock_guard, store: self.store.clone() } + })) } } diff --git a/crates/matrix-sdk-common/src/cross_process_lock.rs b/crates/matrix-sdk-common/src/cross_process_lock.rs index d4cb80f05..6859b9339 100644 --- a/crates/matrix-sdk-common/src/cross_process_lock.rs +++ b/crates/matrix-sdk-common/src/cross_process_lock.rs @@ -457,6 +457,8 @@ where // lock in `try_lock_once` should sequentialize it all. loop { + // If the cross-process lock config is not `MultiProcess`, this behaves as a + // no-op and we just return let lock_result = self.try_lock_once().await?; if lock_result.is_ok() {