Skip to content

Commit b256807

Browse files
borsbors
committed
Auto merge of #17092 - Veykril:per-queries, r=Veykril
minor: Update `per_query_memory_usage` query listing
2 parents 91b8441 + 011c212 commit b256807

2 files changed

Lines changed: 100 additions & 69 deletions

File tree

‎crates/hir/src/db.rs‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,35 @@
44
//!
55
//! But we need this for at least LRU caching at the query level.
66
pubuse hir_def::db::{
7-
AttrsQuery,BlockDefMapQuery,BodyQuery,BodyWithSourceMapQuery,ConstDataQuery,
8-
ConstVisibilityQuery,CrateLangItemsQuery,CrateSupportsNoStdQuery,DefDatabase,
9-
DefDatabaseStorage,EnumDataQuery,EnumVariantDataWithDiagnosticsQuery,ExprScopesQuery,
10-
ExternCrateDeclDataQuery,FieldVisibilitiesQuery,FieldsAttrsQuery,FieldsAttrsSourceMapQuery,
11-
FileItemTreeQuery,FunctionDataQuery,FunctionVisibilityQuery,GenericParamsQuery,
12-
ImplDataWithDiagnosticsQuery,ImportMapQuery,InternAnonymousConstQuery,InternBlockQuery,
13-
InternConstQuery,InternDatabase,InternDatabaseStorage,InternEnumQuery,
14-
InternExternBlockQuery,InternExternCrateQuery,InternFunctionQuery,InternImplQuery,
15-
InternInTypeConstQuery,InternMacro2Query,InternMacroRulesQuery,InternProcMacroQuery,
16-
InternStaticQuery,InternStructQuery,InternTraitAliasQuery,InternTraitQuery,
17-
InternTypeAliasQuery,InternUnionQuery,InternUseQuery,LangItemQuery,Macro2DataQuery,
18-
MacroRulesDataQuery,ProcMacroDataQuery,StaticDataQuery,StructDataWithDiagnosticsQuery,
19-
TraitAliasDataQuery,TraitDataWithDiagnosticsQuery,TypeAliasDataQuery,
20-
UnionDataWithDiagnosticsQuery,
7+
AttrsQuery,BlockDefMapQuery,BlockItemTreeQuery,BodyQuery,BodyWithSourceMapQuery,
8+
ConstDataQuery,ConstVisibilityQuery,CrateDefMapQuery,CrateLangItemsQuery,
9+
CrateNotableTraitsQuery,CrateSupportsNoStdQuery,DefDatabase,DefDatabaseStorage,
10+
EnumDataQuery,EnumVariantDataWithDiagnosticsQuery,ExprScopesQuery,ExternCrateDeclDataQuery,
11+
FieldVisibilitiesQuery,FieldsAttrsQuery,FieldsAttrsSourceMapQuery,FileItemTreeQuery,
12+
FunctionDataQuery,FunctionVisibilityQuery,GenericParamsQuery,ImplDataWithDiagnosticsQuery,
13+
ImportMapQuery,InternAnonymousConstQuery,InternBlockQuery,InternConstQuery,InternDatabase,
14+
InternDatabaseStorage,InternEnumQuery,InternExternBlockQuery,InternExternCrateQuery,
15+
InternFunctionQuery,InternImplQuery,InternInTypeConstQuery,InternMacro2Query,
16+
InternMacroRulesQuery,InternProcMacroQuery,InternStaticQuery,InternStructQuery,
17+
InternTraitAliasQuery,InternTraitQuery,InternTypeAliasQuery,InternUnionQuery,
18+
InternUseQuery,LangItemQuery,Macro2DataQuery,MacroRulesDataQuery,ProcMacroDataQuery,
19+
StaticDataQuery,StructDataWithDiagnosticsQuery,TraitAliasDataQuery,
20+
TraitDataWithDiagnosticsQuery,TypeAliasDataQuery,UnionDataWithDiagnosticsQuery,
2121
};
2222
pubuse hir_expand::db::{
2323
AstIdMapQuery,DeclMacroExpanderQuery,ExpandDatabase,ExpandDatabaseStorage,
2424
ExpandProcMacroQuery,InternMacroCallQuery,InternSyntaxContextQuery,MacroArgQuery,
2525
ParseMacroExpansionErrorQuery,ParseMacroExpansionQuery,ProcMacrosQuery,RealSpanMapQuery,
2626
};
27-
pubuse hir_ty::db::*;
27+
pubuse hir_ty::db::{
28+
AdtDatumQuery,AdtVarianceQuery,AssociatedTyDataQuery,AssociatedTyValueQuery,BorrowckQuery,
29+
CallableItemSignatureQuery,ConstEvalDiscriminantQuery,ConstEvalQuery,ConstEvalStaticQuery,
30+
ConstParamTyQuery,FieldTypesQuery,FnDefDatumQuery,FnDefVarianceQuery,GenericDefaultsQuery,
31+
GenericPredicatesForParamQuery,GenericPredicatesQuery,HirDatabase,HirDatabaseStorage,
32+
ImplDatumQuery,ImplSelfTyQuery,ImplTraitQuery,IncoherentInherentImplCratesQuery,
33+
InherentImplsInBlockQuery,InherentImplsInCrateQuery,InternCallableDefQuery,
34+
InternClosureQuery,InternCoroutineQuery,InternImplTraitIdQuery,InternLifetimeParamIdQuery,
35+
InternTypeOrConstParamIdQuery,LayoutOfAdtQuery,MirBodyQuery,ProgramClausesForChalkEnvQuery,
36+
ReturnTypeImplTraitsQuery,TargetDataLayoutQuery,TraitDatumQuery,TraitEnvironmentQuery,
37+
TraitImplsInBlockQuery,TraitImplsInCrateQuery,TraitImplsInDepsQuery,TyQuery,ValueTyQuery,
38+
};

‎crates/ide-db/src/apply_change.rs‎

Lines changed: 74 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -91,82 +91,101 @@ impl RootDatabase {
9191
crate::symbol_index::LocalRootsQuery
9292
crate::symbol_index::LibraryRootsQuery
9393
// HirDatabase
94-
hir::db::MirBodyQuery
94+
hir::db::AdtDatumQuery
95+
hir::db::AdtVarianceQuery
96+
hir::db::AssociatedTyDataQuery
97+
hir::db::AssociatedTyValueQuery
9598
hir::db::BorrowckQuery
96-
hir::db::TyQuery
97-
hir::db::ValueTyQuery
98-
hir::db::ImplSelfTyQuery
99-
hir::db::ConstParamTyQuery
100-
hir::db::ConstEvalQuery
99+
hir::db::CallableItemSignatureQuery
101100
hir::db::ConstEvalDiscriminantQuery
102-
hir::db::ImplTraitQuery
101+
hir::db::ConstEvalQuery
102+
hir::db::ConstEvalStaticQuery
103+
hir::db::ConstParamTyQuery
103104
hir::db::FieldTypesQuery
104-
hir::db::LayoutOfAdtQuery
105-
hir::db::TargetDataLayoutQuery
106-
hir::db::CallableItemSignatureQuery
107-
hir::db::ReturnTypeImplTraitsQuery
105+
hir::db::FnDefDatumQuery
106+
hir::db::FnDefVarianceQuery
107+
hir::db::GenericDefaultsQuery
108108
hir::db::GenericPredicatesForParamQuery
109109
hir::db::GenericPredicatesQuery
110-
hir::db::TraitEnvironmentQuery
111-
hir::db::GenericDefaultsQuery
112-
hir::db::InherentImplsInCrateQuery
113-
hir::db::InherentImplsInBlockQuery
110+
hir::db::ImplDatumQuery
111+
hir::db::ImplSelfTyQuery
112+
hir::db::ImplTraitQuery
114113
hir::db::IncoherentInherentImplCratesQuery
115-
hir::db::TraitImplsInCrateQuery
116-
hir::db::TraitImplsInBlockQuery
117-
hir::db::TraitImplsInDepsQuery
114+
hir::db::InherentImplsInBlockQuery
115+
hir::db::InherentImplsInCrateQuery
118116
hir::db::InternCallableDefQuery
119-
hir::db::InternLifetimeParamIdQuery
120-
hir::db::InternImplTraitIdQuery
121-
hir::db::InternTypeOrConstParamIdQuery
122117
hir::db::InternClosureQuery
123118
hir::db::InternCoroutineQuery
124-
hir::db::AssociatedTyDataQuery
125-
hir::db::TraitDatumQuery
126-
hir::db::AdtDatumQuery
127-
hir::db::ImplDatumQuery
128-
hir::db::FnDefDatumQuery
129-
hir::db::FnDefVarianceQuery
130-
hir::db::AdtVarianceQuery
131-
hir::db::AssociatedTyValueQuery
119+
hir::db::InternImplTraitIdQuery
120+
hir::db::InternLifetimeParamIdQuery
121+
hir::db::InternTypeOrConstParamIdQuery
122+
hir::db::LayoutOfAdtQuery
123+
hir::db::MirBodyQuery
132124
hir::db::ProgramClausesForChalkEnvQuery
125+
hir::db::ReturnTypeImplTraitsQuery
126+
hir::db::TargetDataLayoutQuery
127+
hir::db::TraitDatumQuery
128+
hir::db::TraitEnvironmentQuery
129+
hir::db::TraitImplsInBlockQuery
130+
hir::db::TraitImplsInCrateQuery
131+
hir::db::TraitImplsInDepsQuery
132+
hir::db::TyQuery
133+
hir::db::ValueTyQuery
133134

134135
// DefDatabase
135-
hir::db::FileItemTreeQuery
136+
hir::db::AttrsQuery
136137
hir::db::BlockDefMapQuery
137-
hir::db::StructDataWithDiagnosticsQuery
138-
hir::db::UnionDataWithDiagnosticsQuery
138+
hir::db::BlockItemTreeQuery
139+
hir::db::BodyQuery
140+
hir::db::BodyWithSourceMapQuery
141+
hir::db::ConstDataQuery
142+
hir::db::ConstVisibilityQuery
143+
hir::db::CrateDefMapQuery
144+
hir::db::CrateLangItemsQuery
145+
hir::db::CrateNotableTraitsQuery
146+
hir::db::CrateSupportsNoStdQuery
139147
hir::db::EnumDataQuery
140148
hir::db::EnumVariantDataWithDiagnosticsQuery
141-
hir::db::ImplDataWithDiagnosticsQuery
142-
hir::db::TraitDataWithDiagnosticsQuery
143-
hir::db::TraitAliasDataQuery
144-
hir::db::TypeAliasDataQuery
145-
hir::db::FunctionDataQuery
146-
hir::db::ConstDataQuery
147-
hir::db::StaticDataQuery
148-
hir::db::Macro2DataQuery
149-
hir::db::MacroRulesDataQuery
150-
hir::db::ProcMacroDataQuery
151-
hir::db::BodyWithSourceMapQuery
152-
hir::db::BodyQuery
153149
hir::db::ExprScopesQuery
154-
hir::db::GenericParamsQuery
150+
hir::db::ExternCrateDeclDataQuery
151+
hir::db::FieldVisibilitiesQuery
155152
hir::db::FieldsAttrsQuery
156153
hir::db::FieldsAttrsSourceMapQuery
157-
hir::db::AttrsQuery
158-
hir::db::CrateLangItemsQuery
159-
hir::db::LangItemQuery
160-
hir::db::ImportMapQuery
161-
hir::db::FieldVisibilitiesQuery
154+
hir::db::FileItemTreeQuery
155+
hir::db::FunctionDataQuery
162156
hir::db::FunctionVisibilityQuery
163-
hir::db::ConstVisibilityQuery
164-
hir::db::CrateSupportsNoStdQuery
165-
hir::db::ExternCrateDeclDataQuery
157+
hir::db::GenericParamsQuery
158+
hir::db::ImplDataWithDiagnosticsQuery
159+
hir::db::ImportMapQuery
166160
hir::db::InternAnonymousConstQuery
161+
hir::db::InternBlockQuery
162+
hir::db::InternConstQuery
163+
hir::db::InternEnumQuery
164+
hir::db::InternExternBlockQuery
167165
hir::db::InternExternCrateQuery
166+
hir::db::InternFunctionQuery
167+
hir::db::InternImplQuery
168168
hir::db::InternInTypeConstQuery
169+
hir::db::InternMacro2Query
170+
hir::db::InternMacroRulesQuery
171+
hir::db::InternProcMacroQuery
172+
hir::db::InternStaticQuery
173+
hir::db::InternStructQuery
174+
hir::db::InternTraitAliasQuery
175+
hir::db::InternTraitQuery
176+
hir::db::InternTypeAliasQuery
177+
hir::db::InternUnionQuery
169178
hir::db::InternUseQuery
179+
hir::db::LangItemQuery
180+
hir::db::Macro2DataQuery
181+
hir::db::MacroRulesDataQuery
182+
hir::db::ProcMacroDataQuery
183+
hir::db::StaticDataQuery
184+
hir::db::StructDataWithDiagnosticsQuery
185+
hir::db::TraitAliasDataQuery
186+
hir::db::TraitDataWithDiagnosticsQuery
187+
hir::db::TypeAliasDataQuery
188+
hir::db::UnionDataWithDiagnosticsQuery
170189

171190
// InternDatabase
172191
hir::db::InternFunctionQuery
@@ -192,9 +211,10 @@ impl RootDatabase {
192211
hir::db::InternMacroCallQuery
193212
hir::db::InternSyntaxContextQuery
194213
hir::db::MacroArgQuery
214+
hir::db::ParseMacroExpansionErrorQuery
195215
hir::db::ParseMacroExpansionQuery
196-
hir::db::RealSpanMapQuery
197216
hir::db::ProcMacrosQuery
217+
hir::db::RealSpanMapQuery
198218

199219
// LineIndexDatabase
200220
crate::LineIndexQuery

0 commit comments

Comments
 (0)