refactor: upgrade to Rust 2024

src/securejoin/bob.rs

@@ -2,9 +2,9 @@
 
 use anyhow::{Context as _, Result};
 
-use super::qrinvite::QrInvite;
 use super::HandshakeMessage;
-use crate::chat::{self, is_contact_in_chat, ChatId, ProtectionStatus};
+use super::qrinvite::QrInvite;
+use crate::chat::{self, ChatId, ProtectionStatus, is_contact_in_chat};
 use crate::constants::{Blocked, Chattype};
 use crate::contact::Origin;
 use crate::context::Context;
@@ -14,7 +14,7 @@ use crate::log::info;
 use crate::message::{Message, Viewtype};
 use crate::mimeparser::{MimeMessage, SystemMessage};
 use crate::param::Param;
-use crate::securejoin::{encrypted_and_signed, verify_sender_by_fingerprint, ContactId};
+use crate::securejoin::{ContactId, encrypted_and_signed, verify_sender_by_fingerprint};
 use crate::stock_str;
 use crate::sync::Sync::*;
 use crate::tools::{create_smeared_timestamp, time};
@@ -285,7 +285,7 @@ pub(crate) async fn send_handshake_message(
             // Previous Delta Chat core also sent `Secure-Join-Group` header
             // in `vg-request` messages,
             // but it was not used on the receiver.
-            if let QrInvite::Group { ref grpid, .. } = invite {
+            if let QrInvite::Group { grpid, .. } = invite {
                 msg.param.set(Param::Arg4, grpid);
             }
         }
@@ -346,11 +346,7 @@ async fn joining_chat_id(
 ) -> Result<ChatId> {
     match invite {
         QrInvite::Contact { .. } => Ok(alice_chat_id),
-        QrInvite::Group {
-            ref grpid,
-            ref name,
-            ..
-        } => {
+        QrInvite::Group { grpid, name, .. } => {
             let group_chat_id = match chat::get_chat_id_by_grpid(context, grpid).await? {
                 Some((chat_id, _protected, _blocked)) => {
                     chat_id.unblock_ex(context, Nosync).await?;

src/securejoin/qrinvite.rs

@@ -4,7 +4,7 @@
 //! with it rather hard, so here we have a wrapper type that specifically deals with Secure-Join
 //! QR-codes so that the Secure-Join code can have more guarantees when dealing with this.
 
-use anyhow::{bail, Error, Result};
+use anyhow::{Error, Result, bail};
 
 use crate::contact::ContactId;
 use crate::key::Fingerprint;

src/securejoin/securejoin_tests.rs

@@ -1,14 +1,14 @@
 use deltachat_contact_tools::EmailAddress;
 
 use super::*;
-use crate::chat::{remove_contact_from_chat, CantSendReason};
+use crate::chat::{CantSendReason, remove_contact_from_chat};
 use crate::chatlist::Chatlist;
 use crate::constants::Chattype;
 use crate::key::self_fingerprint;
 use crate::receive_imf::receive_imf;
 use crate::stock_str::{self, chat_protection_enabled};
 use crate::test_utils::{
-    get_chat_msg, TestContext, TestContextManager, TimeShiftFalsePositiveNote,
+    TestContext, TestContextManager, TimeShiftFalsePositiveNote, get_chat_msg,
 };
 use crate::tools::SystemTime;
 use std::time::Duration;
@@ -405,11 +405,12 @@ async fn test_setup_contact_concurrent_calls() -> Result<()> {
     assert!(!alice_id.is_special());
     assert_eq!(chat.typ, Chattype::Single);
     assert_ne!(claire_id, alice_id);
-    assert!(bob
-        .pop_sent_msg()
-        .await
-        .payload()
-        .contains("alice@example.org"));
+    assert!(
+        bob.pop_sent_msg()
+            .await
+            .payload()
+            .contains("alice@example.org")
+    );
 
     Ok(())
 }