Skip to content

Commit ab81593

Browse files
ChayimFriedman2ChayimFriedman2
committed
Fix memory usage calculation's queries list
1 parent a05b16b commit ab81593

File tree

2 files changed

+49
-21
lines changed

2 files changed

+49
-21
lines changed

‎src/tools/rust-analyzer/crates/hir/src/db.rs‎

Lines changed: 29 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,43 @@
44
//!
55
//! But we need this for at least LRU caching at the query level.
66
pub use hir_def::db::{
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,
7+
AttrsQuery, BlockDefMapQuery, BlockItemTreeQuery, BlockItemTreeWithSourceMapQuery, BodyQuery,
8+
BodyWithSourceMapQuery, ConstDataQuery, ConstVisibilityQuery, CrateDefMapQuery,
9+
CrateLangItemsQuery, CrateNotableTraitsQuery, CrateSupportsNoStdQuery, DefDatabase,
10+
DefDatabaseStorage, EnumDataQuery, EnumVariantDataWithDiagnosticsQuery,
11+
ExpandProcAttrMacrosQuery, ExprScopesQuery, ExternCrateDeclDataQuery, FieldVisibilitiesQuery,
12+
FieldsAttrsQuery, FieldsAttrsSourceMapQuery, FileItemTreeQuery, FileItemTreeWithSourceMapQuery,
13+
FunctionDataQuery, FunctionVisibilityQuery, GenericParamsQuery,
14+
GenericParamsWithSourceMapQuery, ImplDataWithDiagnosticsQuery, ImportMapQuery,
15+
IncludeMacroInvocQuery, InternAnonymousConstQuery, InternBlockQuery, InternConstQuery,
16+
InternDatabase, InternDatabaseStorage, InternEnumQuery, InternExternBlockQuery,
17+
InternExternCrateQuery, InternFunctionQuery, InternImplQuery, InternInTypeConstQuery,
18+
InternMacro2Query, InternMacroRulesQuery, InternProcMacroQuery, InternStaticQuery,
19+
InternStructQuery, InternTraitAliasQuery, InternTraitQuery, InternTypeAliasQuery,
20+
InternUnionQuery, InternUseQuery, LangItemQuery, Macro2DataQuery, MacroDefQuery,
21+
MacroRulesDataQuery, NotableTraitsInDepsQuery, ProcMacroDataQuery, StaticDataQuery,
22+
StructDataWithDiagnosticsQuery, TraitAliasDataQuery, TraitDataWithDiagnosticsQuery,
23+
TypeAliasDataQuery, UnionDataWithDiagnosticsQuery,
2124
};
2225
pub use hir_expand::db::{
2326
AstIdMapQuery, DeclMacroExpanderQuery, ExpandDatabase, ExpandDatabaseStorage,
2427
ExpandProcMacroQuery, InternMacroCallQuery, InternSyntaxContextQuery, MacroArgQuery,
25-
ParseMacroExpansionErrorQuery, ParseMacroExpansionQuery, ProcMacrosQuery, RealSpanMapQuery,
28+
ParseMacroExpansionErrorQuery, ParseMacroExpansionQuery, ProcMacroSpanQuery, ProcMacrosQuery,
29+
RealSpanMapQuery,
2630
};
2731
pub use hir_ty::db::{
2832
AdtDatumQuery, AdtVarianceQuery, AssociatedTyDataQuery, AssociatedTyValueQuery, BorrowckQuery,
2933
CallableItemSignatureQuery, ConstEvalDiscriminantQuery, ConstEvalQuery, ConstEvalStaticQuery,
30-
ConstParamTyQuery, FieldTypesQuery, FnDefDatumQuery, FnDefVarianceQuery, GenericDefaultsQuery,
31-
GenericPredicatesForParamQuery, GenericPredicatesQuery, HirDatabase, HirDatabaseStorage,
32-
ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery, IncoherentInherentImplCratesQuery,
34+
ConstParamTyQuery, DynCompatibilityOfTraitQuery, FieldTypesQuery, FnDefDatumQuery,
35+
FnDefVarianceQuery, GenericDefaultsQuery, GenericPredicatesForParamQuery,
36+
GenericPredicatesQuery, GenericPredicatesWithoutParentQuery, HirDatabase, HirDatabaseStorage,
37+
ImplDatumQuery, ImplSelfTyQuery, ImplTraitQuery, IncoherentInherentImplCratesQuery, InferQuery,
3338
InherentImplsInBlockQuery, InherentImplsInCrateQuery, InternCallableDefQuery,
3439
InternClosureQuery, InternCoroutineQuery, InternImplTraitIdQuery, InternLifetimeParamIdQuery,
35-
InternTypeOrConstParamIdQuery, LayoutOfAdtQuery, MirBodyQuery, ProgramClausesForChalkEnvQuery,
36-
ReturnTypeImplTraitsQuery, TargetDataLayoutQuery, TraitDatumQuery, TraitEnvironmentQuery,
37-
TraitImplsInBlockQuery, TraitImplsInCrateQuery, TraitImplsInDepsQuery, TyQuery, ValueTyQuery,
40+
InternTypeOrConstParamIdQuery, LayoutOfAdtQuery, LayoutOfTyQuery, LookupImplMethodQuery,
41+
MirBodyForClosureQuery, MirBodyQuery, MonomorphizedMirBodyForClosureQuery,
42+
MonomorphizedMirBodyQuery, ProgramClausesForChalkEnvQuery, ReturnTypeImplTraitsQuery,
43+
TargetDataLayoutQuery, TraitDatumQuery, TraitEnvironmentQuery, TraitImplsInBlockQuery,
44+
TraitImplsInCrateQuery, TraitImplsInDepsQuery, TraitSolveQuery, TyQuery,
45+
TypeAliasImplTraitsQuery, ValueTyQuery,
3846
};

‎src/tools/rust-analyzer/crates/ide-db/src/apply_change.rs‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,16 +100,19 @@ impl RootDatabase {
100100
hir::db::ConstEvalQuery
101101
hir::db::ConstEvalStaticQuery
102102
hir::db::ConstParamTyQuery
103+
hir::db::DynCompatibilityOfTraitQuery
103104
hir::db::FieldTypesQuery
104105
hir::db::FnDefDatumQuery
105106
hir::db::FnDefVarianceQuery
106107
hir::db::GenericDefaultsQuery
107108
hir::db::GenericPredicatesForParamQuery
108109
hir::db::GenericPredicatesQuery
110+
hir::db::GenericPredicatesWithoutParentQuery
109111
hir::db::ImplDatumQuery
110112
hir::db::ImplSelfTyQuery
111113
hir::db::ImplTraitQuery
112114
hir::db::IncoherentInherentImplCratesQuery
115+
hir::db::InferQuery
113116
hir::db::InherentImplsInBlockQuery
114117
hir::db::InherentImplsInCrateQuery
115118
hir::db::InternCallableDefQuery
@@ -119,7 +122,12 @@ impl RootDatabase {
119122
hir::db::InternLifetimeParamIdQuery
120123
hir::db::InternTypeOrConstParamIdQuery
121124
hir::db::LayoutOfAdtQuery
125+
hir::db::LayoutOfTyQuery
126+
hir::db::LookupImplMethodQuery
127+
hir::db::MirBodyForClosureQuery
122128
hir::db::MirBodyQuery
129+
hir::db::MonomorphizedMirBodyForClosureQuery
130+
hir::db::MonomorphizedMirBodyQuery
123131
hir::db::ProgramClausesForChalkEnvQuery
124132
hir::db::ReturnTypeImplTraitsQuery
125133
hir::db::TargetDataLayoutQuery
@@ -128,13 +136,16 @@ impl RootDatabase {
128136
hir::db::TraitImplsInBlockQuery
129137
hir::db::TraitImplsInCrateQuery
130138
hir::db::TraitImplsInDepsQuery
139+
hir::db::TraitSolveQuery
131140
hir::db::TyQuery
141+
hir::db::TypeAliasImplTraitsQuery
132142
hir::db::ValueTyQuery
133143

134144
// DefDatabase
135145
hir::db::AttrsQuery
136146
hir::db::BlockDefMapQuery
137147
hir::db::BlockItemTreeQuery
148+
hir::db::BlockItemTreeWithSourceMapQuery
138149
hir::db::BodyQuery
139150
hir::db::BodyWithSourceMapQuery
140151
hir::db::ConstDataQuery
@@ -145,17 +156,21 @@ impl RootDatabase {
145156
hir::db::CrateSupportsNoStdQuery
146157
hir::db::EnumDataQuery
147158
hir::db::EnumVariantDataWithDiagnosticsQuery
159+
hir::db::ExpandProcAttrMacrosQuery
148160
hir::db::ExprScopesQuery
149161
hir::db::ExternCrateDeclDataQuery
150162
hir::db::FieldVisibilitiesQuery
151163
hir::db::FieldsAttrsQuery
152164
hir::db::FieldsAttrsSourceMapQuery
153165
hir::db::FileItemTreeQuery
166+
hir::db::FileItemTreeWithSourceMapQuery
154167
hir::db::FunctionDataQuery
155168
hir::db::FunctionVisibilityQuery
156169
hir::db::GenericParamsQuery
170+
hir::db::GenericParamsWithSourceMapQuery
157171
hir::db::ImplDataWithDiagnosticsQuery
158172
hir::db::ImportMapQuery
173+
hir::db::IncludeMacroInvocQuery
159174
hir::db::InternAnonymousConstQuery
160175
hir::db::InternBlockQuery
161176
hir::db::InternConstQuery
@@ -177,7 +192,9 @@ impl RootDatabase {
177192
hir::db::InternUseQuery
178193
hir::db::LangItemQuery
179194
hir::db::Macro2DataQuery
195+
hir::db::MacroDefQuery
180196
hir::db::MacroRulesDataQuery
197+
hir::db::NotableTraitsInDepsQuery
181198
hir::db::ProcMacroDataQuery
182199
hir::db::StaticDataQuery
183200
hir::db::StructDataWithDiagnosticsQuery
@@ -212,6 +229,7 @@ impl RootDatabase {
212229
hir::db::MacroArgQuery
213230
hir::db::ParseMacroExpansionErrorQuery
214231
hir::db::ParseMacroExpansionQuery
232+
hir::db::ProcMacroSpanQuery
215233
hir::db::ProcMacrosQuery
216234
hir::db::RealSpanMapQuery
217235

@@ -220,7 +238,9 @@ impl RootDatabase {
220238

221239
// SourceDatabase
222240
base_db::ParseQuery
241+
base_db::ParseErrorsQuery
223242
base_db::CrateGraphQuery
243+
base_db::CrateWorkspaceDataQuery
224244

225245
// SourceDatabaseExt
226246
base_db::FileTextQuery

0 commit comments

Comments
 (0)