diff --git a/Cargo.lock b/Cargo.lock index 8da0f6533..807aa3b14 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1527,9 +1527,9 @@ dependencies = [ [[package]] name = "eyeball-im-util" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988b102aa389565187ccb138e51339c72258deb8af8e459180a582af40ca323b" +checksum = "fe7c462b9be62f7b7f85912db70ce3e8b5dc371d00b91869778a399518fd8098" dependencies = [ "eyeball-im", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index 844217e7a..42f7c5699 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,7 +30,7 @@ ctor = "0.2.0" dashmap = "5.2.0" eyeball = "0.7.0" eyeball-im = "0.2.0" -eyeball-im-util = "0.1.0" +eyeball-im-util = "0.2.1" futures-core = "0.3.28" futures-executor = "0.3.21" futures-util = { version = "0.3.26", default-features = false, features = ["alloc"] } diff --git a/crates/matrix-sdk/src/sliding_sync/list/mod.rs b/crates/matrix-sdk/src/sliding_sync/list/mod.rs index 1643a619f..919554a59 100644 --- a/crates/matrix-sdk/src/sliding_sync/list/mod.rs +++ b/crates/matrix-sdk/src/sliding_sync/list/mod.rs @@ -14,7 +14,7 @@ use std::{ pub use builder::*; use eyeball::unique::Observable; use eyeball_im::{ObservableVector, VectorDiff}; -use eyeball_im_util::{FilteredVectorSubscriber, VectorExt}; +use eyeball_im_util::{FilterVectorSubscriber, VectorExt}; pub(super) use frozen::FrozenSlidingSyncList; use futures_core::Stream; use imbl::Vector; @@ -160,14 +160,11 @@ impl SlidingSyncList { pub fn room_list_filtered_stream( &self, filter: F, - ) -> (Vector, FilteredVectorSubscriber) + ) -> (Vector, FilterVectorSubscriber) where F: Fn(&RoomListEntry) -> bool + Sync + Send + 'static, { - ObservableVector::subscribe_filtered( - &self.inner.room_list.read().unwrap(), - Box::new(filter), - ) + ObservableVector::subscribe_filter(&self.inner.room_list.read().unwrap(), Box::new(filter)) } /// Get the maximum number of rooms. See [`Self::maximum_number_of_rooms`]