From 33ef5b773100e2e3e108e3d9917e7f82147d6140 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Mon, 4 Mar 2024 10:54:33 -0500 Subject: [PATCH] Enable `clippy::iter_kv_map` (#8832) This PR enables the [`clippy::iter_kv_map`](https://rust-lang.github.io/rust-clippy/master/index.html#/iter_kv_map) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/extension/src/extension_store.rs | 4 ++-- tooling/xtask/src/main.rs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/crates/extension/src/extension_store.rs b/crates/extension/src/extension_store.rs index 1386ae016c..55fd214e3e 100644 --- a/crates/extension/src/extension_store.rs +++ b/crates/extension/src/extension_store.rs @@ -798,8 +798,8 @@ impl ExtensionStore { }, grammars: manifest_json .grammars - .into_iter() - .map(|(grammar_name, _)| (grammar_name, Default::default())) + .into_keys() + .map(|grammar_name| (grammar_name, Default::default())) .collect(), language_servers: Default::default(), }; diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index ca268668d8..e40a92c0a0 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -89,7 +89,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::derive_ord_xor_partial_ord", "clippy::eq_op", "clippy::implied_bounds_in_impls", - "clippy::iter_kv_map", "clippy::iter_overeager_cloned", "clippy::let_underscore_future", "clippy::map_entry",