From 866ab33c45a97a5784289f78a4a9ed817b29b171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damir=20Jeli=C4=87?= Date: Wed, 15 Sep 2021 20:48:15 +0200 Subject: [PATCH] chore: Remove some unneeded clippy silences --- crates/matrix-sdk-base/src/store/memory_store.rs | 11 ----------- .../src/session_manager/group_sessions.rs | 1 - crates/matrix-sdk-crypto/src/store/caches.rs | 1 - crates/matrix-sdk-crypto/src/store/memorystore.rs | 2 -- crates/matrix-sdk-crypto/src/store/sled.rs | 1 - crates/matrix-sdk/src/room/common.rs | 1 - crates/matrix-sdk/src/room/joined.rs | 1 - 7 files changed, 18 deletions(-) diff --git a/crates/matrix-sdk-base/src/store/memory_store.rs b/crates/matrix-sdk-base/src/store/memory_store.rs index eb415898..d498bb03 100644 --- a/crates/matrix-sdk-base/src/store/memory_store.rs +++ b/crates/matrix-sdk-base/src/store/memory_store.rs @@ -279,7 +279,6 @@ impl MemoryStore { } async fn get_presence_event(&self, user_id: &UserId) -> Result>> { - #[allow(clippy::map_clone)] Ok(self.presence.get(user_id).map(|p| p.clone())) } @@ -289,7 +288,6 @@ impl MemoryStore { event_type: EventType, state_key: &str, ) -> Result>> { - #[allow(clippy::map_clone)] Ok(self.room_state.get(room_id).and_then(|e| { e.get(event_type.as_ref()).and_then(|s| s.get(state_key).map(|e| e.clone())) })) @@ -300,7 +298,6 @@ impl MemoryStore { room_id: &RoomId, event_type: EventType, ) -> Result>> { - #[allow(clippy::map_clone)] Ok(self .room_state .get(room_id) @@ -315,7 +312,6 @@ impl MemoryStore { room_id: &RoomId, user_id: &UserId, ) -> Result> { - #[allow(clippy::map_clone)] Ok(self.profiles.get(room_id).and_then(|p| p.get(user_id).map(|p| p.clone()))) } @@ -324,12 +320,10 @@ impl MemoryStore { room_id: &RoomId, state_key: &UserId, ) -> Result> { - #[allow(clippy::map_clone)] Ok(self.members.get(room_id).and_then(|m| m.get(state_key).map(|m| m.clone()))) } fn get_user_ids(&self, room_id: &RoomId) -> Vec { - #[allow(clippy::map_clone)] self.members .get(room_id) .map(|u| u.iter().map(|u| u.key().clone()).collect()) @@ -337,7 +331,6 @@ impl MemoryStore { } fn get_invited_user_ids(&self, room_id: &RoomId) -> Vec { - #[allow(clippy::map_clone)] self.invited_user_ids .get(room_id) .map(|u| u.iter().map(|u| u.clone()).collect()) @@ -345,7 +338,6 @@ impl MemoryStore { } fn get_joined_user_ids(&self, room_id: &RoomId) -> Vec { - #[allow(clippy::map_clone)] self.joined_user_ids .get(room_id) .map(|u| u.iter().map(|u| u.clone()).collect()) @@ -353,12 +345,10 @@ impl MemoryStore { } fn get_room_infos(&self) -> Vec { - #[allow(clippy::map_clone)] self.room_info.iter().map(|r| r.clone()).collect() } fn get_stripped_room_infos(&self) -> Vec { - #[allow(clippy::map_clone)] self.stripped_room_info.iter().map(|r| r.clone()).collect() } @@ -532,7 +522,6 @@ impl StateStore for MemoryStore { room_id: &RoomId, display_name: &str, ) -> Result> { - #[allow(clippy::map_clone)] Ok(self .display_names .get(room_id) diff --git a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs index bd82192a..90bb028e 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs @@ -363,7 +363,6 @@ impl GroupSessionManager { non_blacklisted_devices.iter().map(|d| d.device_id()).collect(); if let Some(shared) = outbound.shared_with_set.get(user_id) { - #[allow(clippy::map_clone)] // Devices that received this session let shared: HashSet = shared.iter().map(|d| d.key().clone()).collect(); diff --git a/crates/matrix-sdk-crypto/src/store/caches.rs b/crates/matrix-sdk-crypto/src/store/caches.rs index 35f30a56..558bbf8d 100644 --- a/crates/matrix-sdk-crypto/src/store/caches.rs +++ b/crates/matrix-sdk-crypto/src/store/caches.rs @@ -62,7 +62,6 @@ impl SessionStore { /// Get all the sessions that belong to the given sender key. pub fn get(&self, sender_key: &str) -> Option>>> { - #[allow(clippy::map_clone)] self.entries.get(sender_key).map(|s| s.clone()) } diff --git a/crates/matrix-sdk-crypto/src/store/memorystore.rs b/crates/matrix-sdk-crypto/src/store/memorystore.rs index 7771a965..69c9ec9f 100644 --- a/crates/matrix-sdk-crypto/src/store/memorystore.rs +++ b/crates/matrix-sdk-crypto/src/store/memorystore.rs @@ -179,7 +179,6 @@ impl CryptoStore for MemoryStore { } fn users_for_key_query(&self) -> HashSet { - #[allow(clippy::map_clone)] self.users_for_key_query.iter().map(|u| u.clone()).collect() } @@ -225,7 +224,6 @@ impl CryptoStore for MemoryStore { } async fn get_user_identity(&self, user_id: &UserId) -> Result> { - #[allow(clippy::map_clone)] Ok(self.identities.get(user_id).map(|i| i.clone())) } diff --git a/crates/matrix-sdk-crypto/src/store/sled.rs b/crates/matrix-sdk-crypto/src/store/sled.rs index e25ba6d0..e94b71d3 100644 --- a/crates/matrix-sdk-crypto/src/store/sled.rs +++ b/crates/matrix-sdk-crypto/src/store/sled.rs @@ -675,7 +675,6 @@ impl CryptoStore for SledStore { } fn users_for_key_query(&self) -> HashSet { - #[allow(clippy::map_clone)] self.users_for_key_query_cache.iter().map(|u| u.clone()).collect() } diff --git a/crates/matrix-sdk/src/room/common.rs b/crates/matrix-sdk/src/room/common.rs index 091074e1..aa9ab05e 100644 --- a/crates/matrix-sdk/src/room/common.rs +++ b/crates/matrix-sdk/src/room/common.rs @@ -167,7 +167,6 @@ impl Common { } pub(crate) async fn request_members(&self) -> Result> { - #[allow(clippy::map_clone)] if let Some(mutex) = self.client.members_request_locks.get(self.inner.room_id()).map(|m| m.clone()) { diff --git a/crates/matrix-sdk/src/room/joined.rs b/crates/matrix-sdk/src/room/joined.rs index dd900d43..f50b088f 100644 --- a/crates/matrix-sdk/src/room/joined.rs +++ b/crates/matrix-sdk/src/room/joined.rs @@ -270,7 +270,6 @@ impl Joined { async fn preshare_group_session(&self) -> Result<()> { // TODO expose this publicly so people can pre-share a group session if // e.g. a user starts to type a message for a room. - #[allow(clippy::map_clone)] if let Some(mutex) = self.client.group_session_locks.get(self.inner.room_id()).map(|m| m.clone()) {