From fc8e515fe865083ae28a208a89ac3c533aab6262 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sat, 2 Mar 2024 18:42:05 -0500 Subject: [PATCH] Enable `clippy::too_many_arguments` (#8734) This PR enables the [`clippy::too_many_arguments`](https://rust-lang.github.io/rust-clippy/master/index.html#/too_many_arguments) rule. I opted to add `#[allow(clippy::too_many_arguments)]` on the individual violations, as reworking them to take fewer arguments is a more involved task. Release Notes: - N/A --- crates/assistant/src/assistant_panel.rs | 1 + crates/collab/src/db/queries/messages.rs | 1 + crates/collab/src/rpc.rs | 1 + crates/collab/src/tests/randomized_test_helpers.rs | 1 + crates/collab_ui/src/collab_titlebar_item.rs | 1 + crates/editor/src/element.rs | 1 + crates/language/src/syntax_map.rs | 1 + crates/lsp/src/lsp.rs | 1 + crates/project/src/project.rs | 2 ++ crates/project_core/src/worktree.rs | 1 + crates/rich_text/src/rich_text.rs | 1 + crates/terminal/src/terminal.rs | 1 + crates/workspace/src/pane_group.rs | 5 +++++ tooling/xtask/src/main.rs | 1 - 14 files changed, 18 insertions(+), 1 deletion(-) diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs index 178571369b..a69dc69f28 100644 --- a/crates/assistant/src/assistant_panel.rs +++ b/crates/assistant/src/assistant_panel.rs @@ -2835,6 +2835,7 @@ impl FocusableView for InlineAssistant { } impl InlineAssistant { + #[allow(clippy::too_many_arguments)] fn new( id: usize, measurements: Rc>, diff --git a/crates/collab/src/db/queries/messages.rs b/crates/collab/src/db/queries/messages.rs index d63b4cf1c5..8143007e19 100644 --- a/crates/collab/src/db/queries/messages.rs +++ b/crates/collab/src/db/queries/messages.rs @@ -200,6 +200,7 @@ impl Database { } /// Creates a new channel message. + #[allow(clippy::too_many_arguments)] pub async fn create_channel_message( &self, channel_id: ChannelId, diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index 550f222840..074bb44bcc 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -543,6 +543,7 @@ impl Server { }) } + #[allow(clippy::too_many_arguments)] pub fn handle_connection( self: &Arc, connection: Connection, diff --git a/crates/collab/src/tests/randomized_test_helpers.rs b/crates/collab/src/tests/randomized_test_helpers.rs index 7d7abe7dfe..edce9c184d 100644 --- a/crates/collab/src/tests/randomized_test_helpers.rs +++ b/crates/collab/src/tests/randomized_test_helpers.rs @@ -464,6 +464,7 @@ impl TestPlan { }) } + #[allow(clippy::too_many_arguments)] async fn apply_server_operation( plan: Arc>, deterministic: BackgroundExecutor, diff --git a/crates/collab_ui/src/collab_titlebar_item.rs b/crates/collab_ui/src/collab_titlebar_item.rs index 14d0439237..2df240564e 100644 --- a/crates/collab_ui/src/collab_titlebar_item.rs +++ b/crates/collab_ui/src/collab_titlebar_item.rs @@ -478,6 +478,7 @@ impl CollabTitlebarItem { ) } + #[allow(clippy::too_many_arguments)] fn render_collaborator( &self, user: &Arc, diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs index b1e372b91e..b0cc0822a4 100644 --- a/crates/editor/src/element.rs +++ b/crates/editor/src/element.rs @@ -2992,6 +2992,7 @@ impl LineWithInvisibles { ); } + #[allow(clippy::too_many_arguments)] fn draw_invisibles( &self, selection_ranges: &[Range], diff --git a/crates/language/src/syntax_map.rs b/crates/language/src/syntax_map.rs index 7d9258ab01..9c38fe8611 100644 --- a/crates/language/src/syntax_map.rs +++ b/crates/language/src/syntax_map.rs @@ -1180,6 +1180,7 @@ fn parse_text( }) } +#[allow(clippy::too_many_arguments)] fn get_injections( config: &InjectionConfig, text: &BufferSnapshot, diff --git a/crates/lsp/src/lsp.rs b/crates/lsp/src/lsp.rs index 2f92ac71de..1652e34044 100644 --- a/crates/lsp/src/lsp.rs +++ b/crates/lsp/src/lsp.rs @@ -261,6 +261,7 @@ impl LanguageServer { Ok(server) } + #[allow(clippy::too_many_arguments)] fn new_internal( server_id: LanguageServerId, stdin: Stdin, diff --git a/crates/project/src/project.rs b/crates/project/src/project.rs index 5aefc19e32..043dfe278e 100644 --- a/crates/project/src/project.rs +++ b/crates/project/src/project.rs @@ -2909,6 +2909,7 @@ impl Project { })) } + #[allow(clippy::too_many_arguments)] async fn setup_and_insert_language_server( this: WeakModel, worktree_path: &Path, @@ -6182,6 +6183,7 @@ impl Project { } /// Pick paths that might potentially contain a match of a given search query. + #[allow(clippy::too_many_arguments)] async fn background_search( unnamed_buffers: Vec>, opened_buffers: HashMap, (Model, BufferSnapshot)>, diff --git a/crates/project_core/src/worktree.rs b/crates/project_core/src/worktree.rs index 7bdb7cbd7d..2fe51e67ba 100644 --- a/crates/project_core/src/worktree.rs +++ b/crates/project_core/src/worktree.rs @@ -3299,6 +3299,7 @@ enum BackgroundScannerPhase { } impl BackgroundScanner { + #[allow(clippy::too_many_arguments)] fn new( snapshot: LocalSnapshot, next_entry_id: Arc, diff --git a/crates/rich_text/src/rich_text.rs b/crates/rich_text/src/rich_text.rs index effa671590..2e5a28351d 100644 --- a/crates/rich_text/src/rich_text.rs +++ b/crates/rich_text/src/rich_text.rs @@ -124,6 +124,7 @@ impl RichText { } } +#[allow(clippy::too_many_arguments)] pub fn render_markdown_mut( block: &str, mut mentions: &[Mention], diff --git a/crates/terminal/src/terminal.rs b/crates/terminal/src/terminal.rs index 3ef3bab333..ec3503d228 100644 --- a/crates/terminal/src/terminal.rs +++ b/crates/terminal/src/terminal.rs @@ -303,6 +303,7 @@ pub struct TerminalBuilder { } impl TerminalBuilder { + #[allow(clippy::too_many_arguments)] pub fn new( working_directory: Option, task: Option, diff --git a/crates/workspace/src/pane_group.rs b/crates/workspace/src/pane_group.rs index 6f55dc800e..40c636c26f 100644 --- a/crates/workspace/src/pane_group.rs +++ b/crates/workspace/src/pane_group.rs @@ -88,6 +88,7 @@ impl PaneGroup { }; } + #[allow(clippy::too_many_arguments)] pub(crate) fn render( &self, project: &Model, @@ -159,6 +160,7 @@ impl Member { } } + #[allow(clippy::too_many_arguments)] pub fn render( &self, project: &Model, @@ -471,6 +473,7 @@ impl PaneAxis { None } + #[allow(clippy::too_many_arguments)] fn render( &self, project: &Model, @@ -640,6 +643,7 @@ mod element { self } + #[allow(clippy::too_many_arguments)] fn compute_resize( flexes: &Arc>>, e: &MouseMoveEvent, @@ -728,6 +732,7 @@ mod element { cx.refresh(); } + #[allow(clippy::too_many_arguments)] fn push_handle( flexes: Arc>>, dragged_handle: Rc>>, diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index 92e8a9807a..84dec859d2 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -123,7 +123,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::search_is_some", "clippy::single_range_in_vec_init", "clippy::suspicious_to_owned", - "clippy::too_many_arguments", "clippy::type_complexity", "clippy::unit_arg", "clippy::unnecessary_filter_map",