From fea80843ebab39f8dadf76f97f3a8f663d33da09 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 27 Dec 2021 14:21:46 +0100 Subject: [PATCH] Remove redundant calls to `.into_iter()` --- crates/matrix-sdk-crypto/src/backups/mod.rs | 2 +- crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs | 2 +- .../matrix-sdk-crypto/src/session_manager/group_sessions.rs | 4 ++-- crates/matrix-sdk-crypto/src/session_manager/sessions.rs | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/backups/mod.rs b/crates/matrix-sdk-crypto/src/backups/mod.rs index 1d32a3268..3049b00ca 100644 --- a/crates/matrix-sdk-crypto/src/backups/mod.rs +++ b/crates/matrix-sdk-crypto/src/backups/mod.rs @@ -357,7 +357,7 @@ impl BackupMachine { let mut session_record: BTreeMap, BTreeMap>> = BTreeMap::new(); - for session in sessions.into_iter() { + for session in sessions { let room_id = session.room_id().to_owned(); let session_id = session.session_id().to_owned(); let sender_key = session.sender_key().to_owned(); diff --git a/crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs b/crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs index b4be71fd1..e61ac47c2 100644 --- a/crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs +++ b/crates/matrix-sdk-crypto/src/olm/group_sessions/outbound.rs @@ -223,7 +223,7 @@ impl OutboundGroupSession { "Marking to-device request carrying a room key as sent" ); - for (user_id, info) in r.into_iter() { + for (user_id, info) in r { self.shared_with_set.entry(user_id).or_insert_with(DashMap::new).extend(info) } 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 9653266dc..f3c981e2c 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs @@ -289,11 +289,11 @@ impl GroupSessionManager { changed_sessions.push(session); } - for (user, device_messages) in message.into_iter() { + for (user, device_messages) in message { messages.entry(user).or_insert_with(BTreeMap::new).extend(device_messages); } - for (user, infos) in share_info.into_iter() { + for (user, infos) in share_info { share_infos.entry(user).or_insert_with(BTreeMap::new).extend(infos); } } diff --git a/crates/matrix-sdk-crypto/src/session_manager/sessions.rs b/crates/matrix-sdk-crypto/src/session_manager/sessions.rs index 0579aa5fd..a3c89489f 100644 --- a/crates/matrix-sdk-crypto/src/session_manager/sessions.rs +++ b/crates/matrix-sdk-crypto/src/session_manager/sessions.rs @@ -185,7 +185,7 @@ impl SessionManager { for user_id in users { let user_devices = self.store.get_readonly_devices_filtered(user_id).await?; - for (device_id, device) in user_devices.into_iter() { + for (device_id, device) in user_devices { if !device.algorithms().contains(&EventEncryptionAlgorithm::OlmV1Curve25519AesSha2) { warn!(