ids::SourceFileItemId,
};
-#[salsa::query_group(HirDatabaseStorage)]
-pub trait HirDatabase: SourceDatabase + AsRef<HirInterner> {
+#[salsa::query_group(PersistentHirDatabaseStorage)]
+pub trait PersistentHirDatabase: SourceDatabase + AsRef<HirInterner> {
#[salsa::invoke(HirFileId::hir_parse)]
fn hir_parse(&self, file_id: HirFileId) -> TreeArc<SourceFile>;
#[salsa::invoke(crate::adt::EnumData::enum_data_query)]
fn enum_data(&self, e: Enum) -> Arc<EnumData>;
- #[salsa::invoke(crate::ty::infer)]
- fn infer(&self, func: Function) -> Arc<InferenceResult>;
-
- #[salsa::invoke(crate::ty::type_for_def)]
- fn type_for_def(&self, def: TypableDef) -> Ty;
-
- #[salsa::invoke(crate::ty::type_for_field)]
- fn type_for_field(&self, field: StructField) -> Ty;
-
#[salsa::invoke(query_definitions::file_items)]
fn file_items(&self, file_id: HirFileId) -> Arc<SourceFileItems>;
- #[salsa::invoke(query_definitions::file_item)]
- fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>;
-
#[salsa::invoke(crate::module_tree::Submodule::submodules_query)]
fn submodules(
&self,
#[salsa::invoke(crate::ty::method_resolution::CrateImplBlocks::impls_in_crate_query)]
fn impls_in_crate(&self, krate: Crate) -> Arc<CrateImplBlocks>;
- #[salsa::invoke(crate::expr::body_hir)]
- fn body_hir(&self, func: Function) -> Arc<crate::expr::Body>;
-
- #[salsa::invoke(crate::expr::body_syntax_mapping)]
- fn body_syntax_mapping(&self, func: Function) -> Arc<crate::expr::BodySyntaxMapping>;
-
#[salsa::invoke(crate::generics::GenericParams::generic_params_query)]
fn generic_params(&self, def: GenericDef) -> Arc<GenericParams>;
#[salsa::invoke(crate::FnSignature::fn_signature_query)]
fn fn_signature(&self, func: Function) -> Arc<FnSignature>;
}
+
+#[salsa::query_group(HirDatabaseStorage)]
+pub trait HirDatabase: PersistentHirDatabase {
+ #[salsa::invoke(query_definitions::fn_scopes)]
+ fn fn_scopes(&self, func: Function) -> Arc<FnScopes>;
+
+ #[salsa::invoke(query_definitions::file_item)]
+ fn file_item(&self, source_item_id: SourceItemId) -> TreeArc<SyntaxNode>;
+
+ #[salsa::invoke(crate::ty::infer)]
+ fn infer(&self, func: Function) -> Arc<InferenceResult>;
+
+ #[salsa::invoke(crate::ty::type_for_def)]
+ fn type_for_def(&self, def: TypableDef) -> Ty;
+
+ #[salsa::invoke(crate::ty::type_for_field)]
+ fn type_for_field(&self, field: StructField) -> Ty;
+
+ #[salsa::invoke(crate::expr::body_hir)]
+ fn body_hir(&self, func: Function) -> Arc<crate::expr::Body>;
+
+ #[salsa::invoke(crate::expr::body_syntax_mapping)]
+ fn body_syntax_mapping(&self, func: Function) -> Arc<crate::expr::BodySyntaxMapping>;
+}