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

Merge branch 'perf-1'

master
Damir Jelić 2020-07-11 10:33:30 +02:00
parent df2bcf6f1f 3ee06be87b
commit eb19c19e36
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
matrix_sdk_base/src/models/message.rs
View File

@ -32,9 +32,9 @@ pub struct MessageWrapper(pub SyncMessageEvent);
impl MessageWrapper { impl MessageWrapper {
pub fn clone_into_any_content(event: &AnyMessageEventStub) -> SyncMessageEvent { pub fn clone_into_any_content(event: &AnyMessageEventStub) -> SyncMessageEvent {
MessageEventStub { MessageEventStub {
content: event.content().clone(), content: event.content(),
sender: event.sender().clone(), sender: event.sender().clone(),
origin_server_ts: event.origin_server_ts().clone(), origin_server_ts: *event.origin_server_ts(),
event_id: event.event_id().clone(), event_id: event.event_id().clone(),
unsigned: event.unsigned().clone(), unsigned: event.unsigned().clone(),
} }
@ -139,20 +139,38 @@ impl IntoIterator for MessageQueue {
} }
pub(crate) mod ser_deser { pub(crate) mod ser_deser {
use std::fmt;
use super::*; use super::*;
struct MessageQueueDeserializer;
impl<'de> de::Visitor<'de> for MessageQueueDeserializer {
type Value = MessageQueue;
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
formatter.write_str("an array of message events")
}
fn visit_seq<S>(self, mut access: S) -> Result<Self::Value, S::Error>
where
S: de::SeqAccess<'de>,
{
let mut msgs = Vec::with_capacity(access.size_hint().unwrap_or(0));
while let Some(msg) = access.next_element::<SyncMessageEvent>()? {
msgs.push(MessageWrapper(msg));
}
Ok(MessageQueue { msgs })
}
}
pub fn deserialize<'de, D>(deserializer: D) -> Result<MessageQueue, D::Error> pub fn deserialize<'de, D>(deserializer: D) -> Result<MessageQueue, D::Error>
where where
D: de::Deserializer<'de>, D: de::Deserializer<'de>,
{ {
let messages: Vec<SyncMessageEvent> = de::Deserialize::deserialize(deserializer)?; deserializer.deserialize_seq(MessageQueueDeserializer)
let mut msgs = vec![];
for msg in messages {
msgs.push(MessageWrapper(msg));
}
Ok(MessageQueue { msgs })
} }
pub fn serialize<S>(msgs: &MessageQueue, serializer: S) -> Result<S::Ok, S::Error> pub fn serialize<S>(msgs: &MessageQueue, serializer: S) -> Result<S::Ok, S::Error>