Some WASM-related refactors

crates/matrix-sdk-ui/src/timeline/futures.rs

@@ -1,6 +1,6 @@
 use std::future::IntoFuture;
 
-use eyeball::{SharedObservable, Subscriber};
+use eyeball::SharedObservable;
 use matrix_sdk::{attachment::AttachmentConfig, TransmissionProgress};
 use matrix_sdk_base::boxed_into_future;
 use mime::Mime;
@@ -48,10 +48,9 @@ impl<'a> SendAttachment<'a> {
         Self { use_send_queue: true, ..self }
     }
 
-    /// Get a subscriber to observe the progress of sending the request
-    /// body.
+    /// Get a subscriber to observe the progress of sending the request body.
     #[cfg(not(target_arch = "wasm32"))]
-    pub fn subscribe_to_send_progress(&self) -> Subscriber<TransmissionProgress> {
+    pub fn subscribe_to_send_progress(&self) -> eyeball::Subscriber<TransmissionProgress> {
         self.send_progress.subscribe()
     }
 }

crates/matrix-sdk-ui/src/timeline/traits.rs

@@ -71,7 +71,7 @@ impl RoomExt for Room {
 }
 
 pub(super) trait RoomDataProvider:
-    Clone + Send + Sync + 'static + PaginableRoom + PinnedEventsRoom
+    Clone + PaginableRoom + PinnedEventsRoom + 'static
 {
     fn own_user_id(&self) -> &UserId;
     fn room_version(&self) -> RoomVersionId;

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

@@ -23,13 +23,9 @@ use std::{
 };
 
 use eyeball::{SharedObservable, Subscriber};
-#[cfg(not(target_arch = "wasm32"))]
-use eyeball_im::VectorDiff;
+use eyeball_im::{Vector, VectorDiff};
 use futures_core::Stream;
-#[cfg(not(target_arch = "wasm32"))]
 use futures_util::StreamExt;
-#[cfg(not(target_arch = "wasm32"))]
-use imbl::Vector;
 #[cfg(feature = "e2e-encryption")]
 use matrix_sdk_base::crypto::store::LockableCryptoStore;
 use matrix_sdk_base::{
@@ -1098,7 +1094,6 @@ impl Client {
     }
 
     /// Get a stream of all the rooms, in addition to the existing rooms.
-    #[cfg(not(target_arch = "wasm32"))]
     pub fn rooms_stream(&self) -> (Vector<Room>, impl Stream<Item = Vec<VectorDiff<Room>>> + '_) {
         let (rooms, stream) = self.base_client().rooms_stream();