refactor(sdk): Remove SlidingSyncRoomInner::client.

This patch removes `SlidingSyncRoomInner::client` because, first
off, it's not `Send`, and second, it's useless. Nobody uses it, it's
basically dead code… annoying dead code… bad dead code!

Author: Hywan

crates/matrix-sdk/src/sliding_sync/cache.rs

@@ -248,10 +248,7 @@ pub(super) async fn restore_sliding_sync_state(
             restored_fields.rooms = frozen_rooms
                 .into_iter()
                 .map(|frozen_room| {
-                    (
-                        frozen_room.room_id.clone(),
-                        SlidingSyncRoom::from_frozen(frozen_room, client.clone()),
-                    )
+                    (frozen_room.room_id.clone(), SlidingSyncRoom::from_frozen(frozen_room))
                 })
                 .collect();
         }
@@ -355,11 +352,11 @@ mod tests {
 
                 rooms.insert(
                     room_id1.clone(),
-                    SlidingSyncRoom::new(client.clone(), room_id1.clone(), None, Vec::new()),
+                    SlidingSyncRoom::new(room_id1.clone(), None, Vec::new()),
                 );
                 rooms.insert(
                     room_id2.clone(),
-                    SlidingSyncRoom::new(client.clone(), room_id2.clone(), None, Vec::new()),
+                    SlidingSyncRoom::new(room_id2.clone(), None, Vec::new()),
                 );
             }
 

crates/matrix-sdk/src/sliding_sync/error.rs

@@ -1,7 +1,7 @@
 //! Sliding Sync errors.
 
+use matrix_sdk_common::executor::JoinError;
 use thiserror::Error;
-use tokio::task::JoinError;
 
 /// Internal representation of errors in Sliding Sync.
 #[derive(Error, Debug)]

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

@@ -359,7 +359,6 @@ impl SlidingSync {
                             rooms_map.insert(
                                 room_id.clone(),
                                 SlidingSyncRoom::new(
-                                    self.inner.client.clone(),
                                     room_id.clone(),
                                     room_data.prev_batch,
                                     timeline,
@@ -2313,7 +2312,6 @@ mod tests {
                 // it's not marked as initial in the response.
                 not_initial.to_owned(),
                 SlidingSyncRoom::new(
-                    client.clone(),
                     no_overlap.to_owned(),
                     None,
                     vec![event_a.clone(), event_b.clone()],
@@ -2323,7 +2321,6 @@ mod tests {
                 // This has no events overlapping with the response timeline, hence limited.
                 no_overlap.to_owned(),
                 SlidingSyncRoom::new(
-                    client.clone(),
                     no_overlap.to_owned(),
                     None,
                     vec![event_a.clone(), event_b.clone()],
@@ -2333,7 +2330,6 @@ mod tests {
                 // This has event_c in common with the response timeline.
                 partial_overlap.to_owned(),
                 SlidingSyncRoom::new(
-                    client.clone(),
                     partial_overlap.to_owned(),
                     None,
                     vec![event_a.clone(), event_b.clone(), event_c.clone()],
@@ -2343,7 +2339,6 @@ mod tests {
                 // This has all events in common with the response timeline.
                 complete_overlap.to_owned(),
                 SlidingSyncRoom::new(
-                    client.clone(),
                     partial_overlap.to_owned(),
                     None,
                     vec![event_c.clone(), event_d.clone()],
@@ -2354,7 +2349,6 @@ mod tests {
                 // limited.
                 no_remote_events.to_owned(),
                 SlidingSyncRoom::new(
-                    client.clone(),
                     no_remote_events.to_owned(),
                     None,
                     vec![event_c.clone(), event_d.clone()],
@@ -2364,14 +2358,13 @@ mod tests {
                 // We don't have events for this room locally, and even if the remote room contains
                 // some events, it's not a limited sync.
                 no_local_events.to_owned(),
-                SlidingSyncRoom::new(client.clone(), no_local_events.to_owned(), None, vec![]),
+                SlidingSyncRoom::new(no_local_events.to_owned(), None, vec![]),
             ),
             (
                 // Already limited, but would be marked limited if the flag wasn't ignored (same as
                 // partial overlap).
                 already_limited.to_owned(),
                 SlidingSyncRoom::new(
-                    client,
                     already_limited.to_owned(),
                     None,
                     vec![event_a, event_b, event_c.clone()],

crates/matrix-sdk/src/sliding_sync/room.rs

@@ -8,8 +8,6 @@ use matrix_sdk_base::{deserialized_responses::SyncTimelineEvent, sliding_sync::h
 use ruma::{OwnedRoomId, RoomId};
 use serde::{Deserialize, Serialize};
 
-use crate::Client;
-
 /// The state of a [`SlidingSyncRoom`].
 #[derive(Copy, Clone, Debug, Default, PartialEq)]
 pub enum SlidingSyncRoomState {
@@ -40,14 +38,12 @@ pub struct SlidingSyncRoom {
 impl SlidingSyncRoom {
     /// Create a new `SlidingSyncRoom`.
     pub fn new(
-        client: Client,
         room_id: OwnedRoomId,
         prev_batch: Option<String>,
         timeline: Vec<SyncTimelineEvent>,
     ) -> Self {
         Self {
             inner: Arc::new(SlidingSyncRoomInner {
-                client,
                 room_id,
                 state: RwLock::new(SlidingSyncRoomState::NotLoaded),
                 prev_batch: RwLock::new(prev_batch),
@@ -74,11 +70,6 @@ impl SlidingSyncRoom {
         self.inner.timeline_queue.read().unwrap().clone()
     }
 
-    /// Get a clone of the associated client.
-    pub fn client(&self) -> Client {
-        self.inner.client.clone()
-    }
-
     pub(super) fn update(
         &mut self,
         room_data: http::response::Room,
@@ -129,12 +120,11 @@ impl SlidingSyncRoom {
         *state = SlidingSyncRoomState::Loaded;
     }
 
-    pub(super) fn from_frozen(frozen_room: FrozenSlidingSyncRoom, client: Client) -> Self {
+    pub(super) fn from_frozen(frozen_room: FrozenSlidingSyncRoom) -> Self {
         let FrozenSlidingSyncRoom { room_id, prev_batch, timeline_queue } = frozen_room;
 
         Self {
             inner: Arc::new(SlidingSyncRoomInner {
-                client,
                 room_id,
                 prev_batch: RwLock::new(prev_batch),
                 state: RwLock::new(SlidingSyncRoomState::Preloaded),
@@ -157,9 +147,6 @@ impl SlidingSyncRoom {
 
 #[derive(Debug)]
 struct SlidingSyncRoomInner {
-    /// The client, used to fetch [`Room`][crate::Room].
-    client: Client,
-
     /// The room ID.
     room_id: OwnedRoomId,
 
@@ -258,9 +245,8 @@ mod tests {
         timeline: Vec<SyncTimelineEvent>,
     ) -> SlidingSyncRoom {
         let server = MockServer::start().await;
-        let client = logged_in_client(Some(server.uri())).await;
 
-        SlidingSyncRoom::new(client, room_id.to_owned(), inner.prev_batch, timeline)
+        SlidingSyncRoom::new(room_id.to_owned(), inner.prev_batch, timeline)
     }
 
     #[async_test]

crates/matrix-sdk/src/sliding_sync/utils.rs

@@ -23,7 +23,7 @@ impl<T> Drop for AbortOnDrop<T> {
     }
 }
 
-impl<T> Future for AbortOnDrop<T> {
+impl<T: 'static> Future for AbortOnDrop<T> {
     type Output = Result<T, JoinError>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {