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",