zed-industries/zed
1
1
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-11-07 20:39:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Enable clippy::await_holding_lock (#9362)

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

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-14 15:24:19 -04:00 committed by GitHub
parent b0ce25b67a
commit 7f3f296e81
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -406,7 +406,6 @@ style = "allow"
# Individual rules that have violations in the codebase: # Individual rules that have violations in the codebase:
almost_complete_range = "allow" almost_complete_range = "allow"
arc_with_non_send_sync = "allow" arc_with_non_send_sync = "allow"
await_holding_lock = "allow"
borrowed_box = "allow" borrowed_box = "allow"
derive_ord_xor_partial_ord = "allow" derive_ord_xor_partial_ord = "allow"
eq_op = "allow" eq_op = "allow"

40
crates/project/src/project.rs
View File

@ -5235,16 +5235,19 @@ impl Project {
project_id.ok_or_else(|| anyhow!("Remote project without remote_id"))?; project_id.ok_or_else(|| anyhow!("Remote project without remote_id"))?;
for completion_index in completion_indices { for completion_index in completion_indices {
let completions_guard = completions.read(); let (server_id, completion) = {
let completion = &completions_guard[completion_index]; let completions_guard = completions.read();
if completion.documentation.is_some() { let completion = &completions_guard[completion_index];
continue; if completion.documentation.is_some() {
} continue;
}
did_resolve = true; did_resolve = true;
let server_id = completion.server_id; let server_id = completion.server_id;
let completion = completion.lsp_completion.clone(); let completion = completion.lsp_completion.clone();
drop(completions_guard);
(server_id, completion)
};
Self::resolve_completion_documentation_remote( Self::resolve_completion_documentation_remote(
project_id, project_id,
@ -5259,15 +5262,18 @@ impl Project {
} }
} else { } else {
for completion_index in completion_indices { for completion_index in completion_indices {
let completions_guard = completions.read(); let (server_id, completion) = {
let completion = &completions_guard[completion_index]; let completions_guard = completions.read();
if completion.documentation.is_some() { let completion = &completions_guard[completion_index];
continue; if completion.documentation.is_some() {
} continue;
}
let server_id = completion.server_id; let server_id = completion.server_id;
let completion = completion.lsp_completion.clone(); let completion = completion.lsp_completion.clone();
drop(completions_guard);
(server_id, completion)
};
let server = this let server = this
.read_with(&mut cx, |project, _| { .read_with(&mut cx, |project, _| {