about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2023-04-16 21:30:04 +0200
committerLukas Wirth <lukastw97@gmail.com>2023-04-16 21:30:04 +0200
commit76718ea2fcdcf3a7a083717faf09701d9093f067 (patch)
treeb17919bdba4f32e21842231f4246b123fb7ec4ab
parent4ea5d7f6a025f84b92fca9638477898adb9caf4d (diff)
downloadrust-76718ea2fcdcf3a7a083717faf09701d9093f067.tar.gz
rust-76718ea2fcdcf3a7a083717faf09701d9093f067.zip
Bring back LRU limit for macro_expand query
-rw-r--r--crates/hir-def/src/db.rs2
-rw-r--r--crates/ide-db/src/lib.rs6
2 files changed, 6 insertions, 2 deletions
diff --git a/crates/hir-def/src/db.rs b/crates/hir-def/src/db.rs
index ffd39925874..678b0fcb7ed 100644
--- a/crates/hir-def/src/db.rs
+++ b/crates/hir-def/src/db.rs
@@ -93,8 +93,6 @@ pub trait DefDatabase: InternDatabase + ExpandDatabase + Upcast<dyn ExpandDataba
     ///
     /// The `block_def_map` for block 0 would return `None`, while `block_def_map` of block 1 would
     /// return a `DefMap` containing `inner`.
-    // FIXME: This actually can't return None anymore as we no longer allocate block scopes for
-    // non item declaring blocks
     #[salsa::invoke(DefMap::block_def_map_query)]
     fn block_def_map(&self, block: BlockId) -> Arc<DefMap>;
 
diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
index 12b6e3c4bb8..1235449b803 100644
--- a/crates/ide-db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs
@@ -166,6 +166,12 @@ impl RootDatabase {
                 .copied()
                 .unwrap_or(base_db::DEFAULT_LRU_CAP),
         );
+        hir_db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(
+            lru_capacities
+                .get(stringify!(MacroExpandQuery))
+                .copied()
+                .unwrap_or(base_db::DEFAULT_LRU_CAP),
+        );
 
         macro_rules! update_lru_capacity_per_query {
             ($( $module:ident :: $query:ident )*) => {$(