Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enable clippy::redundant_closure_call (#8840)

Browse source 
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
This commit is contained in:
Marshall Bowers 2024-03-04 12:38:18 -05:00 • committed by GitHub
parent 9ea50ed649
commit 1dd4c1b057
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/languages/src/astro.rs
View file

@ -12,7 +12,7 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,
}; };
use util::ResultExt; use util::{async_maybe, ResultExt};
const SERVER_PATH: &str = "node_modules/@astrojs/language-server/bin/nodeServer.js"; 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, container_dir: PathBuf,
node: &dyn NodeRuntime, node: &dyn NodeRuntime,
) -> Option<LanguageServerBinary> { ) -> Option<LanguageServerBinary> {
(|| async move { async_maybe!({
let mut last_version_dir = None; let mut last_version_dir = None;
let mut entries = fs::read_dir(&container_dir).await?; let mut entries = fs::read_dir(&container_dir).await?;
while let Some(entry) = entries.next().await { while let Some(entry) = entries.next().await {
@ -128,7 +128,7 @@ async fn get_cached_server_binary(
last_version_dir last_version_dir
)) ))
} }
})() })
.await .await
.log_err() .log_err()
} }

6
crates/languages/src/elm.rs
View file

@ -15,7 +15,7 @@ use std::{
path::{Path, PathBuf}, path::{Path, PathBuf},
sync::Arc, sync::Arc,
}; };
use util::ResultExt; use util::{async_maybe, ResultExt};
const SERVER_NAME: &str = "elm-language-server"; const SERVER_NAME: &str = "elm-language-server";
const SERVER_PATH: &str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js"; 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, container_dir: PathBuf,
node: &dyn NodeRuntime, node: &dyn NodeRuntime,
) -> Option<LanguageServerBinary> { ) -> Option<LanguageServerBinary> {
(|| async move { async_maybe!({
let mut last_version_dir = None; let mut last_version_dir = None;
let mut entries = fs::read_dir(&container_dir).await?; let mut entries = fs::read_dir(&container_dir).await?;
while let Some(entry) = entries.next().await { while let Some(entry) = entries.next().await {
@ -140,7 +140,7 @@ async fn get_cached_server_binary(
last_version_dir last_version_dir
)) ))
} }
})() })
.await .await
.log_err() .log_err()
} }

1
tooling/xtask/src/main.rs
View file

@ -93,7 +93,6 @@ fn run_clippy(args: ClippyArgs) -> Result<()> {
"clippy::never_loop", "clippy::never_loop",
"clippy::non_canonical_clone_impl", "clippy::non_canonical_clone_impl",
"clippy::non_canonical_partial_ord_impl", "clippy::non_canonical_partial_ord_impl",
"clippy::redundant_closure_call",
"clippy::reversed_empty_ranges", "clippy::reversed_empty_ranges",
"clippy::single_range_in_vec_init", "clippy::single_range_in_vec_init",
"clippy::suspicious_to_owned", "clippy::suspicious_to_owned",