@@ -16,12 +16,12 @@ use std::{collections::BTreeSet, fmt, sync::Arc};
16
16
17
17
use as_variant:: as_variant;
18
18
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 } ;
21
21
use futures_core:: Stream ;
22
22
use imbl:: Vector ;
23
23
#[ cfg( test) ]
24
- use matrix_sdk:: { crypto:: OlmMachine , SendOutsideWasm } ;
24
+ use matrix_sdk:: crypto:: OlmMachine ;
25
25
use matrix_sdk:: {
26
26
deserialized_responses:: TimelineEvent ,
27
27
event_cache:: { RoomEventCache , RoomPaginationStatus } ,
@@ -580,10 +580,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
580
580
#[ cfg( test) ]
581
581
pub ( super ) async fn subscribe_raw (
582
582
& self ,
583
- ) -> (
584
- Vector < Arc < TimelineItem > > ,
585
- impl Stream < Item = VectorDiff < Arc < TimelineItem > > > + SendOutsideWasm ,
586
- ) {
583
+ ) -> ( Vector < Arc < TimelineItem > > , VectorSubscriberStream < Arc < TimelineItem > > ) {
587
584
self . state . read ( ) . await . items . subscribe ( ) . into_values_and_stream ( )
588
585
}
589
586
@@ -596,7 +593,7 @@ impl<P: RoomDataProvider, D: Decryptor> TimelineController<P, D> {
596
593
pub ( super ) async fn subscribe_filter_map < U , F > (
597
594
& self ,
598
595
f : F ,
599
- ) -> ( Vector < U > , impl Stream < Item = VectorDiff < U > > )
596
+ ) -> ( Vector < U > , FilterMap < VectorSubscriberStream < Arc < TimelineItem > > , F > )
600
597
where
601
598
U : Clone ,
602
599
F : Fn ( Arc < TimelineItem > ) -> Option < U > ,
0 commit comments