refactor: Use native async fn in traits for BackingStore

Author: jplatte

Cargo.lock

@@ -185,8 +185,6 @@ pub type Result<T, E = EventCacheStoreError> = std::result::Result<T, E>;
 #[derive(Clone, Debug)]
 struct LockableEventCacheStore(Arc<DynEventCacheStore>);
 
-#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
 impl BackingStore for LockableEventCacheStore {
     type LockError = EventCacheStoreError;
 

crates/matrix-sdk-base/src/event_cache/store/mod.rs

@@ -25,7 +25,6 @@ uniffi = ["dep:uniffi"]
 test-send-sync = []
 
 [dependencies]
-async-trait.workspace = true
 eyeball-im.workspace = true
 futures-core.workspace = true
 futures-util.workspace = true

crates/matrix-sdk-common/Cargo.toml

@@ -39,6 +39,7 @@
 
 use std::{
     error::Error,
+    future::Future,
     sync::{
         atomic::{self, AtomicU32},
         Arc,
@@ -56,18 +57,16 @@ use crate::{
 };
 
 /// Backing store for a cross-process lock.
-#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
 pub trait BackingStore {
     type LockError: Error + Send + Sync;
 
     /// Try to take a lock using the given store.
-    async fn try_lock(
+    fn try_lock(
         &self,
         lease_duration_ms: u32,
         key: &str,
         holder: &str,
-    ) -> Result<bool, Self::LockError>;
+    ) -> impl Future<Output = Result<bool, Self::LockError>> + SendOutsideWasm;
 }
 
 /// Small state machine to handle wait times.
@@ -369,8 +368,6 @@ mod tests {
     #[derive(Debug, thiserror::Error)]
     enum DummyError {}
 
-    #[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
-    #[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
     impl BackingStore for TestStore {
         type LockError = DummyError;
 

crates/matrix-sdk-common/src/store_locks.rs

@@ -2138,8 +2138,6 @@ impl Deref for Store {
 #[derive(Clone, Debug)]
 pub struct LockableCryptoStore(Arc<dyn CryptoStore<Error = CryptoStoreError>>);
 
-#[cfg_attr(target_arch = "wasm32", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait::async_trait)]
 impl matrix_sdk_common::store_locks::BackingStore for LockableCryptoStore {
     type LockError = CryptoStoreError;