From 247ec1dcd23e706238890f0041330d5bcfeaebff Mon Sep 17 00:00:00 2001 From: Benjamin Bouvier Date: Thu, 14 Aug 2025 08:43:54 +0200 Subject: [PATCH] refactor(event cache): shorten the name of `room_event_cache_generic_update` We're in the inner workings of the event cache, so the prefix is redundant, in the ambient context. --- crates/matrix-sdk/src/event_cache/mod.rs | 12 ++++++------ crates/matrix-sdk/src/event_cache/room/mod.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/crates/matrix-sdk/src/event_cache/mod.rs b/crates/matrix-sdk/src/event_cache/mod.rs index e392c98db..3d80268d6 100644 --- a/crates/matrix-sdk/src/event_cache/mod.rs +++ b/crates/matrix-sdk/src/event_cache/mod.rs @@ -167,7 +167,7 @@ impl fmt::Debug for EventCache { impl EventCache { /// Create a new [`EventCache`] for the given client. pub(crate) fn new(client: WeakClient, event_cache_store: EventCacheStoreLock) -> Self { - let (room_event_cache_generic_update_sender, _) = channel(32); + let (generic_update_sender, _) = channel(32); Self { inner: Arc::new(EventCacheInner { @@ -177,7 +177,7 @@ impl EventCache { by_room: Default::default(), drop_handles: Default::default(), auto_shrink_sender: Default::default(), - room_event_cache_generic_update_sender, + generic_update_sender, }), } } @@ -389,7 +389,7 @@ impl EventCache { /// without side-effects, this method is recommended. Also, dropping the /// receiver of this channel will not trigger any side-effect. pub fn subscribe_to_room_generic_updates(&self) -> Receiver { - self.inner.room_event_cache_generic_update_sender.subscribe() + self.inner.generic_update_sender.subscribe() } } @@ -427,7 +427,7 @@ struct EventCacheInner { /// /// See doc comment of [`RoomEventCacheGenericUpdate`] and /// [`EventCache::subscribe_to_room_generic_updates`]. - room_event_cache_generic_update_sender: Sender, + generic_update_sender: Sender, } type AutoShrinkChannelPayload = OwnedRoomId; @@ -612,7 +612,7 @@ impl EventCacheInner { pagination_status, room_id.to_owned(), auto_shrink_sender, - self.room_event_cache_generic_update_sender.clone(), + self.generic_update_sender.clone(), ); by_room_guard.insert(room_id.to_owned(), room_event_cache.clone()); @@ -621,7 +621,7 @@ impl EventCacheInner { // emit a generic update. if timeline_is_not_empty { let _ = self - .room_event_cache_generic_update_sender + .generic_update_sender .send(RoomEventCacheGenericUpdate { room_id: room_id.to_owned() }); } diff --git a/crates/matrix-sdk/src/event_cache/room/mod.rs b/crates/matrix-sdk/src/event_cache/room/mod.rs index e36ca2afe..113dc5b6d 100644 --- a/crates/matrix-sdk/src/event_cache/room/mod.rs +++ b/crates/matrix-sdk/src/event_cache/room/mod.rs @@ -431,7 +431,7 @@ pub(super) struct RoomEventCacheInner { /// more details. auto_shrink_sender: mpsc::Sender, - /// A clone of [`EventCacheInner::room_event_cache_generic_update_sender`]. + /// A clone of [`EventCacheInner::generic_update_sender`]. /// /// Whilst `EventCacheInner` handles the generic updates from the sync, or /// the storage, it doesn't handle the update from pagination. Having a