From 82310092a2b73c46deb03ea2b415ce11d21f9834 Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Tue, 6 Aug 2024 08:55:27 -0400
Subject: [PATCH] inline_completion_button: Do some cleanup (#15849)

This PR does some cleanup in the `inline_completion_button` after
#15443.

Release Notes:

- N/A
---
 .../src/inline_completion_button.rs           | 22 +++++++++----------
 crates/zed/src/main.rs                        |  7 ++++--
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/crates/inline_completion_button/src/inline_completion_button.rs b/crates/inline_completion_button/src/inline_completion_button.rs
index fd94b9afe6..dfa5f00b8d 100644
--- a/crates/inline_completion_button/src/inline_completion_button.rs
+++ b/crates/inline_completion_button/src/inline_completion_button.rs
@@ -15,7 +15,7 @@ use language::{
 use settings::{update_settings_file, Settings, SettingsStore};
 use std::{path::Path, sync::Arc};
 use supermaven::{AccountStatus, Supermaven};
-use util::{with_clone, ResultExt};
+use util::ResultExt;
 use workspace::{
     create_and_open_local_file,
     item::ItemHandle,
@@ -222,22 +222,20 @@ impl InlineCompletionButton {
         let fs = self.fs.clone();
         ContextMenu::build(cx, |menu, _| {
             menu.entry("Sign In", None, initiate_sign_in)
-                .entry(
-                    "Disable Copilot",
-                    None,
-                    with_clone!(fs, move |cx| hide_copilot(fs.clone(), cx)),
-                )
-                .entry(
-                    "Use Supermaven",
-                    None,
-                    with_clone!(fs, move |cx| {
+                .entry("Disable Copilot", None, {
+                    let fs = fs.clone();
+                    move |cx| hide_copilot(fs.clone(), cx)
+                })
+                .entry("Use Supermaven", None, {
+                    let fs = fs.clone();
+                    move |cx| {
                         set_completion_provider(
                             fs.clone(),
                             cx,
                             InlineCompletionProvider::Supermaven,
                         )
-                    }),
-                )
+                    }
+                })
         })
     }
 
diff --git a/crates/zed/src/main.rs b/crates/zed/src/main.rs
index 147781b37b..1570d75b40 100644
--- a/crates/zed/src/main.rs
+++ b/crates/zed/src/main.rs
@@ -42,7 +42,7 @@ use std::{
     sync::Arc,
 };
 use theme::{ActiveTheme, SystemAppearance, ThemeRegistry, ThemeSettings};
-use util::{maybe, parse_env_output, with_clone, ResultExt, TryFutureExt};
+use util::{maybe, parse_env_output, ResultExt, TryFutureExt};
 use uuid::Uuid;
 use welcome::{show_welcome_view, BaseKeymap, FIRST_OPEN};
 use workspace::{AppState, WorkspaceSettings, WorkspaceStore};
@@ -386,7 +386,10 @@ fn main() {
         })
     };
 
-    app.on_open_urls(with_clone!(open_listener, move |urls| open_listener.open_urls(urls)));
+    app.on_open_urls({
+        let open_listener = open_listener.clone();
+        move |urls| open_listener.open_urls(urls)
+    });
     app.on_reopen(move |cx| {
         if let Some(app_state) = AppState::try_global(cx).and_then(|app_state| app_state.upgrade())
         {