3 files changed, 64 insertions, 48 deletions

diff --git a/crates/hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index 46ebdbc74..bf16b56b1 100644
--- a/crates/hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
@@ -189,6 +189,7 @@ fn macro_expand_with_arg(
     id: MacroCallId,
     arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>,
 ) -> ExpandResult<Option<Arc<tt::Subtree>>> {
+    let _p = profile::span("macro_expand");
     let lazy_id = match id {
         MacroCallId::LazyMacro(id) => id,
         MacroCallId::EagerMacro(id) => {
@@ -276,14 +277,15 @@ fn parse_macro_with_arg(
     macro_file: MacroFile,
     arg: Option<Arc<(tt::Subtree, mbe::TokenMap)>>,
 ) -> ExpandResult<Option<(Parse<SyntaxNode>, Arc<mbe::TokenMap>)>> {
-    let _p = profile::span("parse_macro_query");
-
     let macro_call_id = macro_file.macro_call_id;
     let result = if let Some(arg) = arg {
         macro_expand_with_arg(db, macro_call_id, Some(arg))
     } else {
         db.macro_expand(macro_call_id)
     };
+
+    let _p = profile::span("parse_macro_expansion");
+
     if let Some(err) = &result.err {
         // Note:
         // The final goal we would like to make all parse_macro success,
diff --git a/crates/rust-analyzer/src/main_loop.rs b/crates/rust-analyzer/src/main_loop.rs
index 866d1d176..f349b0810 100644
--- a/crates/rust-analyzer/src/main_loop.rs
+++ b/crates/rust-analyzer/src/main_loop.rs
@@ -289,55 +289,69 @@ impl GlobalState {
                     }
                 }
             }
-            Event::Flycheck(task) => match task {
-                flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {
-                    let diagnostics = crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(
-                        &self.config.diagnostics_map,
-                        &diagnostic,
-                        &workspace_root,
-                    );
-                    for diag in diagnostics {
-                        match url_to_file_id(&self.vfs.read().0, &diag.url) {
-                            Ok(file_id) => self.diagnostics.add_check_diagnostic(
-                                file_id,
-                                diag.diagnostic,
-                                diag.fixes,
-                            ),
-                            Err(err) => {
-                                log::error!("File with cargo diagnostic not found in VFS: {}", err);
-                            }
-                        };
-                    }
-                }
-
-                flycheck::Message::Progress { id, progress } => {
-                    let (state, message) = match progress {
-                        flycheck::Progress::DidStart => {
-                            self.diagnostics.clear_check();
-                            (Progress::Begin, None)
-                        }
-                        flycheck::Progress::DidCheckCrate(target) => {
-                            (Progress::Report, Some(target))
-                        }
-                        flycheck::Progress::DidCancel => (Progress::End, None),
-                        flycheck::Progress::DidFinish(result) => {
-                            if let Err(err) = result {
-                                log::error!("cargo check failed: {}", err)
+            Event::Flycheck(mut task) => {
+                let _p = profile::span("GlobalState::handle_event/flycheck");
+                loop {
+                    match task {
+                        flycheck::Message::AddDiagnostic { workspace_root, diagnostic } => {
+                            let diagnostics =
+                                crate::diagnostics::to_proto::map_rust_diagnostic_to_lsp(
+                                    &self.config.diagnostics_map,
+                                    &diagnostic,
+                                    &workspace_root,
+                                );
+                            for diag in diagnostics {
+                                match url_to_file_id(&self.vfs.read().0, &diag.url) {
+                                    Ok(file_id) => self.diagnostics.add_check_diagnostic(
+                                        file_id,
+                                        diag.diagnostic,
+                                        diag.fixes,
+                                    ),
+                                    Err(err) => {
+                                        log::error!(
+                                            "File with cargo diagnostic not found in VFS: {}",
+                                            err
+                                        );
+                                    }
+                                };
                             }
-                            (Progress::End, None)
                         }
-                    };
 
-                    // When we're running multiple flychecks, we have to include a disambiguator in
-                    // the title, or the editor complains. Note that this is a user-facing string.
-                    let title = if self.flycheck.len() == 1 {
-                        "cargo check".to_string()
-                    } else {
-                        format!("cargo check (#{})", id + 1)
-                    };
-                    self.report_progress(&title, state, message, None);
+                        flycheck::Message::Progress { id, progress } => {
+                            let (state, message) = match progress {
+                                flycheck::Progress::DidStart => {
+                                    self.diagnostics.clear_check();
+                                    (Progress::Begin, None)
+                                }
+                                flycheck::Progress::DidCheckCrate(target) => {
+                                    (Progress::Report, Some(target))
+                                }
+                                flycheck::Progress::DidCancel => (Progress::End, None),
+                                flycheck::Progress::DidFinish(result) => {
+                                    if let Err(err) = result {
+                                        log::error!("cargo check failed: {}", err)
+                                    }
+                                    (Progress::End, None)
+                                }
+                            };
+
+                            // When we're running multiple flychecks, we have to include a disambiguator in
+                            // the title, or the editor complains. Note that this is a user-facing string.
+                            let title = if self.flycheck.len() == 1 {
+                                "cargo check".to_string()
+                            } else {
+                                format!("cargo check (#{})", id + 1)
+                            };
+                            self.report_progress(&title, state, message, None);
+                        }
+                    }
+                    // Coalesce many flycheck updates into a single loop turn
+                    task = match self.flycheck_receiver.try_recv() {
+                        Ok(task) => task,
+                        Err(_) => break,
+                    }
                 }
-            },
+            }
         }
 
         let state_changed = self.process_changes();
diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index 001bf5949..b2d35f535 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -205,7 +205,7 @@ impl GlobalState {
                 }
                 let res = vfs.file_id(&vfs_path);
                 if res.is_none() {
-                    log::error!("failed to load {}", path.display())
+                    log::warn!("failed to load {}", path.display())
                 }
                 res
             };