From 2ce07652064b100a6fef59327ac07ad5ae4e2d5f Mon Sep 17 00:00:00 2001 From: Denis Kasak Date: Fri, 31 Jul 2020 14:21:00 +0200 Subject: [PATCH] Remove confusing type alias for AnyPossiblyRedactedSyncMessageEvent. There's already a SyncMessageEvent in Ruma which is something else. Let's prefer the full, unambiguous type. --- matrix_sdk_base/src/models/message.rs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/matrix_sdk_base/src/models/message.rs b/matrix_sdk_base/src/models/message.rs index fa47b899..fcaa5cc4 100644 --- a/matrix_sdk_base/src/models/message.rs +++ b/matrix_sdk_base/src/models/message.rs @@ -46,24 +46,22 @@ impl PossiblyRedactedExt for AnyPossiblyRedactedSyncMessageEvent { const MESSAGE_QUEUE_CAP: usize = 35; -pub type SyncMessageEvent = AnyPossiblyRedactedSyncMessageEvent; - /// A queue that holds the 35 most recent messages received from the server. #[derive(Clone, Debug, Default)] pub struct MessageQueue { pub(crate) msgs: Vec, } -/// A wrapper for `ruma_events::SyncMessageEvent` that allows implementation of -/// Eq, Ord and the Partial versions of the traits. +/// A wrapper for `ruma_events::AnyPossiblyRedactedSyncMessageEvent` that allows +/// implementation of Eq, Ord and the Partial versions of the traits. /// -/// `MessageWrapper` also implements Deref and DerefMut so accessing the events contents -/// are simplified. +/// `MessageWrapper` also implements Deref and DerefMut so accessing the events +/// contents are simplified. #[derive(Clone, Debug, Serialize)] -pub struct MessageWrapper(pub SyncMessageEvent); +pub struct MessageWrapper(pub AnyPossiblyRedactedSyncMessageEvent); impl Deref for MessageWrapper { - type Target = SyncMessageEvent; + type Target = AnyPossiblyRedactedSyncMessageEvent; fn deref(&self) -> &Self::Target { &self.0 @@ -118,7 +116,7 @@ impl MessageQueue { /// Inserts a `MessageEvent` into `MessageQueue`, sorted by by `origin_server_ts`. /// /// Removes the oldest element in the queue if there are more than 10 elements. - pub fn push(&mut self, msg: SyncMessageEvent) -> bool { + pub fn push(&mut self, msg: AnyPossiblyRedactedSyncMessageEvent) -> bool { // only push new messages into the queue if let Some(latest) = self.msgs.last() { if msg.origin_server_ts() < latest.origin_server_ts() && self.msgs.len() >= 10 { @@ -181,7 +179,7 @@ pub(crate) mod ser_deser { { let mut msgs = Vec::with_capacity(access.size_hint().unwrap_or(0)); - while let Some(msg) = access.next_element::()? { + while let Some(msg) = access.next_element::()? { msgs.push(MessageWrapper(msg)); }