Clippy

Mikayla Maki created 2 months ago

Change summary

Cargo.lock                                         | 19 -------
crates/agent_settings/src/agent_profile.rs         |  2 
crates/agent_ui/src/text_thread_editor.rs          |  2 
crates/audio/Cargo.toml                            |  1 
crates/auto_update/Cargo.toml                      |  1 
crates/call/Cargo.toml                             |  1 
crates/collab_ui/Cargo.toml                        |  1 
crates/editor/src/editor.rs                        |  2 
crates/extension_host/Cargo.toml                   |  1 
crates/git_hosting_providers/Cargo.toml            |  1 
crates/go_to_line/Cargo.toml                       |  2 
crates/image_viewer/Cargo.toml                     |  1 
crates/journal/Cargo.toml                          |  1 
crates/journal/src/journal.rs                      |  4 
crates/language/src/language_settings.rs           |  3 
crates/language_models/src/provider/anthropic.rs   |  2 
crates/language_models/src/provider/google.rs      |  2 
crates/language_models/src/provider/open_router.rs |  2 
crates/open_router/Cargo.toml                      |  1 
crates/outline_panel/Cargo.toml                    |  1 
crates/outline_panel/src/outline_panel_settings.rs |  2 
crates/project/src/agent_server_store.rs           |  2 
crates/project/src/project_settings.rs             |  4 
crates/recent_projects/Cargo.toml                  |  1 
crates/remote/Cargo.toml                           |  1 
crates/repl/Cargo.toml                             |  1 
crates/theme/Cargo.toml                            |  1 
crates/vim_mode_setting/Cargo.toml                 |  1 
crates/workspace/src/workspace_settings.rs         | 43 +++++++--------
crates/worktree/Cargo.toml                         |  1 
crates/zlog_settings/Cargo.toml                    |  1 
31 files changed, 33 insertions(+), 75 deletions(-)

Detailed changes

Cargo.lock

@@ -1410,7 +1410,6 @@ dependencies = [
  "log",
  "parking_lot",
  "rodio",
- "schemars 1.0.1",
  "serde",
  "settings",
  "smol",
@@ -1443,7 +1442,6 @@ dependencies = [
  "log",
  "paths",
  "release_channel",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -2646,7 +2644,6 @@ dependencies = [
  "log",
  "postage",
  "project",
- "schemars 1.0.1",
  "serde",
  "settings",
  "telemetry",
@@ -3458,7 +3455,6 @@ dependencies = [
  "project",
  "release_channel",
  "rpc",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -5745,7 +5741,6 @@ dependencies = [
  "release_channel",
  "remote",
  "reqwest_client",
- "schemars 1.0.1",
  "semantic_version",
  "serde",
  "serde_json",
@@ -6866,7 +6861,6 @@ dependencies = [
  "indoc",
  "pretty_assertions",
  "regex",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -7738,7 +7732,6 @@ dependencies = [
 name = "go_to_line"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "editor",
  "gpui",
  "indoc",
@@ -7746,7 +7739,6 @@ dependencies = [
  "menu",
  "project",
  "rope",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -8772,7 +8764,6 @@ dependencies = [
  "language",
  "log",
  "project",
- "schemars 1.0.1",
  "serde",
  "settings",
  "theme",
@@ -9275,7 +9266,6 @@ dependencies = [
  "editor",
  "gpui",
  "log",
- "schemars 1.0.1",
  "serde",
  "settings",
  "shellexpand 2.1.2",
@@ -11695,7 +11685,6 @@ dependencies = [
  "settings",
  "strum 0.27.1",
  "thiserror 2.0.12",
- "util",
  "workspace-hack",
 ]
 
@@ -11869,7 +11858,6 @@ dependencies = [
  "outline",
  "pretty_assertions",
  "project",
- "schemars 1.0.1",
  "search",
  "serde",
  "serde_json",
@@ -13841,7 +13829,6 @@ dependencies = [
  "project",
  "release_channel",
  "remote",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -14015,7 +14002,6 @@ dependencies = [
  "prost 0.9.0",
  "release_channel",
  "rpc",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -14135,7 +14121,6 @@ dependencies = [
  "picker",
  "project",
  "runtimelib",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -17179,7 +17164,6 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_json_lenient",
- "serde_repr",
  "settings",
  "strum 0.27.1",
  "thiserror 2.0.12",
@@ -18726,7 +18710,6 @@ dependencies = [
 name = "vim_mode_setting"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "gpui",
  "settings",
  "workspace-hack",
@@ -20849,7 +20832,6 @@ dependencies = [
  "pretty_assertions",
  "rand 0.9.1",
  "rpc",
- "schemars 1.0.1",
  "serde",
  "serde_json",
  "settings",
@@ -21707,7 +21689,6 @@ dependencies = [
 name = "zlog_settings"
 version = "0.1.0"
 dependencies = [
- "anyhow",
  "collections",
  "gpui",
  "settings",

crates/agent_settings/src/agent_profile.rs

@@ -126,7 +126,7 @@ impl AgentProfileSettings {
         }
 
         profiles.insert(
-            profile_id.0.clone(),
+            profile_id.0,
             AgentProfileContent {
                 name: self.name.clone().into(),
                 tools: self.tools.clone(),

crates/agent_ui/src/text_thread_editor.rs

@@ -303,7 +303,7 @@ impl TextThreadEditor {
                             settings.agent.get_or_insert_default().set_model(
                                 LanguageModelSelection {
                                     provider: LanguageModelProviderSetting(provider),
-                                    model: model.clone(),
+                                    model,
                                 },
                             )
                         });

crates/audio/Cargo.toml

@@ -21,7 +21,6 @@ gpui.workspace = true
 log.workspace = true
 parking_lot.workspace = true
 rodio = { workspace = true, features = [ "wav", "playback", "wav_output" ] }
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 smol.workspace = true

crates/auto_update/Cargo.toml

@@ -21,7 +21,6 @@ http_client.workspace = true
 log.workspace = true
 paths.workspace = true
 release_channel.workspace = true
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/call/Cargo.toml

@@ -35,7 +35,6 @@ language.workspace = true
 log.workspace = true
 postage.workspace = true
 project.workspace = true
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 telemetry.workspace = true

crates/collab_ui/Cargo.toml

@@ -47,7 +47,6 @@ picker.workspace = true
 project.workspace = true
 release_channel.workspace = true
 rpc.workspace = true
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/editor/src/editor.rs

@@ -22916,7 +22916,7 @@ fn inlay_hint_settings(
 ) -> InlayHintSettings {
     let file = snapshot.file_at(location);
     let language = snapshot.language_at(location).map(|l| l.name());
-    language_settings(language, file, cx).inlay_hints.clone()
+    language_settings(language, file, cx).inlay_hints
 }
 
 fn consume_contiguous_rows(

crates/extension_host/Cargo.toml

@@ -37,7 +37,6 @@ paths.workspace = true
 project.workspace = true
 remote.workspace = true
 release_channel.workspace = true
-schemars.workspace = true
 semantic_version.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/git_hosting_providers/Cargo.toml

@@ -19,7 +19,6 @@ git.workspace = true
 gpui.workspace = true
 http_client.workspace = true
 regex.workspace = true
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/go_to_line/Cargo.toml

@@ -13,12 +13,10 @@ path = "src/go_to_line.rs"
 doctest = false
 
 [dependencies]
-anyhow.workspace = true
 editor.workspace = true
 gpui.workspace = true
 language.workspace = true
 menu.workspace = true
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 text.workspace = true

crates/image_viewer/Cargo.toml

@@ -24,7 +24,6 @@ gpui.workspace = true
 language.workspace = true
 log.workspace = true
 project.workspace = true
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 theme.workspace = true

crates/journal/Cargo.toml

@@ -18,7 +18,6 @@ chrono.workspace = true
 editor.workspace = true
 gpui.workspace = true
 log.workspace = true
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 shellexpand.workspace = true

crates/journal/src/journal.rs

@@ -39,7 +39,7 @@ impl settings::Settings for JournalSettings {
 
         Self {
             path: journal.path.unwrap(),
-            hour_format: journal.hour_format.unwrap().into(),
+            hour_format: journal.hour_format.unwrap(),
         }
     }
 
@@ -195,7 +195,7 @@ fn heading_entry(now: NaiveTime, hour_format: &HourFormat) -> String {
             let hour = now.hour();
             format!("# {}:{:02}", hour, now.minute())
         }
-        HourFormat::Hour12 =>  {
+        HourFormat::Hour12 => {
             let (pm, hour) = now.hour12();
             let am_or_pm = if pm { "PM" } else { "AM" };
             format!("# {}:{:02} {}", hour, now.minute(), am_or_pm)

crates/language/src/language_settings.rs

@@ -917,8 +917,7 @@ fn merge_settings(settings: &mut LanguageSettings, src: &LanguageSettingsContent
             .scroll_debounce_ms
             .merge_from(&inlay_hints.scroll_debounce_ms);
         if let Some(toggle_on_modifiers_press) = &inlay_hints.toggle_on_modifiers_press {
-            settings.inlay_hints.toggle_on_modifiers_press =
-                Some(toggle_on_modifiers_press.clone());
+            settings.inlay_hints.toggle_on_modifiers_press = Some(*toggle_on_modifiers_press);
         }
     }
     settings

crates/language_models/src/provider/anthropic.rs

@@ -188,7 +188,7 @@ impl LanguageModelProvider for AnthropicLanguageModelProvider {
                     max_output_tokens: model.max_output_tokens,
                     default_temperature: model.default_temperature,
                     extra_beta_headers: model.extra_beta_headers.clone(),
-                    mode: model.mode.clone().unwrap_or_default().into(),
+                    mode: model.mode.unwrap_or_default().into(),
                 },
             );
         }

crates/language_models/src/provider/google.rs

@@ -209,7 +209,7 @@ impl LanguageModelProvider for GoogleLanguageModelProvider {
                     name: model.name.clone(),
                     display_name: model.display_name.clone(),
                     max_tokens: model.max_tokens,
-                    mode: model.mode.unwrap_or_default().into(),
+                    mode: model.mode.unwrap_or_default(),
                 },
             );
         }

crates/language_models/src/provider/open_router.rs

@@ -211,7 +211,7 @@ impl LanguageModelProvider for OpenRouterLanguageModelProvider {
                 max_tokens: model.max_tokens,
                 supports_tools: model.supports_tools,
                 supports_images: model.supports_images,
-                mode: model.mode.clone().unwrap_or_default(),
+                mode: model.mode.unwrap_or_default(),
                 provider: model.provider.clone(),
             });
         }

crates/open_router/Cargo.toml

@@ -25,5 +25,4 @@ serde_json.workspace = true
 settings.workspace = true
 strum.workspace = true
 thiserror.workspace = true
-util.workspace = true
 workspace-hack.workspace = true

crates/outline_panel/Cargo.toml

@@ -26,7 +26,6 @@ log.workspace = true
 menu.workspace = true
 outline.workspace = true
 project.workspace = true
-schemars.workspace = true
 search.workspace = true
 serde.workspace = true
 serde_json.workspace = true

crates/outline_panel/src/outline_panel_settings.rs

@@ -72,7 +72,7 @@ impl Settings for OutlinePanelSettings {
         self.button.merge_from(&panel.button);
         self.default_width
             .merge_from(&panel.default_width.map(Pixels::from));
-        self.dock.merge_from(&panel.dock.map(Into::into));
+        self.dock.merge_from(&panel.dock);
         self.file_icons.merge_from(&panel.file_icons);
         self.folder_icons.merge_from(&panel.folder_icons);
         self.git_status.merge_from(&panel.git_status);

crates/project/src/agent_server_store.rs

@@ -1071,7 +1071,7 @@ impl settings::Settings for AllAgentServersSettings {
             custom: agent_settings
                 .custom
                 .into_iter()
-                .map(|(k, v)| (k.clone(), v.into()))
+                .map(|(k, v)| (k, v.into()))
                 .collect(),
         }
     }

crates/project/src/project_settings.rs

@@ -505,7 +505,7 @@ impl Settings for ProjectSettings {
                 .lsp
                 .clone()
                 .into_iter()
-                .map(|(key, value)| (LanguageServerName(key.into()), value.into()))
+                .map(|(key, value)| (LanguageServerName(key.into()), value))
                 .collect(),
             global_lsp_settings: GlobalLspSettings {
                 button: content
@@ -559,7 +559,7 @@ impl Settings for ProjectSettings {
                 .dap
                 .clone()
                 .into_iter()
-                .filter_map(|(key, value)| Some((DebugAdapterName(key.into()), value))),
+                .map(|(key, value)| (DebugAdapterName(key.into()), value)),
         );
         if let Some(diagnostics) = content.diagnostics.as_ref() {
             if let Some(inline) = &diagnostics.inline {

crates/recent_projects/Cargo.toml

@@ -31,7 +31,6 @@ picker.workspace = true
 project.workspace = true
 release_channel.workspace = true
 remote.workspace = true
-schemars.workspace = true
 serde.workspace = true
 settings.workspace = true
 smol.workspace = true

crates/remote/Cargo.toml

@@ -32,7 +32,6 @@ paths.workspace = true
 prost.workspace = true
 release_channel.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
-schemars.workspace =  true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/repl/Cargo.toml

@@ -38,7 +38,6 @@ multi_buffer.workspace = true
 nbformat.workspace = true
 project.workspace = true
 runtimelib.workspace = true
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/theme/Cargo.toml

@@ -33,7 +33,6 @@ schemars = { workspace = true, features = ["indexmap2"] }
 serde.workspace = true
 serde_json.workspace = true
 serde_json_lenient.workspace = true
-serde_repr.workspace = true
 settings.workspace = true
 strum.workspace = true
 thiserror.workspace = true

crates/vim_mode_setting/Cargo.toml

@@ -12,7 +12,6 @@ workspace = true
 path = "src/vim_mode_setting.rs"
 
 [dependencies]
-anyhow.workspace = true
 gpui.workspace = true
 settings.workspace = true
 workspace-hack.workspace = true

crates/workspace/src/workspace_settings.rs

@@ -82,25 +82,22 @@ impl Settings for WorkspaceSettings {
                         .unwrap(),
                 ),
             },
-            bottom_dock_layout: workspace.bottom_dock_layout.clone().unwrap(),
-            pane_split_direction_horizontal: workspace
-                .pane_split_direction_horizontal
-                .clone()
-                .unwrap(),
-            pane_split_direction_vertical: workspace.pane_split_direction_vertical.clone().unwrap(),
-            centered_layout: workspace.centered_layout.clone().unwrap(),
-            confirm_quit: workspace.confirm_quit.clone().unwrap(),
-            show_call_status_icon: workspace.show_call_status_icon.clone().unwrap(),
-            autosave: workspace.autosave.clone().unwrap(),
-            restore_on_startup: workspace.restore_on_startup.clone().unwrap(),
-            restore_on_file_reopen: workspace.restore_on_file_reopen.clone().unwrap(),
-            drop_target_size: workspace.drop_target_size.clone().unwrap(),
-            use_system_path_prompts: workspace.use_system_path_prompts.clone().unwrap(),
-            use_system_prompts: workspace.use_system_prompts.clone().unwrap(),
+            bottom_dock_layout: workspace.bottom_dock_layout.unwrap(),
+            pane_split_direction_horizontal: workspace.pane_split_direction_horizontal.unwrap(),
+            pane_split_direction_vertical: workspace.pane_split_direction_vertical.unwrap(),
+            centered_layout: workspace.centered_layout.unwrap(),
+            confirm_quit: workspace.confirm_quit.unwrap(),
+            show_call_status_icon: workspace.show_call_status_icon.unwrap(),
+            autosave: workspace.autosave.unwrap(),
+            restore_on_startup: workspace.restore_on_startup.unwrap(),
+            restore_on_file_reopen: workspace.restore_on_file_reopen.unwrap(),
+            drop_target_size: workspace.drop_target_size.unwrap(),
+            use_system_path_prompts: workspace.use_system_path_prompts.unwrap(),
+            use_system_prompts: workspace.use_system_prompts.unwrap(),
             command_aliases: workspace.command_aliases.clone(),
-            max_tabs: workspace.max_tabs.clone(),
-            when_closing_with_no_tabs: workspace.when_closing_with_no_tabs.clone().unwrap(),
-            on_last_window_closed: workspace.on_last_window_closed.clone().unwrap(),
+            max_tabs: workspace.max_tabs,
+            when_closing_with_no_tabs: workspace.when_closing_with_no_tabs.unwrap(),
+            on_last_window_closed: workspace.on_last_window_closed.unwrap(),
             resize_all_panels_in_dock: workspace
                 .resize_all_panels_in_dock
                 .clone()
@@ -108,22 +105,22 @@ impl Settings for WorkspaceSettings {
                 .into_iter()
                 .map(Into::into)
                 .collect(),
-            close_on_file_delete: workspace.close_on_file_delete.clone().unwrap(),
-            use_system_window_tabs: workspace.use_system_window_tabs.clone().unwrap(),
-            zoomed_padding: workspace.zoomed_padding.clone().unwrap(),
+            close_on_file_delete: workspace.close_on_file_delete.unwrap(),
+            use_system_window_tabs: workspace.use_system_window_tabs.unwrap(),
+            zoomed_padding: workspace.zoomed_padding.unwrap(),
         }
     }
 
     fn refine(&mut self, content: &settings::SettingsContent, _cx: &mut App) {
         let workspace = &content.workspace;
-        if let Some(border_size) = *&workspace
+        if let Some(border_size) = workspace
             .active_pane_modifiers
             .and_then(|modifier| modifier.border_size)
         {
             self.active_pane_modifiers.border_size = Some(border_size);
         }
 
-        if let Some(inactive_opacity) = *&workspace
+        if let Some(inactive_opacity) = workspace
             .active_pane_modifiers
             .and_then(|modifier| modifier.inactive_opacity)
         {

crates/worktree/Cargo.toml

@@ -38,7 +38,6 @@ parking_lot.workspace = true
 paths.workspace = true
 postage.workspace = true
 rpc = { workspace = true, features = ["gpui"] }
-schemars.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 settings.workspace = true

crates/zlog_settings/Cargo.toml

@@ -15,7 +15,6 @@ path = "src/zlog_settings.rs"
 default = []
 
 [dependencies]
-anyhow.workspace = true
 gpui.workspace = true
 collections.workspace = true
 settings.workspace = true