diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs index fc3bea1a..ac933ede 100644 --- a/matrix_sdk/src/client.rs +++ b/matrix_sdk/src/client.rs @@ -571,13 +571,13 @@ impl Client { http_client, base_client, #[cfg(feature = "encryption")] - group_session_locks: Arc::new(DashMap::new()), + group_session_locks: Default::default(), #[cfg(feature = "encryption")] - key_claim_lock: Arc::new(Mutex::new(())), - members_request_locks: Arc::new(DashMap::new()), - typing_notice_times: Arc::new(DashMap::new()), - event_handlers: Arc::new(RwLock::new(BTreeMap::new())), - notification_handlers: Arc::new(RwLock::new(Vec::new())), + key_claim_lock: Default::default(), + members_request_locks: Default::default(), + typing_notice_times: Default::default(), + event_handlers: Default::default(), + notification_handlers: Default::default(), appservice_mode: config.appservice_mode, }) } diff --git a/matrix_sdk_base/src/store/memory_store.rs b/matrix_sdk_base/src/store/memory_store.rs index 311e6373..e2e7e303 100644 --- a/matrix_sdk_base/src/store/memory_store.rs +++ b/matrix_sdk_base/src/store/memory_store.rs @@ -72,23 +72,23 @@ impl MemoryStore { #[allow(dead_code)] pub fn new() -> Self { Self { - sync_token: Arc::new(RwLock::new(None)), - filters: DashMap::new().into(), - account_data: DashMap::new().into(), - members: DashMap::new().into(), - profiles: DashMap::new().into(), - display_names: DashMap::new().into(), - joined_user_ids: DashMap::new().into(), - invited_user_ids: DashMap::new().into(), - room_info: DashMap::new().into(), - room_state: DashMap::new().into(), - room_account_data: DashMap::new().into(), - stripped_room_info: DashMap::new().into(), - stripped_room_state: DashMap::new().into(), - stripped_members: DashMap::new().into(), - presence: DashMap::new().into(), - room_user_receipts: DashMap::new().into(), - room_event_receipts: DashMap::new().into(), + sync_token: Default::default(), + filters: Default::default(), + account_data: Default::default(), + members: Default::default(), + profiles: Default::default(), + display_names: Default::default(), + joined_user_ids: Default::default(), + invited_user_ids: Default::default(), + room_info: Default::default(), + room_state: Default::default(), + room_account_data: Default::default(), + stripped_room_info: Default::default(), + stripped_room_state: Default::default(), + stripped_members: Default::default(), + presence: Default::default(), + room_user_receipts: Default::default(), + room_event_receipts: Default::default(), media: Arc::new(Mutex::new(LruCache::new(100))), } } diff --git a/matrix_sdk_base/src/store/mod.rs b/matrix_sdk_base/src/store/mod.rs index 17c77c1a..8d930722 100644 --- a/matrix_sdk_base/src/store/mod.rs +++ b/matrix_sdk_base/src/store/mod.rs @@ -310,15 +310,12 @@ pub struct Store { impl Store { fn new(inner: Box) -> Self { - let session = Arc::new(RwLock::new(None)); - let sync_token = Arc::new(RwLock::new(None)); - Self { inner: inner.into(), - session, - sync_token, - rooms: DashMap::new().into(), - stripped_rooms: DashMap::new().into(), + session: Default::default(), + sync_token: Default::default(), + rooms: Default::default(), + stripped_rooms: Default::default(), } } diff --git a/matrix_sdk_crypto/src/gossiping/machine.rs b/matrix_sdk_crypto/src/gossiping/machine.rs index 818b7959..fb334694 100644 --- a/matrix_sdk_crypto/src/gossiping/machine.rs +++ b/matrix_sdk_crypto/src/gossiping/machine.rs @@ -76,8 +76,8 @@ impl GossipMachine { device_id, store, outbound_group_sessions, - outgoing_requests: DashMap::new().into(), - incoming_key_requests: DashMap::new().into(), + outgoing_requests: Default::default(), + incoming_key_requests: Default::default(), wait_queue: WaitQueue::new(), users_for_key_claim, } diff --git a/matrix_sdk_crypto/src/session_manager/group_sessions.rs b/matrix_sdk_crypto/src/session_manager/group_sessions.rs index 79b1af74..c5a21e59 100644 --- a/matrix_sdk_crypto/src/session_manager/group_sessions.rs +++ b/matrix_sdk_crypto/src/session_manager/group_sessions.rs @@ -49,11 +49,7 @@ pub(crate) struct GroupSessionCache { impl GroupSessionCache { pub(crate) fn new(store: Store) -> Self { - Self { - store, - sessions: DashMap::new().into(), - sessions_being_shared: Arc::new(DashMap::new()), - } + Self { store, sessions: Default::default(), sessions_being_shared: Default::default() } } pub(crate) fn insert(&self, session: OutboundGroupSession) { diff --git a/matrix_sdk_crypto/src/session_manager/sessions.rs b/matrix_sdk_crypto/src/session_manager/sessions.rs index ab0af01e..da11a9eb 100644 --- a/matrix_sdk_crypto/src/session_manager/sessions.rs +++ b/matrix_sdk_crypto/src/session_manager/sessions.rs @@ -64,8 +64,8 @@ impl SessionManager { store, key_request_machine, users_for_key_claim, - wedged_devices: Arc::new(DashMap::new()), - outgoing_to_device_requests: Arc::new(DashMap::new()), + wedged_devices: Default::default(), + outgoing_to_device_requests: Default::default(), } } diff --git a/matrix_sdk_crypto/src/store/caches.rs b/matrix_sdk_crypto/src/store/caches.rs index abdd972c..35f30a56 100644 --- a/matrix_sdk_crypto/src/store/caches.rs +++ b/matrix_sdk_crypto/src/store/caches.rs @@ -37,7 +37,7 @@ pub struct SessionStore { impl SessionStore { /// Create a new empty Session store. pub fn new() -> Self { - SessionStore { entries: Arc::new(DashMap::new()) } + Self::default() } /// Add a session to the store. @@ -82,7 +82,7 @@ pub struct GroupSessionStore { impl GroupSessionStore { /// Create a new empty store. pub fn new() -> Self { - GroupSessionStore { entries: Arc::new(DashMap::new()) } + Self::default() } /// Add an inbound group session to the store. @@ -141,7 +141,7 @@ pub struct DeviceStore { impl DeviceStore { /// Create a new empty device store. pub fn new() -> Self { - DeviceStore { entries: Arc::new(DashMap::new()) } + Self::default() } /// Add a device to the store. diff --git a/matrix_sdk_crypto/src/store/memorystore.rs b/matrix_sdk_crypto/src/store/memorystore.rs index 22eeb74a..e1dc0672 100644 --- a/matrix_sdk_crypto/src/store/memorystore.rs +++ b/matrix_sdk_crypto/src/store/memorystore.rs @@ -59,13 +59,13 @@ impl Default for MemoryStore { MemoryStore { sessions: SessionStore::new(), inbound_group_sessions: GroupSessionStore::new(), - tracked_users: Arc::new(DashSet::new()), - users_for_key_query: Arc::new(DashSet::new()), - olm_hashes: Arc::new(DashMap::new()), + tracked_users: Default::default(), + users_for_key_query: Default::default(), + olm_hashes: Default::default(), devices: DeviceStore::new(), - identities: Arc::new(DashMap::new()), - outgoing_key_requests: Arc::new(DashMap::new()), - key_requests_by_info: Arc::new(DashMap::new()), + identities: Default::default(), + outgoing_key_requests: Default::default(), + key_requests_by_info: Default::default(), } } } diff --git a/matrix_sdk_crypto/src/verification/cache.rs b/matrix_sdk_crypto/src/verification/cache.rs index 2124969b..24868817 100644 --- a/matrix_sdk_crypto/src/verification/cache.rs +++ b/matrix_sdk_crypto/src/verification/cache.rs @@ -33,7 +33,7 @@ pub struct VerificationCache { impl VerificationCache { pub fn new() -> Self { - Self { verification: DashMap::new().into(), outgoing_requests: DashMap::new().into() } + Self { verification: Default::default(), outgoing_requests: Default::default() } } #[cfg(test)] diff --git a/matrix_sdk_crypto/src/verification/machine.rs b/matrix_sdk_crypto/src/verification/machine.rs index d3cb603b..1624a9e0 100644 --- a/matrix_sdk_crypto/src/verification/machine.rs +++ b/matrix_sdk_crypto/src/verification/machine.rs @@ -62,7 +62,7 @@ impl VerificationMachine { private_identity: identity, store: VerificationStore { account, inner: store }, verifications: VerificationCache::new(), - requests: DashMap::new().into(), + requests: Default::default(), } }