chore(sdk): Move RoomEventCache in caches/room/mod.rs.

crates/matrix-sdk/src/event_cache/caches/room/pagination.rs

@@ -24,15 +24,19 @@ use eyeball_im::VectorDiff;
 use matrix_sdk_base::event_cache::Event;
 use ruma::api::Direction;
 
-use super::super::super::{
-    EventCacheError, EventsOrigin, Result, RoomEventCacheGenericUpdate, RoomEventCacheUpdate,
-    TimelineVectorDiffs,
-    caches::pagination::{
-        BackPaginationOutcome, LoadMoreEventsBackwardsOutcome, PaginatedCache, Pagination,
-    },
-    room::RoomEventCacheInner,
-};
 pub use super::super::pagination::PaginationStatus;
+use super::{
+    super::{
+        super::{
+            EventCacheError, EventsOrigin, Result, RoomEventCacheGenericUpdate,
+            RoomEventCacheUpdate, TimelineVectorDiffs,
+        },
+        pagination::{
+            BackPaginationOutcome, LoadMoreEventsBackwardsOutcome, PaginatedCache, Pagination,
+        },
+    },
+    RoomEventCacheInner,
+};
 use crate::room::MessagesOptions;
 
 /// An API object to run pagination queries on a [`RoomEventCache`].

crates/matrix-sdk/src/event_cache/caches/thread/pagination.rs

@@ -19,14 +19,16 @@ use eyeball_im::VectorDiff;
 use matrix_sdk_base::event_cache::Event;
 use ruma::{OwnedEventId, api::Direction};
 
-use super::super::super::{
-    EventCacheError, Result,
-    caches::pagination::{
-        BackPaginationOutcome, LoadMoreEventsBackwardsOutcome, PaginatedCache, Pagination,
+pub use super::super::pagination::PaginationStatus;
+use super::super::{
+    super::{
+        EventCacheError, Result,
+        caches::pagination::{
+            BackPaginationOutcome, LoadMoreEventsBackwardsOutcome, PaginatedCache, Pagination,
+        },
     },
     room::RoomEventCacheInner,
 };
-pub use super::super::pagination::PaginationStatus;
 use crate::room::{IncludeRelations, RelationsOptions};
 
 /// Intermediate type because the `ThreadEventCache` state is currently owned by

crates/matrix-sdk/src/event_cache/mod.rs

@@ -67,7 +67,6 @@ use tracing::{Instrument as _, Span, debug, error, info, info_span, instrument,
 use crate::{
     Client,
     client::{ClientInner, WeakClient},
-    event_cache::room::RoomEventCacheStateLock,
     send_queue::{LocalEchoContent, RoomSendQueueUpdate, SendQueueUpdate},
 };
 
@@ -76,16 +75,15 @@ mod deduplicator;
 mod persistence;
 #[cfg(feature = "e2e-encryption")]
 mod redecryptor;
-mod room;
 
+use caches::room::RoomEventCacheStateLock;
 pub use caches::{
     TimelineVectorDiffs,
     pagination::{BackPaginationOutcome, PaginationStatus},
-    room::pagination::RoomPagination,
+    room::{RoomEventCache, RoomEventCacheSubscriber, pagination::RoomPagination},
 };
 #[cfg(feature = "e2e-encryption")]
 pub use redecryptor::{DecryptionRetryRequest, RedecryptorReport};
-pub use room::{RoomEventCache, RoomEventCacheSubscriber};
 
 /// An error observed in the [`EventCache`].
 #[derive(thiserror::Error, Debug)]

crates/matrix-sdk/src/event_cache/redecryptor.rs

@@ -154,16 +154,12 @@ use tracing::{info, instrument, trace, warn};
 
 #[cfg(doc)]
 use super::RoomEventCache;
-use super::{EventCache, EventCacheError, EventCacheInner, EventsOrigin, RoomEventCacheUpdate};
-use crate::{
-    Client, Result, Room,
-    encryption::backups::BackupState,
-    event_cache::{
-        RoomEventCacheGenericUpdate, RoomEventCacheLinkedChunkUpdate, TimelineVectorDiffs,
-        room::PostProcessingOrigin,
-    },
-    room::PushContext,
+use super::{
+    EventCache, EventCacheError, EventCacheInner, EventsOrigin, RoomEventCacheGenericUpdate,
+    RoomEventCacheLinkedChunkUpdate, RoomEventCacheUpdate, TimelineVectorDiffs,
+    caches::room::PostProcessingOrigin,
 };
+use crate::{Client, Result, Room, encryption::backups::BackupState, room::PushContext};
 
 type SessionId<'a> = &'a str;
 type OwnedSessionId = String;