nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 16:45:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
adcf18e27d
rust/crates/hir_def/src/db.rs

147 lines
5.4 KiB
Rust
Raw Normal View History

Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
//! Defines database & queries for name resolution.
move raw_items to hir_def
2019-10-30 13:12:55 +00:00
use std::sync::Arc;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
Rename ra_db -> base_db
2020-08-13 14:25:38 +00:00
use base_db::{salsa, CrateId, SourceDatabase, Upcast};
Intern block locations and handle them in ModuleId
2021-01-25 18:02:05 +00:00
use hir_expand::{db::AstDatabase, HirFileId};
Remove map module from la-arena public API It’s unlikely that more items will be added to the module, so it’s simpler for users if `ArenaMap` is re-exported and the module made private.
2021-01-15 00:11:07 +00:00
use la_arena::ArenaMap;
Intern block locations and handle them in ModuleId
2021-01-25 18:02:05 +00:00
use syntax::SmolStr;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
move struct & enum data to hir_def
2019-10-31 13:40:36 +00:00
use crate::{
adt::{EnumData, StructData},
Add `AttrsWithOwner` and clean up `source_map`
2021-03-19 20:23:57 +00:00
attr::{Attrs, AttrsWithOwner},
Move body queries to hir_def
2019-11-14 14:37:22 +00:00
body::{scope::ExprScopes, Body, BodySourceMap},
Highlight mutable statics as mutable
2020-05-10 15:08:28 +00:00
data::{ConstData, FunctionData, ImplData, StaticData, TraitData, TypeAliasData},
Move generic_params query to HIR
2019-11-20 17:33:18 +00:00
generics::GenericParams,
Add an ImportMap
2020-05-20 21:51:20 +00:00
import_map::ImportMap,
Hook up query, add impls, lower moar
2020-06-11 17:46:56 +00:00
item_tree::ItemTree,
Move lang_items to hir_def
2019-11-23 09:58:01 +00:00
lang_item::{LangItemTarget, LangItems},
Rename `CrateDefMap` to `DefMap`
2021-01-18 19:18:05 +00:00
nameres::DefMap,
hir_def: move visibility queries from hir_ty to hir_def
2021-03-24 21:59:59 +00:00
visibility::{self, Visibility},
Intern block locations and handle them in ModuleId
2021-01-25 18:02:05 +00:00
AttrDefId, BlockId, BlockLoc, ConstId, ConstLoc, DefWithBodyId, EnumId, EnumLoc, FunctionId,
FunctionLoc, GenericDefId, ImplId, ImplLoc, LocalEnumVariantId, LocalFieldId, StaticId,
StaticLoc, StructId, StructLoc, TraitId, TraitLoc, TypeAliasId, TypeAliasLoc, UnionId,
UnionLoc, VariantId,
move struct & enum data to hir_def
2019-10-31 13:40:36 +00:00
};
move raw_items to hir_def
2019-10-30 13:12:55 +00:00
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::query_group(InternDatabaseStorage)]
pub trait InternDatabase: SourceDatabase {
#[salsa::interned]
Cleanup imports
2019-11-23 12:33:21 +00:00
fn intern_function(&self, loc: FunctionLoc) -> FunctionId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::interned]
Move structs to new loc
2019-12-12 13:58:04 +00:00
fn intern_struct(&self, loc: StructLoc) -> StructId;
Fix hir for ast::UnionDef
2019-11-25 14:30:50 +00:00
#[salsa::interned]
Move enum&union to new loc
2019-12-12 14:11:57 +00:00
fn intern_union(&self, loc: UnionLoc) -> UnionId;
move raw_items to hir_def
2019-10-30 13:12:55 +00:00
#[salsa::interned]
Move enum&union to new loc
2019-12-12 14:11:57 +00:00
fn intern_enum(&self, loc: EnumLoc) -> EnumId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::interned]
Cleanup imports
2019-11-23 12:33:21 +00:00
fn intern_const(&self, loc: ConstLoc) -> ConstId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::interned]
Switch to StaticLoc for statics
2019-11-24 12:13:56 +00:00
fn intern_static(&self, loc: StaticLoc) -> StaticId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::interned]
Move traits to the new loc
2019-12-12 13:34:03 +00:00
fn intern_trait(&self, loc: TraitLoc) -> TraitId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
#[salsa::interned]
Cleanup imports
2019-11-23 12:33:21 +00:00
fn intern_type_alias(&self, loc: TypeAliasLoc) -> TypeAliasId;
Add ImplId
2019-11-15 16:14:50 +00:00
#[salsa::interned]
Switch to the new location for impls
2019-12-12 13:09:13 +00:00
fn intern_impl(&self, loc: ImplLoc) -> ImplId;
Intern block locations and handle them in ModuleId
2021-01-25 18:02:05 +00:00
#[salsa::interned]
fn intern_block(&self, loc: BlockLoc) -> BlockId;
Move ids to hir_def crate
2019-10-30 10:10:38 +00:00
}
move raw_items to hir_def
2019-10-30 13:12:55 +00:00
Get rid of DefDatabase2
2019-11-23 11:44:43 +00:00
#[salsa::query_group(DefDatabaseStorage)]
Use `dyn Trait` for working with databse It improves compile time in `--release` mode quite a bit, it doesn't really slow things down and, conceptually, it seems closer to what we want the physical architecture to look like (we don't want to monomorphise EVERYTHING in a single leaf crate).
2020-03-13 15:05:46 +00:00
pub trait DefDatabase: InternDatabase + AstDatabase + Upcast<dyn AstDatabase> {
Rename `item_tree` query to `file_item_tree`
2021-03-13 01:24:26 +00:00
#[salsa::invoke(ItemTree::file_item_tree_query)]
fn file_item_tree(&self, file_id: HirFileId) -> Arc<ItemTree>;
Hook up query, add impls, lower moar
2020-06-11 17:46:56 +00:00
Normalize waiting queries names
2020-03-06 23:11:52 +00:00
#[salsa::invoke(crate_def_map_wait)]
Cleanup memory usage stats
2020-03-25 17:41:46 +00:00
#[salsa::transparent]
Rename `CrateDefMap` to `DefMap`
2021-01-18 19:18:05 +00:00
fn crate_def_map(&self, krate: CrateId) -> Arc<DefMap>;
Move CrateDefMap to hir_def
2019-10-31 15:45:10 +00:00
Rename `CrateDefMap` to `DefMap`
2021-01-18 19:18:05 +00:00
#[salsa::invoke(DefMap::crate_def_map_query)]
fn crate_def_map_query(&self, krate: CrateId) -> Arc<DefMap>;
Split `crate_def_map` into two methods This change: - introduces `compute_crate_def_map` query and renames `CrateDefMap::crate_def_map_query` for consistency, - annotates `crate_def_map` as `salsa::transparent` and adds a top-level `crate_def_map` wrapper function around that starts the profiler and immediately calls into `compute_crate_def_map` query. This allows us to better understand where we spent the time, in particular, how much is spent in the recomputaiton and how much in salsa. Example output (where we don't actually re-compute anything, but the query still takes a non-trivial amount of time): ``` 211ms - handle_inlay_hints 150ms - get_inlay_hints 150ms - SourceAnalyzer::new 65ms - def_with_body_from_child_node 65ms - analyze_container 65ms - analyze_container 65ms - Module::from_definition 65ms - Module::from_file 65ms - crate_def_map 1ms - parse_macro_query (6 calls) 0ms - raw_items_query (1 calls) 64ms - ??? ``` Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
2020-01-03 12:59:46 +00:00
Update `DefMap` and `block_def_map` docs
2021-02-03 16:48:41 +00:00
/// Computes the block-level `DefMap`, returning `None` when `block` doesn't contain any inner
/// items directly.
///
/// For example:
///
/// ```
/// fn f() { // (0)
/// { // (1)
/// fn inner() {}
/// }
/// }
/// ```
///
/// The `block_def_map` for block 0 would return `None`, while `block_def_map` of block 1 would
/// return a `DefMap` containing `inner`.
Add name resolution query for block expressions
2021-01-21 14:22:17 +00:00
#[salsa::invoke(DefMap::block_def_map_query)]
Shortcut `block_def_map` if there's no inner items This previously didn't work, but apparently only because of the wonky test setup
2021-02-01 12:32:43 +00:00
fn block_def_map(&self, block: BlockId) -> Option<Arc<DefMap>>;
Add name resolution query for block expressions
2021-01-21 14:22:17 +00:00
move struct & enum data to hir_def
2019-10-31 13:40:36 +00:00
#[salsa::invoke(StructData::struct_data_query)]
Fix hir for ast::UnionDef
2019-11-25 14:30:50 +00:00
fn struct_data(&self, id: StructId) -> Arc<StructData>;
#[salsa::invoke(StructData::union_data_query)]
fn union_data(&self, id: UnionId) -> Arc<StructData>;
Move CrateDefMap to hir_def
2019-10-31 15:45:10 +00:00
move struct & enum data to hir_def
2019-10-31 13:40:36 +00:00
#[salsa::invoke(EnumData::enum_data_query)]
fn enum_data(&self, e: EnumId) -> Arc<EnumData>;
Move body queries to hir_def
2019-11-14 14:37:22 +00:00
Remove old impls infrastructure
2019-11-15 18:28:00 +00:00
#[salsa::invoke(ImplData::impl_data_query)]
fn impl_data(&self, e: ImplId) -> Arc<ImplData>;
Move traits to hir_def
2019-11-20 11:22:06 +00:00
#[salsa::invoke(TraitData::trait_data_query)]
fn trait_data(&self, e: TraitId) -> Arc<TraitData>;
Move TypeAlias to hir_def
2019-11-22 09:57:40 +00:00
#[salsa::invoke(TypeAliasData::type_alias_data_query)]
fn type_alias_data(&self, e: TypeAliasId) -> Arc<TypeAliasData>;
Move FunctionData to hir_def
2019-11-22 14:10:51 +00:00
#[salsa::invoke(FunctionData::fn_data_query)]
fn function_data(&self, func: FunctionId) -> Arc<FunctionData>;
Move const&static date to hir_def
2019-11-22 15:46:39 +00:00
#[salsa::invoke(ConstData::const_data_query)]
fn const_data(&self, konst: ConstId) -> Arc<ConstData>;
Highlight mutable statics as mutable
2020-05-10 15:08:28 +00:00
#[salsa::invoke(StaticData::static_data_query)]
fn static_data(&self, konst: StaticId) -> Arc<StaticData>;
Move const&static date to hir_def
2019-11-22 15:46:39 +00:00
Move body queries to hir_def
2019-11-14 14:37:22 +00:00
#[salsa::invoke(Body::body_with_source_map_query)]
fn body_with_source_map(&self, def: DefWithBodyId) -> (Arc<Body>, Arc<BodySourceMap>);
#[salsa::invoke(Body::body_query)]
fn body(&self, def: DefWithBodyId) -> Arc<Body>;
#[salsa::invoke(ExprScopes::expr_scopes_query)]
fn expr_scopes(&self, def: DefWithBodyId) -> Arc<ExprScopes>;
Move generic_params query to HIR
2019-11-20 17:33:18 +00:00
#[salsa::invoke(GenericParams::generic_params_query)]
fn generic_params(&self, def: GenericDefId) -> Arc<GenericParams>;
Move attrs query to hir_def
2019-11-23 08:14:10 +00:00
Introduce new queries to compute 1) the set of attributes for all variants of an enum, and 2) the set of attributes for all fields of a variant. This avoids the current n^2 behavior when rendering completion for variants, which prevents completion for enums with large numbers of variants.
2021-01-04 20:56:21 +00:00
#[salsa::invoke(Attrs::variants_attrs_query)]
fn variants_attrs(&self, def: EnumId) -> Arc<ArenaMap<LocalEnumVariantId, Attrs>>;
#[salsa::invoke(Attrs::fields_attrs_query)]
fn fields_attrs(&self, def: VariantId) -> Arc<ArenaMap<LocalFieldId, Attrs>>;
Add `AttrsWithOwner` and clean up `source_map`
2021-03-19 20:23:57 +00:00
#[salsa::invoke(AttrsWithOwner::attrs_query)]
fn attrs(&self, def: AttrDefId) -> AttrsWithOwner;
Move lang_items to hir_def
2019-11-23 09:58:01 +00:00
#[salsa::invoke(LangItems::crate_lang_items_query)]
fn crate_lang_items(&self, krate: CrateId) -> Arc<LangItems>;
#[salsa::invoke(LangItems::lang_item_query)]
fn lang_item(&self, start_crate: CrateId, item: SmolStr) -> Option<LangItemTarget>;
Move docs to hir_def
2019-11-23 11:43:38 +00:00
Add an ImportMap
2020-05-20 21:51:20 +00:00
#[salsa::invoke(ImportMap::import_map_query)]
fn import_map(&self, krate: CrateId) -> Arc<ImportMap>;
hir_def: move visibility queries from hir_ty to hir_def
2021-03-24 21:59:59 +00:00
#[salsa::invoke(visibility::field_visibilities_query)]
fn field_visibilities(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Visibility>>;
#[salsa::invoke(visibility::function_visibility_query)]
fn function_visibility(&self, def: FunctionId) -> Visibility;
move raw_items to hir_def
2019-10-30 13:12:55 +00:00
}
Split `crate_def_map` into two methods This change: - introduces `compute_crate_def_map` query and renames `CrateDefMap::crate_def_map_query` for consistency, - annotates `crate_def_map` as `salsa::transparent` and adds a top-level `crate_def_map` wrapper function around that starts the profiler and immediately calls into `compute_crate_def_map` query. This allows us to better understand where we spent the time, in particular, how much is spent in the recomputaiton and how much in salsa. Example output (where we don't actually re-compute anything, but the query still takes a non-trivial amount of time): ``` 211ms - handle_inlay_hints 150ms - get_inlay_hints 150ms - SourceAnalyzer::new 65ms - def_with_body_from_child_node 65ms - analyze_container 65ms - analyze_container 65ms - Module::from_definition 65ms - Module::from_file 65ms - crate_def_map 1ms - parse_macro_query (6 calls) 0ms - raw_items_query (1 calls) 64ms - ??? ``` Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
2020-01-03 12:59:46 +00:00
Make two calls virtual
2021-03-05 18:25:24 +00:00
fn crate_def_map_wait(db: &dyn DefDatabase, krate: CrateId) -> Arc<DefMap> {
Rename ra_prof -> profile
2020-08-12 14:32:36 +00:00
let _p = profile::span("crate_def_map:wait");
Normalize waiting queries names
2020-03-06 23:11:52 +00:00
db.crate_def_map_query(krate)
Split `crate_def_map` into two methods This change: - introduces `compute_crate_def_map` query and renames `CrateDefMap::crate_def_map_query` for consistency, - annotates `crate_def_map` as `salsa::transparent` and adds a top-level `crate_def_map` wrapper function around that starts the profiler and immediately calls into `compute_crate_def_map` query. This allows us to better understand where we spent the time, in particular, how much is spent in the recomputaiton and how much in salsa. Example output (where we don't actually re-compute anything, but the query still takes a non-trivial amount of time): ``` 211ms - handle_inlay_hints 150ms - get_inlay_hints 150ms - SourceAnalyzer::new 65ms - def_with_body_from_child_node 65ms - analyze_container 65ms - analyze_container 65ms - Module::from_definition 65ms - Module::from_file 65ms - crate_def_map 1ms - parse_macro_query (6 calls) 0ms - raw_items_query (1 calls) 64ms - ??? ``` Signed-off-by: Michal Terepeta <michal.terepeta@gmail.com>
2020-01-03 12:59:46 +00:00
}
Reference in New Issue Copy Permalink