mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-19 06:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(crypto): Remove wildcard enum variant import

Browse Source 
Signed-off-by: VerdeQuar <verdequar@gmail.com>
This commit is contained in:
VerdeQuar
2025-06-07 14:55:27 +02:00
committed by Damir Jelić
parent 1e938df90d
commit a75a2b4113
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/matrix-sdk-crypto/src/identities/manager.rs
View File

@@ -32,7 +32,10 @@ use tracing::{debug, enabled, info, instrument, trace, warn, Level};
use crate::{
error::OlmResult,
identities::{DeviceData, OtherUserIdentityData, OwnUserIdentityData, UserIdentityData},
olm::{InboundGroupSession, PrivateCrossSigningIdentity, SenderDataFinder, SenderDataType},
olm::{
sender_data_finder::SessionDeviceCheckError, InboundGroupSession,
PrivateCrossSigningIdentity, SenderDataFinder, SenderDataType,
},
store::{
caches::SequenceNumber, Changes, DeviceChanges, IdentityChanges, KeyQueryManager,
Result as StoreResult, Store, StoreCache, StoreCacheGuard, UserKeyQueryResult,
@@ -1124,8 +1127,6 @@ impl IdentityManager {
session: &mut InboundGroupSession,
device: &DeviceData,
) -> Result<(), CryptoStoreError> {
use crate::olm::sender_data_finder::SessionDeviceCheckError::*;
match SenderDataFinder::find_using_device_data(&self.store, device.clone(), session).await {
Ok(sender_data) => {
debug!(
@@ -1134,10 +1135,10 @@ impl IdentityManager {
);
session.sender_data = sender_data;
}
Err(CryptoStoreError(e)) => {
Err(SessionDeviceCheckError::CryptoStoreError(e)) => {
return Err(e);
}
Err(MismatchedIdentityKeys(e)) => {
Err(SessionDeviceCheckError::MismatchedIdentityKeys(e)) => {
warn!(
?session,
?device,