refactor: Use native async fn in traits for testing traits

Author: jplatte

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

@@ -15,7 +15,6 @@
 //! Trait and macro of integration tests for `EventCacheStore` implementations.
 
 use assert_matches::assert_matches;
-use async_trait::async_trait;
 use matrix_sdk_common::{
     deserialized_responses::{
         AlgorithmInfo, DecryptedRoomEvent, EncryptionInfo, TimelineEvent, TimelineEventKind,
@@ -114,8 +113,7 @@ pub fn check_test_event(event: &TimelineEvent, text: &str) {
 ///
 /// This trait is not meant to be used directly, but will be used with the
 /// `event_cache_store_integration_tests!` macro.
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
+#[allow(async_fn_in_trait)]
 pub trait EventCacheStoreIntegrationTests {
     /// Test media content storage.
     async fn test_media_content(&self);
@@ -154,8 +152,6 @@ pub trait EventCacheStoreIntegrationTests {
     async fn test_save_event(&self);
 }
 
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl EventCacheStoreIntegrationTests for DynEventCacheStore {
     async fn test_media_content(&self) {
         let uri = mxc_uri!("mxc://localhost/media");

crates/matrix-sdk-base/src/event_cache/store/media/integration_tests.rs

@@ -15,7 +15,6 @@
 //! Trait and macro of integration tests for `EventCacheStoreMedia`
 //! implementations.
 
-use async_trait::async_trait;
 use ruma::{
     events::room::MediaSource,
     mxc_uri, owned_mxc_uri,
@@ -31,8 +30,7 @@ use crate::media::{MediaFormat, MediaRequestParameters};
 ///
 /// This trait is not meant to be used directly, but will be used with the
 /// `event_cache_store_media_integration_tests!` macro.
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
+#[allow(async_fn_in_trait)]
 pub trait EventCacheStoreMediaIntegrationTests {
     /// Test media retention policy storage.
     async fn test_store_media_retention_policy(&self);
@@ -58,8 +56,6 @@ pub trait EventCacheStoreMediaIntegrationTests {
     async fn test_store_last_media_cleanup_time(&self);
 }
 
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl<Store> EventCacheStoreMediaIntegrationTests for Store
 where
     Store: EventCacheStoreMedia + std::fmt::Debug,

crates/matrix-sdk-base/src/store/integration_tests.rs

@@ -4,7 +4,6 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 
 use assert_matches::assert_matches;
 use assert_matches2::assert_let;
-use async_trait::async_trait;
 use growable_bloom_filter::GrowableBloomBuilder;
 use matrix_sdk_test::{event_factory::EventFactory, test_json};
 use ruma::{
@@ -47,8 +46,7 @@ use crate::{
 ///
 /// This trait is not meant to be used directly, but will be used with the
 /// `statestore_integration_tests!` macro.
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
+#[allow(async_fn_in_trait)]
 pub trait StateStoreIntegrationTests {
     /// Populate the given `StateStore`.
     async fn populate(&self) -> Result<()>;
@@ -98,8 +96,6 @@ pub trait StateStoreIntegrationTests {
     async fn test_get_room_infos(&self);
 }
 
-#[cfg_attr(target_arch = "wasm32", async_trait(?Send))]
-#[cfg_attr(not(target_arch = "wasm32"), async_trait)]
 impl StateStoreIntegrationTests for DynStateStore {
     async fn populate(&self) -> Result<()> {
         let mut changes = StateChanges::default();