Mark push_media as being OKAY despite having many arguments

matrix-org · Dec 11, 2024 · df7fc6e · df7fc6e
1 parent cdac788
commit df7fc6e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/crates/matrix-sdk-sqlite/src/state_store.rs b/crates/matrix-sdk-sqlite/src/state_store.rs
@@ -2408,22 +2408,21 @@ mod migration_tests {
             let wedge_tx = wedged_event_transaction_id.clone();
             let local_tx = local_event_transaction_id.clone();
 
-            let _ = conn
-                .with_transaction(move |txn| {
-                    add_dependent_send_queue_event_v7(
-                        &db,
-                        txn,
-                        room_id,
-                        &local_tx,
-                        ChildTransactionId::new(),
-                        DependentQueuedRequestKind::RedactEvent,
-                    )?;
-                    add_send_queue_event_v7(&db, txn, &wedge_tx, room_id, true)?;
-                    add_send_queue_event_v7(&db, txn, &local_tx, room_id, false)?;
-                    Result::<_, Error>::Ok(())
-                })
-                .await
-                .unwrap();
+            conn.with_transaction(move |txn| {
+                add_dependent_send_queue_event_v7(
+                    &db,
+                    txn,
+                    room_id,
+                    &local_tx,
+                    ChildTransactionId::new(),
+                    DependentQueuedRequestKind::RedactEvent,
+                )?;
+                add_send_queue_event_v7(&db, txn, &wedge_tx, room_id, true)?;
+                add_send_queue_event_v7(&db, txn, &local_tx, room_id, false)?;
+                Result::<_, Error>::Ok(())
+            })
+            .await
+            .unwrap();
         }
 
         // This transparently migrates to the latest version, which clears up all

diff --git a/crates/matrix-sdk/src/send_queue.rs b/crates/matrix-sdk/src/send_queue.rs
@@ -1181,6 +1181,7 @@ impl QueueStorage {
     /// Push requests (and dependents) to upload a media.
     ///
     /// See the module-level description for details of the whole processus.
+    #[allow(clippy::too_many_arguments)]
     async fn push_media(
         &self,
         event: RoomMessageEventContent,