char
/
matrix-rust-sdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Fix a clippy warning

master
Damir Jelić 2021-03-11 20:06:51 +01:00
parent 593b5e55cb
commit 7465574bdc
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
matrix_sdk_crypto/src/store/sled.rs
View File

@ -266,17 +266,14 @@ impl SledStore {
.get_account_info() .get_account_info()
.ok_or(CryptoStoreError::AccountUnset)?; .ok_or(CryptoStoreError::AccountUnset)?;
let device_id: Arc<DeviceIdBox> = account_info.device_id.clone();
let identity_keys = account_info.identity_keys.clone();
self.outbound_group_sessions self.outbound_group_sessions
.get(room_id.encode())? .get(room_id.encode())?
.map(|p| serde_json::from_slice(&p).map_err(CryptoStoreError::Serialization)) .map(|p| serde_json::from_slice(&p).map_err(CryptoStoreError::Serialization))
.transpose()? .transpose()?
.map(|p| { .map(|p| {
OutboundGroupSession::from_pickle( OutboundGroupSession::from_pickle(
device_id, account_info.device_id,
identity_keys, account_info.identity_keys,
p, p,
self.get_pickle_mode(), self.get_pickle_mode(),
) )
@ -484,10 +481,6 @@ impl CryptoStore for SledStore {
.get_account_info() .get_account_info()
.ok_or(CryptoStoreError::AccountUnset)?; .ok_or(CryptoStoreError::AccountUnset)?;
let user_id: Arc<UserId> = account_info.user_id.clone();
let device_id: Arc<DeviceIdBox> = account_info.device_id.clone();
let identity_keys = account_info.identity_keys.clone();
if self.session_cache.get(sender_key).is_none() { if self.session_cache.get(sender_key).is_none() {
let sessions: Result<Vec<Session>> = self let sessions: Result<Vec<Session>> = self
.sessions .sessions
@ -495,9 +488,9 @@ impl CryptoStore for SledStore {
.map(|s| serde_json::from_slice(&s?.1).map_err(CryptoStoreError::Serialization)) .map(|s| serde_json::from_slice(&s?.1).map_err(CryptoStoreError::Serialization))
.map(|p| { .map(|p| {
Session::from_pickle( Session::from_pickle(
user_id.clone(), account_info.user_id.clone(),
device_id.clone(), account_info.device_id.clone(),
identity_keys.clone(), account_info.identity_keys.clone(),
p?, p?,
self.get_pickle_mode(), self.get_pickle_mode(),
) )