nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-13 02:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ItemTree to answer enum_data query

Browse Source
This commit is contained in:
Jonas Schievink 2020-06-25 16:52:47 +02:00
parent 563d585594
commit dad2f75b91
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/ra_hir_def/src/adt.rs
View File

@ -8,7 +8,6 @@ use hir_expand::{
InFile, InFile,
}; };
use ra_arena::{map::ArenaMap, Arena}; use ra_arena::{map::ArenaMap, Arena};
use ra_prof::profile;
use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner}; use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner, VisibilityOwner};
use crate::{ use crate::{
@ -84,12 +83,25 @@ impl StructData {
impl EnumData { impl EnumData {
pub(crate) fn enum_data_query(db: &dyn DefDatabase, e: EnumId) -> Arc<EnumData> { pub(crate) fn enum_data_query(db: &dyn DefDatabase, e: EnumId) -> Arc<EnumData> {
let _p = profile("enum_data_query"); let loc = e.lookup(db);
let src = e.lookup(db).source(db); let item_tree = db.item_tree(loc.id.file_id);
let name = src.value.name().map_or_else(Name::missing, |n| n.as_name()); let cfg_options = db.crate_graph()[loc.container.module(db).krate].cfg_options.clone();
let mut trace = Trace::new_for_arena();
lower_enum(db, &mut trace, &src, e.lookup(db).container.module(db)); let enum_ = &item_tree[loc.id.value];
Arc::new(EnumData { name, variants: trace.into_arena() }) let mut variants = Arena::new();
for var_id in enum_.variants.clone() {
if item_tree.attrs(var_id.into()).is_cfg_enabled(&cfg_options) {
let var = &item_tree[var_id];
let var_data = lower_fields(&item_tree, &cfg_options, &var.fields);
variants.alloc(EnumVariantData {
name: var.name.clone(),
variant_data: Arc::new(var_data),
});
}
}
Arc::new(EnumData { name: enum_.name.clone(), variants })
} }
pub fn variant(&self, name: &Name) -> Option<LocalEnumVariantId> { pub fn variant(&self, name: &Name) -> Option<LocalEnumVariantId> {