]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #12468 - Veykril:cancelled-diags, r=Veykril
authorbors <bors@rust-lang.org>
Sat, 4 Jun 2022 23:40:05 +0000 (23:40 +0000)
committerbors <bors@rust-lang.org>
Sat, 4 Jun 2022 23:40:05 +0000 (23:40 +0000)
minor: Don't log cancelled diagnostics

Since we retry requests now we can actually hit this legitimately

crates/rust-analyzer/src/main_loop.rs

index babcbb478281846f116484b5970ced7205987b9c..d70703ff46bdf7edee00b85e1ab6ce44c209e460 100644 (file)
@@ -8,7 +8,7 @@
 
 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 @@ fn update_diagnostics(&mut self) {
                 .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))
                 })