Skip to content

Commit f9864b7

Browse files
jplattepoljar
authored andcommitted
refactor(ui): Use named return types over RPITs
… in private methods.
1 parent d23eae2 commit f9864b7

File tree

1 file changed

+5
-8
lines changed
  • crates/matrix-sdk-ui/src/timeline/controller

1 file changed

+5
-8
lines changed

crates/matrix-sdk-ui/src/timeline/controller/mod.rs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ use std::{collections::BTreeSet, fmt, sync::Arc};
1616

1717
use as_variant::as_variant;
1818
use decryption_retry_task::DecryptionRetryTask;
19-
use eyeball_im::VectorDiff;
20-
use eyeball_im_util::vector::VectorObserverExt;
19+
use eyeball_im::{VectorDiff, VectorSubscriberStream};
20+
use eyeball_im_util::vector::{FilterMap, VectorObserverExt};
2121
use futures_core::Stream;
2222
use imbl::Vector;
2323
#[cfg(test)]
24-
use matrix_sdk::{crypto::OlmMachine, SendOutsideWasm};
24+
use matrix_sdk::crypto::OlmMachine;
2525
use matrix_sdk::{
2626
deserialized_responses::TimelineEvent,
2727
event_cache::{RoomEventCache, RoomPaginationStatus},
@@ -580,10 +580,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
580580
#[cfg(test)]
581581
pub(super) async fn subscribe_raw(
582582
&self,
583-
) -> (
584-
Vector<Arc<TimelineItem>>,
585-
impl Stream<Item = VectorDiff<Arc<TimelineItem>>> + SendOutsideWasm,
586-
) {
583+
) -> (Vector<Arc<TimelineItem>>, VectorSubscriberStream<Arc<TimelineItem>>) {
587584
self.state.read().await.items.subscribe().into_values_and_stream()
588585
}
589586

@@ -596,7 +593,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
596593
pub(super) async fn subscribe_filter_map<U, F>(
597594
&self,
598595
f: F,
599-
) -> (Vector<U>, impl Stream<Item = VectorDiff<U>>)
596+
) -> (Vector<U>, FilterMap<VectorSubscriberStream<Arc<TimelineItem>>, F>)
600597
where
601598
U: Clone,
602599
F: Fn(Arc<TimelineItem>) -> Option<U>,

0 commit comments

Comments
 (0)