chore: update core-crypto repo to rust 2024 edition [WPB-16113]

crypto-ffi/Cargo.toml

@@ -3,7 +3,7 @@ name = "core-crypto-ffi"
 description = "Platform-specific bindings (Android, iOS, WASM) for CoreCrypto"
 repository = "https://github.com/wireapp/core-crypto"
 version = "4.1.0"
-edition = "2021"
+edition = "2024"
 license = "GPL-3.0-only"
 publish = false
 

crypto-ffi/src/generic/context/e2ei.rs

@@ -1,13 +1,13 @@
 use std::{collections::HashMap, ops::DerefMut};
 
 use crate::{
+    CoreCryptoError, NewCrlDistributionPoints,
     generic::{
-        context::CoreCryptoContext, Ciphersuite, ClientId, CoreCryptoResult, CrlRegistration, E2eiConversationState,
-        E2eiDumpedPkiEnv, E2eiEnrollment, MlsCredentialType, WireIdentity,
+        Ciphersuite, ClientId, CoreCryptoResult, CrlRegistration, E2eiConversationState, E2eiDumpedPkiEnv,
+        E2eiEnrollment, MlsCredentialType, WireIdentity, context::CoreCryptoContext,
     },
-    CoreCryptoError, NewCrlDistributionPoints,
 };
-use core_crypto::{prelude::VerifiableGroupInfo, RecursiveError};
+use core_crypto::{RecursiveError, prelude::VerifiableGroupInfo};
 use tls_codec::Deserialize;
 
 #[uniffi::export]

crypto-ffi/src/generic/context/mod.rs

@@ -5,12 +5,12 @@ use super::{
 use crate::NewCrlDistributionPoints;
 use async_lock::{Mutex, OnceCell};
 use core_crypto::{
+    RecursiveError,
     context::CentralContext,
     prelude::{
         ClientIdentifier, ConversationId, KeyPackageIn, KeyPackageRef, MlsConversationConfiguration,
         VerifiableGroupInfo,
     },
-    RecursiveError,
 };
 use std::{future::Future, ops::Deref, sync::Arc};
 use tls_codec::{Deserialize, Serialize};

crypto-ffi/src/generic/context/proteus.rs

@@ -1,7 +1,7 @@
+use crate::ProteusAutoPrekeyBundle;
 use crate::context::CoreCryptoContext;
 use crate::generic::CoreCryptoResult;
 use crate::proteus_impl;
-use crate::ProteusAutoPrekeyBundle;
 
 #[uniffi::export]
 impl CoreCryptoContext {

crypto-ffi/src/generic/mod.rs

@@ -21,22 +21,22 @@ use std::{
 };
 
 use log::{
-    kv::{self, Key, Value, VisitSource},
     Level, LevelFilter, Metadata, Record,
+    kv::{self, Key, Value, VisitSource},
 };
 use log_reload::ReloadLog;
 use tls_codec::Deserialize;
 
 use self::context::CoreCryptoContext;
-use crate::{proteus_impl, UniffiCustomTypeConverter};
+use crate::{UniffiCustomTypeConverter, proteus_impl};
 pub use core_crypto::prelude::ConversationId;
 use core_crypto::{
+    InnermostErrorMessage, RecursiveError,
     prelude::{
         EntropySeed, MlsBufferedConversationDecryptMessage, MlsCentral, MlsCentralConfiguration, MlsCiphersuite,
         MlsCommitBundle, MlsConversationDecryptMessage, MlsCustomConfiguration, MlsGroupInfoBundle, MlsProposalBundle,
         VerifiableGroupInfo,
     },
-    InnermostErrorMessage, RecursiveError,
 };
 
 pub mod context;
@@ -97,7 +97,9 @@ pub enum MlsError {
     BufferedFutureMessage,
     #[error("Incoming message is from an epoch too far in the future to buffer.")]
     WrongEpoch,
-    #[error("Incoming message is a commit for which we have not yet received all the proposals. Buffering until all proposals have arrived.")]
+    #[error(
+        "Incoming message is a commit for which we have not yet received all the proposals. Buffering until all proposals have arrived."
+    )]
     BufferedCommit,
     #[error("The epoch in which message was encrypted is older than allowed")]
     MessageEpochTooOld,
@@ -115,7 +117,9 @@ pub enum MlsError {
     /// requests their old KeyPackages to be deleted but one has already been claimed by another client to create a Welcome.
     /// In that case the only solution is that the client receiving such a Welcome tries to join the group
     /// with an External Commit instead
-    #[error("Although this Welcome seems valid, the local KeyPackage it references has already been deleted locally. Join this group with an external commit")]
+    #[error(
+        "Although this Welcome seems valid, the local KeyPackage it references has already been deleted locally. Join this group with an external commit"
+    )]
     OrphanWelcome,
     /// Message rejected by the delivery service
     #[error("Message rejected by the delivery service. Reason: {reason}")]
@@ -695,15 +699,14 @@ impl TryFrom<MlsConversationDecryptMessage> for DecryptedMessage {
             .map(ProposalBundle::try_from)
             .collect::<CoreCryptoResult<Vec<_>>>()?;
 
-        let buffered_messages = if let Some(bm) = from.buffered_messages {
-            let bm = bm
-                .into_iter()
-                .map(TryInto::try_into)
-                .collect::<CoreCryptoResult<Vec<_>>>()?;
-            Some(bm)
-        } else {
-            None
-        };
+        let buffered_messages = from
+            .buffered_messages
+            .map(|bm| {
+                bm.into_iter()
+                    .map(TryInto::try_into)
+                    .collect::<CoreCryptoResult<Vec<_>>>()
+            })
+            .transpose()?;
 
         Ok(Self {
             message: from.app_msg,