From 0f2ada09582c841e0b2a7aa3b0815b70c33ebc90 Mon Sep 17 00:00:00 2001 From: Ivan Enderlin Date: Mon, 9 Dec 2024 16:37:07 +0100 Subject: [PATCH] refactor(ui): Rename `ObservableItems::clone` to `clone_items`. --- .../src/timeline/controller/mod.rs | 6 +++--- .../timeline/controller/observable_items.rs | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/crates/matrix-sdk-ui/src/timeline/controller/mod.rs b/crates/matrix-sdk-ui/src/timeline/controller/mod.rs index 9a22bb917..5d8257247 100644 --- a/crates/matrix-sdk-ui/src/timeline/controller/mod.rs +++ b/crates/matrix-sdk-ui/src/timeline/controller/mod.rs @@ -467,7 +467,7 @@ impl TimelineController

{ /// /// Cheap because `im::Vector` is cheap to clone. pub(super) async fn items(&self) -> Vector> { - self.state.read().await.items.clone() + self.state.read().await.items.clone_items() } pub(super) async fn subscribe( @@ -475,7 +475,7 @@ impl TimelineController

{ ) -> (Vector>, impl Stream>> + Send) { trace!("Creating timeline items signal"); let state = self.state.read().await; - (state.items.clone(), state.items.subscribe().into_stream()) + (state.items.clone_items(), state.items.subscribe().into_stream()) } pub(super) async fn subscribe_batched( @@ -483,7 +483,7 @@ impl TimelineController

{ ) -> (Vector>, impl Stream>>>) { trace!("Creating timeline items signal"); let state = self.state.read().await; - (state.items.clone(), state.items.subscribe().into_batched_stream()) + (state.items.clone_items(), state.items.subscribe().into_batched_stream()) } pub(super) async fn subscribe_filter_map( diff --git a/crates/matrix-sdk-ui/src/timeline/controller/observable_items.rs b/crates/matrix-sdk-ui/src/timeline/controller/observable_items.rs index 74dac26db..a1b6697ae 100644 --- a/crates/matrix-sdk-ui/src/timeline/controller/observable_items.rs +++ b/crates/matrix-sdk-ui/src/timeline/controller/observable_items.rs @@ -82,7 +82,7 @@ impl ObservableItems { /// Get a clone of all timeline items. /// /// Note that it doesn't clone `Self`, only the inner timeline items. - pub fn clone(&self) -> Vector> { + pub fn clone_items(&self) -> Vector> { self.items.clone() } @@ -498,7 +498,7 @@ mod observable_items_tests { } #[test] - fn test_clone() { + fn test_clone_items() { let mut items = ObservableItems::new(); let mut transaction = items.transaction(); @@ -506,10 +506,10 @@ mod observable_items_tests { transaction.push_back(item("$ev1"), Some(1)); transaction.commit(); - let events = items.clone(); - assert_eq!(events.len(), 2); - assert_event_id!(events[0], "$ev0"); - assert_event_id!(events[1], "$ev1"); + let items = items.clone_items(); + assert_eq!(items.len(), 2); + assert_event_id!(items[0], "$ev0"); + assert_event_id!(items[1], "$ev1"); } #[test] @@ -524,9 +524,9 @@ mod observable_items_tests { // That's time to replace it! items.replace(0, item("$ev1")); - let events = items.clone(); - assert_eq!(events.len(), 1); - assert_event_id!(events[0], "$ev1"); + let items = items.clone_items(); + assert_eq!(items.len(), 1); + assert_event_id!(items[0], "$ev1"); } #[test]