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

chore(crypto): Don't use a JsOption needlessly.

Browse Source
This commit is contained in:
Damir Jelić
2023-01-13 11:56:00 +01:00
parent 1f34a016e5
commit c13cb4957e
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/matrix-sdk-crypto/src/machine.rs
View File

@@ -39,8 +39,8 @@ use ruma::{
MessageLikeEventContent,
},
serde::Raw,
DeviceId, DeviceKeyAlgorithm, JsOption, OwnedDeviceId, OwnedDeviceKeyId, OwnedTransactionId,
OwnedUserId, RoomId, TransactionId, UInt, UserId,
DeviceId, DeviceKeyAlgorithm, OwnedDeviceId, OwnedDeviceKeyId, OwnedTransactionId, OwnedUserId,
RoomId, TransactionId, UInt, UserId,
};
use serde_json::{value::to_raw_value, Value};
use tracing::{debug, error, field::display, info, instrument, trace, warn};
@@ -862,7 +862,7 @@ impl OlmMachine {
#[derive(Deserialize)]
struct ContentStub<'a> {
#[serde(borrow, rename = "org.matrix.msgid")]
message_id: JsOption<&'a str>,
message_id: Option<&'a str>,
}
#[derive(Deserialize)]
@@ -871,10 +871,8 @@ impl OlmMachine {
content: ContentStub<'a>,
}
let message_id = event
.deserialize_as::<ToDeviceStub<'_>>()
.ok()
.and_then(|t| t.content.message_id.into_option());
let message_id =
event.deserialize_as::<ToDeviceStub<'_>>().ok().and_then(|t| t.content.message_id);
tracing::Span::current().record("message_id", message_id);
}