Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #14588 - Veykril:macro-def-err, r=Veykril
fix: Actually bring back LRU limit for macro_expand query
| -rw-r--r-- | crates/hir/src/db.rs | 2 | ||||
| -rw-r--r-- | crates/ide-db/src/lib.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crates/hir/src/db.rs b/crates/hir/src/db.rs index 7ec27af04b..e0cde689fe 100644 --- a/crates/hir/src/db.rs +++ b/crates/hir/src/db.rs @@ -7,7 +7,7 @@ pub use hir_def::db::*; pub use hir_expand::db::{ AstIdMapQuery, ExpandDatabase, ExpandDatabaseStorage, ExpandProcMacroQuery, HygieneFrameQuery, InternMacroCallQuery, MacroArgTextQuery, MacroDefQuery, MacroExpandQuery, - ParseMacroExpansionQuery, + ParseMacroExpansionErrorQuery, ParseMacroExpansionQuery, }; pub use hir_ty::db::*; diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs index 1235449b80..a70a91c99e 100644 --- a/crates/ide-db/src/lib.rs +++ b/crates/ide-db/src/lib.rs @@ -152,6 +152,7 @@ impl RootDatabase { let lru_capacity = lru_capacity.unwrap_or(base_db::DEFAULT_LRU_CAP); base_db::ParseQuery.in_db_mut(self).set_lru_capacity(lru_capacity); hir::db::ParseMacroExpansionQuery.in_db_mut(self).set_lru_capacity(lru_capacity); + hir::db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(lru_capacity); } pub fn update_lru_capacities(&mut self, lru_capacities: &FxHashMap<Box<str>, usize>) { @@ -201,6 +202,7 @@ impl RootDatabase { // hir_db::MacroExpandQuery hir_db::ExpandProcMacroQuery hir_db::HygieneFrameQuery + hir_db::ParseMacroExpansionErrorQuery // DefDatabase hir_db::FileItemTreeQuery |