Skip to content

Commit bab80da

Browse files
committed
Auto merge of rust-lang#14588 - Veykril:macro-def-err, r=Veykril
fix: Actually bring back LRU limit for macro_expand query
2 parents 9b54e39 + fd4bbca commit bab80da

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

crates/hir/src/db.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pub use hir_def::db::*;
77
pub use hir_expand::db::{
88
AstIdMapQuery, ExpandDatabase, ExpandDatabaseStorage, ExpandProcMacroQuery, HygieneFrameQuery,
99
InternMacroCallQuery, MacroArgTextQuery, MacroDefQuery, MacroExpandQuery,
10-
ParseMacroExpansionQuery,
10+
ParseMacroExpansionErrorQuery, ParseMacroExpansionQuery,
1111
};
1212
pub use hir_ty::db::*;
1313

crates/ide-db/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ impl RootDatabase {
152152
let lru_capacity = lru_capacity.unwrap_or(base_db::DEFAULT_LRU_CAP);
153153
base_db::ParseQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
154154
hir::db::ParseMacroExpansionQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
155+
hir::db::MacroExpandQuery.in_db_mut(self).set_lru_capacity(lru_capacity);
155156
}
156157

157158
pub fn update_lru_capacities(&mut self, lru_capacities: &FxHashMap<Box<str>, usize>) {
@@ -201,6 +202,7 @@ impl RootDatabase {
201202
// hir_db::MacroExpandQuery
202203
hir_db::ExpandProcMacroQuery
203204
hir_db::HygieneFrameQuery
205+
hir_db::ParseMacroExpansionErrorQuery
204206

205207
// DefDatabase
206208
hir_db::FileItemTreeQuery

0 commit comments

Comments
 (0)