From 1dd4c1b057b1797a447a0494eacd65d9c0f0864c Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Mon, 4 Mar 2024 12:38:18 -0500
Subject: [PATCH] Enable `clippy::redundant_closure_call` (#8840)

This PR enables the
[`clippy::redundant_closure_call`](https://rust-lang.github.io/rust-clippy/master/index.html#/redundant_closure_call)
rule and fixes the outstanding violations.

Release Notes:

- N/A
---
 crates/languages/src/astro.rs | 6 +++---
 crates/languages/src/elm.rs   | 6 +++---
 tooling/xtask/src/main.rs     | 1 -
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/crates/languages/src/astro.rs b/crates/languages/src/astro.rs
index 220b294e8e..2ed3853e07 100644
--- a/crates/languages/src/astro.rs
+++ b/crates/languages/src/astro.rs
@@ -12,7 +12,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use util::ResultExt;
+use util::{async_maybe, ResultExt};
 
 const SERVER_PATH: &str = "node_modules/@astrojs/language-server/bin/nodeServer.js";
 
@@ -105,7 +105,7 @@ async fn get_cached_server_binary(
     container_dir: PathBuf,
     node: &dyn NodeRuntime,
 ) -> Option<LanguageServerBinary> {
-    (|| async move {
+    async_maybe!({
         let mut last_version_dir = None;
         let mut entries = fs::read_dir(&container_dir).await?;
         while let Some(entry) = entries.next().await {
@@ -128,7 +128,7 @@ async fn get_cached_server_binary(
                 last_version_dir
             ))
         }
-    })()
+    })
     .await
     .log_err()
 }
diff --git a/crates/languages/src/elm.rs b/crates/languages/src/elm.rs
index 27b9c6d409..37b156db91 100644
--- a/crates/languages/src/elm.rs
+++ b/crates/languages/src/elm.rs
@@ -15,7 +15,7 @@ use std::{
     path::{Path, PathBuf},
     sync::Arc,
 };
-use util::ResultExt;
+use util::{async_maybe, ResultExt};
 
 const SERVER_NAME: &str = "elm-language-server";
 const SERVER_PATH: &str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js";
@@ -117,7 +117,7 @@ async fn get_cached_server_binary(
     container_dir: PathBuf,
     node: &dyn NodeRuntime,
 ) -> Option<LanguageServerBinary> {
-    (|| async move {
+    async_maybe!({
         let mut last_version_dir = None;
         let mut entries = fs::read_dir(&container_dir).await?;
         while let Some(entry) = entries.next().await {
@@ -140,7 +140,7 @@ async fn get_cached_server_binary(
                 last_version_dir
             ))
         }
-    })()
+    })
     .await
     .log_err()
 }
diff --git a/tooling/xtask/src/main.rs b/tooling/xtask/src/main.rs
index 69b6bc95bb..d93d2b7e5e 100644
--- a/tooling/xtask/src/main.rs
+++ b/tooling/xtask/src/main.rs
@@ -93,7 +93,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> {
         "clippy::never_loop",
         "clippy::non_canonical_clone_impl",
         "clippy::non_canonical_partial_ord_impl",
-        "clippy::redundant_closure_call",
         "clippy::reversed_empty_ranges",
         "clippy::single_range_in_vec_init",
         "clippy::suspicious_to_owned",