about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-09-24 10:17:56 +0000
committerbors <bors@rust-lang.org>2024-09-24 10:17:56 +0000
commit80c06828a2822b9f888b2ad292502dd349810461 (patch)
tree7761f4e6d952c3f0802e3f44d75ae8aac29634c9
parent6ec41ab643bd99d6370dfdeb41d91fd8cd209bd5 (diff)
parentf6138e202de0427ff5adabe1c0889b2e3eb3327c (diff)
downloadrust-80c06828a2822b9f888b2ad292502dd349810461.tar.gz
rust-80c06828a2822b9f888b2ad292502dd349810461.zip
Auto merge of #18157 - davidbarsky:davidbarsky/respect-disabling-proc-macros-in-analysis-stats, r=Veykril
analysis-stats: respect `--disable-proc-macros` flag

I noticed that this flag wasn't being respected by `analysis-stats` when profiling proc macro expansion, so here's a small fix.
-rw-r--r--src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs b/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs
index 44e56645ba3..2134b033f3f 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/src/cli/analysis_stats.rs
@@ -77,7 +77,11 @@ impl flags::AnalysisStats {
         let metadata_time = db_load_sw.elapsed();
         let load_cargo_config = LoadCargoConfig {
             load_out_dirs_from_check: !self.disable_build_scripts,
-            with_proc_macro_server: ProcMacroServerChoice::Sysroot,
+            with_proc_macro_server: if self.disable_proc_macros {
+                ProcMacroServerChoice::None
+            } else {
+                ProcMacroServerChoice::Sysroot
+            },
             prefill_caches: false,
         };