diff options
author | Jonas Schievink <[email protected]> | 2021-05-17 18:07:10 +0100 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2021-05-27 14:05:41 +0100 |
commit | 33debc40654be9e9061c53784f6c762b2fd21eba (patch) | |
tree | def63d3cc42fe48b1dfdf716c2e8e56de5324dab /crates/rust-analyzer/src/main_loop.rs | |
parent | d0a4ba294ccf0c925a5ff1115c19a60c6a24b734 (diff) |
Update salsa
Diffstat (limited to 'crates/rust-analyzer/src/main_loop.rs')
-rw-r--r-- | crates/rust-analyzer/src/main_loop.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs index 008758ea0..31d8ea9e7 100644 --- a/crates/rust-analyzer/src/main_loop.rs +++ b/crates/rust-analyzer/src/main_loop.rs | |||
@@ -22,7 +22,7 @@ use crate::{ | |||
22 | from_proto, | 22 | from_proto, |
23 | global_state::{file_id_to_url, url_to_file_id, GlobalState}, | 23 | global_state::{file_id_to_url, url_to_file_id, GlobalState}, |
24 | handlers, lsp_ext, | 24 | handlers, lsp_ext, |
25 | lsp_utils::{apply_document_changes, is_canceled, notification_is, Progress}, | 25 | lsp_utils::{apply_document_changes, is_cancelled, notification_is, Progress}, |
26 | reload::{BuildDataProgress, ProjectWorkspaceProgress}, | 26 | reload::{BuildDataProgress, ProjectWorkspaceProgress}, |
27 | Result, | 27 | Result, |
28 | }; | 28 | }; |
@@ -752,7 +752,7 @@ impl GlobalState { | |||
752 | .filter_map(|file_id| { | 752 | .filter_map(|file_id| { |
753 | handlers::publish_diagnostics(&snapshot, file_id) | 753 | handlers::publish_diagnostics(&snapshot, file_id) |
754 | .map_err(|err| { | 754 | .map_err(|err| { |
755 | if !is_canceled(&*err) { | 755 | if !is_cancelled(&*err) { |
756 | log::error!("failed to compute diagnostics: {:?}", err); | 756 | log::error!("failed to compute diagnostics: {:?}", err); |
757 | } | 757 | } |
758 | () | 758 | () |