about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-06-04 23:40:05 +0000
committerbors <bors@rust-lang.org>2022-06-04 23:40:05 +0000
commit815b43429d85b6c6739f01c3b2ae689f5747a2e8 (patch)
tree787a63c02c6987fec55893bbdf8f77a026baf99d
parent02c6c191528cfee434bda54e5d9ef57c9c3d3981 (diff)
parentd38b7b88c67a4ac584d36f57023f2192901cda9c (diff)
downloadrust-815b43429d85b6c6739f01c3b2ae689f5747a2e8.tar.gz
rust-815b43429d85b6c6739f01c3b2ae689f5747a2e8.zip
Auto merge of #12468 - Veykril:cancelled-diags, r=Veykril
minor: Don't log cancelled diagnostics

Since we retry requests now we can actually hit this legitimately
-rw-r--r--crates/rust-analyzer/src/main_loop.rs7
1 files changed, 1 insertions, 6 deletions
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index babcbb47828..d70703ff46b 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -8,7 +8,7 @@ use std::{
 
 use always_assert::always;
 use crossbeam_channel::{select, Receiver};
-use ide_db::base_db::{Cancelled, SourceDatabaseExt, VfsPath};
+use ide_db::base_db::{SourceDatabaseExt, VfsPath};
 use lsp_server::{Connection, Notification, Request};
 use lsp_types::notification::Notification as _;
 use vfs::{ChangeKind, FileId};
@@ -796,11 +796,6 @@ impl GlobalState {
                 .into_iter()
                 .filter_map(|file_id| {
                     handlers::publish_diagnostics(&snapshot, file_id)
-                        .map_err(|err| {
-                            if err.is::<Cancelled>() {
-                                tracing::error!("failed to compute diagnostics: {:?}", err);
-                            }
-                        })
                         .ok()
                         .map(|diags| (file_id, diags))
                 })