@@ -207,7 +207,7 @@ impl RoomEventCache {
207207 let previous_subscriber_count = subscriber_count. fetch_add ( 1 , Ordering :: SeqCst ) ;
208208 trace ! ( "added a room event cache subscriber; new count: {}" , previous_subscriber_count + 1 ) ;
209209
210- let recv = self . inner . sender . subscribe ( ) ;
210+ let recv = self . inner . update_sender . subscribe ( ) ;
211211 let subscriber = RoomEventCacheSubscriber {
212212 recv,
213213 room_id : self . inner . room_id . clone ( ) ,
@@ -383,7 +383,7 @@ impl RoomEventCache {
383383 let updates_as_vector_diffs = self . inner . state . write ( ) . await ?. reset ( ) . await ?;
384384
385385 // Notify observers about the update.
386- let _ = self . inner . sender . send ( RoomEventCacheUpdate :: UpdateTimelineEvents {
386+ let _ = self . inner . update_sender . send ( RoomEventCacheUpdate :: UpdateTimelineEvents {
387387 diffs : updates_as_vector_diffs,
388388 origin : EventsOrigin :: Cache ,
389389 } ) ;
@@ -428,7 +428,7 @@ pub(super) struct RoomEventCacheInner {
428428 pub weak_room : WeakRoom ,
429429
430430 /// Sender part for subscribers to this room.
431- pub sender : Sender < RoomEventCacheUpdate > ,
431+ pub update_sender : Sender < RoomEventCacheUpdate > ,
432432
433433 /// State for this room's event cache.
434434 pub state : RoomEventCacheStateLock ,
@@ -463,13 +463,14 @@ impl RoomEventCacheInner {
463463 auto_shrink_sender : mpsc:: Sender < AutoShrinkChannelPayload > ,
464464 generic_update_sender : Sender < RoomEventCacheGenericUpdate > ,
465465 ) -> Self {
466- let sender = Sender :: new ( 32 ) ;
466+ let update_sender = Sender :: new ( 32 ) ;
467467 let weak_room = WeakRoom :: new ( client, room_id) ;
468+
468469 Self {
469470 room_id : weak_room. room_id ( ) . to_owned ( ) ,
470471 weak_room,
471472 state,
472- sender ,
473+ update_sender ,
473474 pagination_batch_token_notifier : Default :: default ( ) ,
474475 auto_shrink_sender,
475476 pagination_status,
@@ -498,7 +499,7 @@ impl RoomEventCacheInner {
498499 handled_read_marker = true ;
499500
500501 // Propagate to observers. (We ignore the error if there aren't any.)
501- let _ = self . sender . send ( RoomEventCacheUpdate :: MoveReadMarkerTo {
502+ let _ = self . update_sender . send ( RoomEventCacheUpdate :: MoveReadMarkerTo {
502503 event_id : ev. content . event_id ,
503504 } ) ;
504505 }
@@ -567,7 +568,7 @@ impl RoomEventCacheInner {
567568 // The order matters here: first send the timeline event diffs, then only the
568569 // related events (read receipts, etc.).
569570 if !timeline_event_diffs. is_empty ( ) {
570- let _ = self . sender . send ( RoomEventCacheUpdate :: UpdateTimelineEvents {
571+ let _ = self . update_sender . send ( RoomEventCacheUpdate :: UpdateTimelineEvents {
571572 diffs : timeline_event_diffs,
572573 origin : EventsOrigin :: Sync ,
573574 } ) ;
@@ -579,12 +580,13 @@ impl RoomEventCacheInner {
579580
580581 if !ephemeral_events. is_empty ( ) {
581582 let _ = self
582- . sender
583+ . update_sender
583584 . send ( RoomEventCacheUpdate :: AddEphemeralEvents { events : ephemeral_events } ) ;
584585 }
585586
586587 if !ambiguity_changes. is_empty ( ) {
587- let _ = self . sender . send ( RoomEventCacheUpdate :: UpdateMembers { ambiguity_changes } ) ;
588+ let _ =
589+ self . update_sender . send ( RoomEventCacheUpdate :: UpdateMembers { ambiguity_changes } ) ;
588590 }
589591
590592 Ok ( ( ) )
0 commit comments