From 40084aa94c6e10d584e13e3e2a4069469dbd0a92 Mon Sep 17 00:00:00 2001
From: MrSubidubi <finn@zed.dev>
Date: Wed, 13 Aug 2025 15:13:18 +0200
Subject: [PATCH] Even less clones

---
 crates/agent_ui/src/acp/thread_view.rs       | 2 +-
 crates/agent_ui/src/active_thread.rs         | 2 +-
 crates/extensions_ui/src/extensions_ui.rs    | 2 +-
 crates/recent_projects/src/remote_servers.rs | 9 +--------
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/crates/agent_ui/src/acp/thread_view.rs b/crates/agent_ui/src/acp/thread_view.rs
index b001f20238..e7e1371a60 100644
--- a/crates/agent_ui/src/acp/thread_view.rs
+++ b/crates/agent_ui/src/acp/thread_view.rs
@@ -197,7 +197,7 @@ impl AcpThreadView {
             notification_subscriptions: HashMap::default(),
             diff_editors: Default::default(),
             terminal_views: Default::default(),
-            list_state: list_state.clone(),
+            list_state,
             last_error: None,
             auth_task: None,
             expanded_tool_calls: HashSet::default(),
diff --git a/crates/agent_ui/src/active_thread.rs b/crates/agent_ui/src/active_thread.rs
index 41d1314b00..646235a24a 100644
--- a/crates/agent_ui/src/active_thread.rs
+++ b/crates/agent_ui/src/active_thread.rs
@@ -799,7 +799,7 @@ impl ActiveThread {
             expanded_tool_uses: HashMap::default(),
             expanded_thinking_segments: HashMap::default(),
             expanded_code_blocks: HashMap::default(),
-            list_state: list_state.clone(),
+            list_state,
             editing_message: None,
             last_error: None,
             copied_code_block_ids: HashSet::default(),
diff --git a/crates/extensions_ui/src/extensions_ui.rs b/crates/extensions_ui/src/extensions_ui.rs
index dbc5d29d20..ee671236c6 100644
--- a/crates/extensions_ui/src/extensions_ui.rs
+++ b/crates/extensions_ui/src/extensions_ui.rs
@@ -337,7 +337,7 @@ impl ExtensionsPage {
 
             let mut this = Self {
                 workspace: workspace.weak_handle(),
-                list: scroll_handle.clone(),
+                list: scroll_handle,
                 is_fetching_extensions: false,
                 filter: ExtensionFilter::All,
                 dev_extension_entries: Vec::new(),
diff --git a/crates/recent_projects/src/remote_servers.rs b/crates/recent_projects/src/remote_servers.rs
index d9c89992e4..cd65f8fa6a 100644
--- a/crates/recent_projects/src/remote_servers.rs
+++ b/crates/recent_projects/src/remote_servers.rs
@@ -36,8 +36,6 @@ use settings::watch_config_file;
 use smol::stream::StreamExt as _;
 use ui::Navigable;
 use ui::NavigableEntry;
-use ui::ScrollAxes;
-use ui::Scrollbars;
 use ui::WithScrollbar;
 use ui::{
     IconButtonShape, List, ListItem, ListSeparator, Modal, ModalHeader, Section, Tooltip,
@@ -1581,12 +1579,7 @@ impl RemoteServerProjects {
                             )
                             .size_full(),
                         )
-                        .custom_scrollbars(
-                            Scrollbars::new(ScrollAxes::Vertical)
-                                .tracked_scroll_handle(state.scroll_handle),
-                            window,
-                            cx,
-                        ),
+                        .vertical_scrollbar_for(state.scroll_handle.clone(), window, cx),
                 ),
             )
             .into_any_element()