From 1fa949633436df7d16e99ba7faaba12225b5cd11 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 3 Mar 2024 11:40:22 -0500 Subject: [PATCH] Enable `clippy::explicit_counter_loop` (#8776) This PR enables the [`clippy::explicit_counter_loop`](https://rust-lang.github.io/rust-clippy/master/index.html#/explicit_counter_loop) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/editor/src/editor.rs | 6 ++---- tooling/xtask/src/main.rs | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs index 258e3fb8a9..78e0afd2b6 100644 --- a/crates/editor/src/editor.rs +++ b/crates/editor/src/editor.rs @@ -2735,9 +2735,8 @@ impl Editor { let mut edits = Vec::new(); let mut rows = Vec::new(); - let mut rows_inserted = 0; - for selection in self.selections.all_adjusted(cx) { + for (rows_inserted, selection) in self.selections.all_adjusted(cx).into_iter().enumerate() { let cursor = selection.head(); let row = cursor.row; @@ -2746,8 +2745,7 @@ impl Editor { let newline = "\n".to_string(); edits.push((start_of_line..start_of_line, newline)); - rows.push(row + rows_inserted); - rows_inserted += 1; + rows.push(row + rows_inserted as u32); } self.transact(cx, |editor, cx| { diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index 4cfb96af67..d716842cb4 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -89,7 +89,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::derivable_impls", "clippy::derive_ord_xor_partial_ord", "clippy::eq_op", - "clippy::explicit_counter_loop", "clippy::implied_bounds_in_impls", "clippy::iter_kv_map", "clippy::iter_overeager_cloned",