Skip to content

Commit 450860a

Browse files
authored
Merge pull request rust-lang#21151 from ChayimFriedman2/no-cache-prime
fix: Don't run cache priming when disabled in settings
2 parents 74e9798 + f7be635 commit 450860a

File tree

1 file changed

+2
-2
lines changed
  • src/tools/rust-analyzer/crates/rust-analyzer/src

1 file changed

+2
-2
lines changed

src/tools/rust-analyzer/crates/rust-analyzer/src/main_loop.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,8 +485,8 @@ impl GlobalState {
485485
}
486486
// delay initial cache priming until proc macros are loaded, or we will load up a bunch of garbage into salsa
487487
let proc_macros_loaded = self.config.prefill_caches()
488-
&& !self.config.expand_proc_macros()
489-
|| self.fetch_proc_macros_queue.last_op_result().copied().unwrap_or(false);
488+
&& (!self.config.expand_proc_macros()
489+
|| self.fetch_proc_macros_queue.last_op_result().copied().unwrap_or(false));
490490
if proc_macros_loaded {
491491
self.prime_caches_queue.request_op("became quiescent".to_owned(), ());
492492
}

0 commit comments

Comments
 (0)