From 6cc31a0e135e71cedb5e5f8ab4eb155694da320e Mon Sep 17 00:00:00 2001
From: valere <valeref@matrix.org>
Date: Fri, 24 Feb 2023 17:15:51 +0100
Subject: [PATCH] fix clippy

---
 .../matrix-sdk-crypto/src/session_manager/group_sessions.rs   | 4 ++--
 crates/matrix-sdk-sqlite/src/crypto_store.rs                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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 b8f86dc51..bfc4bc11f 100644
--- a/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs
+++ b/crates/matrix-sdk-crypto/src/session_manager/group_sessions.rs
@@ -979,7 +979,7 @@ mod tests {
             .map(|r| {
                 let mut count = 0;
                 // count targets
-                for (_, message) in &r.messages {
+                for message in &r.messages.values() {
                     message.iter().for_each(|(_, content)| {
                         let withheld: MegolmV1AesSha2WithheldContent =
                             content.deserialize_as::<MegolmV1AesSha2WithheldContent>().unwrap();
@@ -1008,7 +1008,7 @@ mod tests {
             .map(|r| {
                 let mut count = 0;
                 // count targets
-                for (_, message) in &r.messages {
+                for message in &r.messages.values() {
                     message.iter().for_each(|(_, content)| {
                         let withheld: MegolmV1AesSha2WithheldContent =
                             content.deserialize_as::<MegolmV1AesSha2WithheldContent>().unwrap();
diff --git a/crates/matrix-sdk-sqlite/src/crypto_store.rs b/crates/matrix-sdk-sqlite/src/crypto_store.rs
index 8a51e4204..291db5a49 100644
--- a/crates/matrix-sdk-sqlite/src/crypto_store.rs
+++ b/crates/matrix-sdk-sqlite/src/crypto_store.rs
@@ -589,7 +589,7 @@ trait SqliteObjectCryptoStoreExt: SqliteObjectExt {
             .query_row(
                 "SELECT data FROM direct_withheld_info WHERE session_id = ?1 AND room_id = ?2",
                 (session_id, room_id),
-                |row| Ok(row.get(0)?),
+                |row| row.get(0),
             )
             .await
             .optional()?)