From 68c9e5e98db2ffae41b9edf0eea61e29b03f0a3f Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Mon, 22 Jan 2024 15:48:52 +0100 Subject: [PATCH] timeline: inline `find_read_marker` that's used only once --- crates/matrix-sdk-ui/src/timeline/inner/state.rs | 7 ++----- crates/matrix-sdk-ui/src/timeline/util.rs | 4 ---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/crates/matrix-sdk-ui/src/timeline/inner/state.rs b/crates/matrix-sdk-ui/src/timeline/inner/state.rs index b79914235..b10b47e78 100644 --- a/crates/matrix-sdk-ui/src/timeline/inner/state.rs +++ b/crates/matrix-sdk-ui/src/timeline/inner/state.rs @@ -52,10 +52,7 @@ use crate::{ reactions::{ReactionToggleResult, Reactions}, read_receipts::ReadReceipts, traits::RoomDataProvider, - util::{ - find_read_marker, rfind_event_by_id, rfind_event_item, timestamp_to_date, - RelativePosition, - }, + util::{rfind_event_by_id, rfind_event_item, timestamp_to_date, RelativePosition}, AnnotationKey, Error as TimelineError, Profile, ReactionSenderData, TimelineItem, TimelineItemKind, VirtualTimelineItem, }, @@ -891,7 +888,7 @@ impl TimelineInnerMetadata { let Some(fully_read_event) = &self.fully_read_event else { return }; trace!(?fully_read_event, "Updating read marker"); - let read_marker_idx = find_read_marker(items); + let read_marker_idx = items.iter().rposition(|item| item.is_read_marker()); let fully_read_event_idx = rfind_event_by_id(items, fully_read_event).map(|(idx, _)| idx); match (read_marker_idx, fully_read_event_idx) { diff --git a/crates/matrix-sdk-ui/src/timeline/util.rs b/crates/matrix-sdk-ui/src/timeline/util.rs index 10f3b2e6f..9a9acb904 100644 --- a/crates/matrix-sdk-ui/src/timeline/util.rs +++ b/crates/matrix-sdk-ui/src/timeline/util.rs @@ -67,10 +67,6 @@ pub(super) fn rfind_event_by_id<'a>( rfind_event_item(items, |it| it.event_id() == Some(event_id)) } -pub(super) fn find_read_marker(items: &Vector>) -> Option { - items.iter().rposition(|item| item.is_read_marker()) -} - /// Result of comparing events position in the timeline. #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub(super) enum RelativePosition {