From 56f0418c9380a8d9dc69f9c4c868d71e840c1b10 Mon Sep 17 00:00:00 2001 From: Marshall Bowers Date: Sun, 3 Mar 2024 11:16:27 -0500 Subject: [PATCH] Enable `clippy::needless_option_as_deref` (#8775) This PR enables the [`clippy::needless_option_as_deref`](https://rust-lang.github.io/rust-clippy/master/index.html#/needless_option_as_deref) rule and fixes the outstanding violations. Release Notes: - N/A --- crates/editor/src/display_map.rs | 2 +- tooling/xtask/src/main.rs | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/crates/editor/src/display_map.rs b/crates/editor/src/display_map.rs index e55df06d7f..8285644826 100644 --- a/crates/editor/src/display_map.rs +++ b/crates/editor/src/display_map.rs @@ -326,7 +326,7 @@ impl DisplayMap { .read(cx) .as_singleton() .and_then(|buffer| buffer.read(cx).language()); - language_settings(language.as_deref(), None, cx).tab_size + language_settings(language, None, cx).tab_size } #[cfg(test)] diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs index a83ae283ad..4cfb96af67 100644 --- a/tooling/xtask/src/main.rs +++ b/tooling/xtask/src/main.rs @@ -96,7 +96,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> { "clippy::let_underscore_future", "clippy::map_entry", "clippy::needless_lifetimes", - "clippy::needless_option_as_deref", "clippy::needless_update", "clippy::never_loop", "clippy::non_canonical_clone_impl",