From a75a2b41132ebcda658158d83b4cb1dd05f66528 Mon Sep 17 00:00:00 2001 From: VerdeQuar <35724192+VerdeQuar@users.noreply.github.com> Date: Sat, 7 Jun 2025 14:55:27 +0200 Subject: [PATCH] fix(crypto): Remove wildcard enum variant import Signed-off-by: VerdeQuar --- crates/matrix-sdk-crypto/src/identities/manager.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/matrix-sdk-crypto/src/identities/manager.rs b/crates/matrix-sdk-crypto/src/identities/manager.rs index 8883b80ab..e70f60ea9 100644 --- a/crates/matrix-sdk-crypto/src/identities/manager.rs +++ b/crates/matrix-sdk-crypto/src/identities/manager.rs @@ -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,