Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 1ef7a23

Browse files
borsbors
committed
Auto merge of rust-lang#16525 - Veykril:item-loc, r=Veykril
Abstract more over ItemTreeLoc-like structs Allows reducing some code duplication by using functions generic over said structs. The diff isn't negative due to me adding some additional impls for completeness.
2 parents aa97edb + 00303c3 commit 1ef7a23

File tree

28 files changed

+401
-405
lines changed

28 files changed

+401
-405
lines changed

‎crates/hir-def/src/attr.rs‎

Lines changed: 16 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,11 @@ use triomphe::Arc;
2424

2525
use crate::{
2626
db::DefDatabase,
27-
item_tree::{AttrOwner, Fields, ItemTreeId, ItemTreeModItemNode},
27+
item_tree::{AttrOwner, Fields, ItemTreeNode},
2828
lang_item::LangItem,
2929
nameres::{ModuleOrigin, ModuleSource},
3030
src::{HasChildSource, HasSource},
31-
AdtId, AssocItemLoc, AttrDefId, GenericParamId, ItemLoc, LocalFieldId, Lookup, MacroId,
32-
VariantId,
31+
AdtId, AttrDefId, GenericParamId, ItemTreeLoc, LocalFieldId, Lookup, MacroId, VariantId,
3332
};
3433

3534
/// Desugared attributes of an item post `cfg_attr` expansion.
@@ -356,12 +355,7 @@ impl AttrsWithOwner {
356355
AttrDefId::FieldId(it) => {
357356
return db.fields_attrs(it.parent)[it.local_id].clone();
358357
}
359-
// FIXME: DRY this up
360-
AttrDefId::EnumVariantId(it) => {
361-
let id = it.lookup(db).id;
362-
let tree = id.item_tree(db);
363-
tree.raw_attrs(id.value.into()).clone()
364-
}
358+
AttrDefId::EnumVariantId(it) => attrs_from_item_tree_loc(db, it),
365359
AttrDefId::AdtId(it) => match it {
366360
AdtId::StructId(it) => attrs_from_item_tree_loc(db, it),
367361
AdtId::EnumId(it) => attrs_from_item_tree_loc(db, it),
@@ -370,15 +364,15 @@ impl AttrsWithOwner {
370364
AttrDefId::TraitId(it) => attrs_from_item_tree_loc(db, it),
371365
AttrDefId::TraitAliasId(it) => attrs_from_item_tree_loc(db, it),
372366
AttrDefId::MacroId(it) => match it {
373-
MacroId::Macro2Id(it) => attrs_from_item_tree(db, it.lookup(db).id),
374-
MacroId::MacroRulesId(it) => attrs_from_item_tree(db, it.lookup(db).id),
375-
MacroId::ProcMacroId(it) => attrs_from_item_tree(db, it.lookup(db).id),
367+
MacroId::Macro2Id(it) => attrs_from_item_tree_loc(db, it),
368+
MacroId::MacroRulesId(it) => attrs_from_item_tree_loc(db, it),
369+
MacroId::ProcMacroId(it) => attrs_from_item_tree_loc(db, it),
376370
},
377371
AttrDefId::ImplId(it) => attrs_from_item_tree_loc(db, it),
378-
AttrDefId::ConstId(it) => attrs_from_item_tree_assoc(db, it),
379-
AttrDefId::StaticId(it) => attrs_from_item_tree_assoc(db, it),
380-
AttrDefId::FunctionId(it) => attrs_from_item_tree_assoc(db, it),
381-
AttrDefId::TypeAliasId(it) => attrs_from_item_tree_assoc(db, it),
372+
AttrDefId::ConstId(it) => attrs_from_item_tree_loc(db, it),
373+
AttrDefId::StaticId(it) => attrs_from_item_tree_loc(db, it),
374+
AttrDefId::FunctionId(it) => attrs_from_item_tree_loc(db, it),
375+
AttrDefId::TypeAliasId(it) => attrs_from_item_tree_loc(db, it),
382376
AttrDefId::GenericParamId(it) => match it {
383377
GenericParamId::ConstParamId(it) => {
384378
let src = it.parent().child_source(db);
@@ -603,29 +597,14 @@ fn any_has_attrs<'db>(
603597
id.lookup(db).source(db).map(ast::AnyHasAttrs::new)
604598
}
605599

606-
fn attrs_from_item_tree<N: ItemTreeModItemNode>(
607-
db: &dyn DefDatabase,
608-
id: ItemTreeId<N>,
609-
) -> RawAttrs {
610-
let tree = id.item_tree(db);
611-
let mod_item = N::id_to_mod_item(id.value);
612-
tree.raw_attrs(mod_item.into()).clone()
613-
}
614-
615-
fn attrs_from_item_tree_loc<'db, N: ItemTreeModItemNode>(
600+
fn attrs_from_item_tree_loc<'db, N: ItemTreeNode>(
616601
db: &(dyn DefDatabase + 'db),
617-
lookup: impl Lookup<Database<'db> = dyn DefDatabase + 'db, Data = ItemLoc<N>>,
602+
lookup: impl Lookup<Database<'db> = dyn DefDatabase + 'db, Data = impl ItemTreeLoc<Id = N>>,
618603
) -> RawAttrs {
619-
let id = lookup.lookup(db).id;
620-
attrs_from_item_tree(db, id)
621-
}
622-
623-
fn attrs_from_item_tree_assoc<'db, N: ItemTreeModItemNode>(
624-
db: &(dyn DefDatabase + 'db),
625-
lookup: impl Lookup<Database<'db> = dyn DefDatabase + 'db, Data = AssocItemLoc<N>>,
626-
) -> RawAttrs {
627-
let id = lookup.lookup(db).id;
628-
attrs_from_item_tree(db, id)
604+
let id = lookup.lookup(db).item_tree_id();
605+
let tree = id.item_tree(db);
606+
let attr_owner = N::attr_owner(id.value);
607+
tree.raw_attrs(attr_owner).clone()
629608
}
630609

631610
pub(crate) fn fields_attrs_source_map(

‎crates/hir-def/src/child_by_source.rs‎

Lines changed: 49 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@ use hir_expand::{attrs::collect_attrs, HirFileId};
99

1010
use crate::{
1111
db::DefDatabase,
12-
dyn_map::{keys, DynMap},
12+
dyn_map::{
13+
keys::{self, Key},
14+
DynMap,
15+
},
1316
item_scope::ItemScope,
17+
item_tree::ItemTreeNode,
1418
nameres::DefMap,
1519
src::{HasChildSource, HasSource},
16-
AdtId, AssocItemId, DefWithBodyId, EnumId, ExternCrateId, FieldId, ImplId, Lookup, MacroId,
17-
ModuleDefId, ModuleId, TraitId, UseId, VariantId,
20+
AdtId, AssocItemId, DefWithBodyId, EnumId, FieldId, ImplId, ItemTreeLoc, Lookup, MacroId,
21+
ModuleDefId, ModuleId, TraitId, VariantId,
1822
};
1923

2024
pub trait ChildBySource {
@@ -57,24 +61,9 @@ impl ChildBySource for ImplId {
5761

5862
fn add_assoc_item(db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId, item: AssocItemId) {
5963
match item {
60-
AssocItemId::FunctionId(func) => {
61-
let loc = func.lookup(db);
62-
if loc.id.file_id() == file_id {
63-
res[keys::FUNCTION].insert(loc.source(db).value, func)
64-
}
65-
}
66-
AssocItemId::ConstId(konst) => {
67-
let loc = konst.lookup(db);
68-
if loc.id.file_id() == file_id {
69-
res[keys::CONST].insert(loc.source(db).value, konst)
70-
}
71-
}
72-
AssocItemId::TypeAliasId(ty) => {
73-
let loc = ty.lookup(db);
74-
if loc.id.file_id() == file_id {
75-
res[keys::TYPE_ALIAS].insert(loc.source(db).value, ty)
76-
}
77-
}
64+
AssocItemId::FunctionId(func) => insert_item_loc(db, res, file_id, func, keys::FUNCTION),
65+
AssocItemId::ConstId(konst) => insert_item_loc(db, res, file_id, konst, keys::CONST),
66+
AssocItemId::TypeAliasId(ty) => insert_item_loc(db, res, file_id, ty, keys::TYPE_ALIAS),
7867
}
7968
}
8069

@@ -89,15 +78,12 @@ impl ChildBySource for ModuleId {
8978
impl ChildBySource for ItemScope {
9079
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
9180
self.declarations().for_each(|item| add_module_def(db, res, file_id, item));
92-
self.impls().for_each(|imp| add_impl(db, res, file_id, imp));
93-
self.extern_crate_decls().for_each(|ext| add_extern_crate(db, res, file_id, ext));
94-
self.use_decls().for_each(|ext| add_use(db, res, file_id, ext));
95-
self.unnamed_consts(db).for_each(|konst| {
96-
let loc = konst.lookup(db);
97-
if loc.id.file_id() == file_id {
98-
res[keys::CONST].insert(loc.source(db).value, konst);
99-
}
100-
});
81+
self.impls().for_each(|imp| insert_item_loc(db, res, file_id, imp, keys::IMPL));
82+
self.extern_crate_decls()
83+
.for_each(|ext| insert_item_loc(db, res, file_id, ext, keys::EXTERN_CRATE));
84+
self.use_decls().for_each(|ext| insert_item_loc(db, res, file_id, ext, keys::USE));
85+
self.unnamed_consts(db)
86+
.for_each(|konst| insert_item_loc(db, res, file_id, konst, keys::CONST));
10187
self.attr_macro_invocs().filter(|(id, _)| id.file_id == file_id).for_each(
10288
|(ast_id, call_id)| {
10389
res[keys::ATTR_MACRO_CALL].insert(ast_id.to_node(db.upcast()), call_id);
@@ -141,16 +127,22 @@ impl ChildBySource for ItemScope {
141127
}};
142128
}
143129
match item {
144-
ModuleDefId::FunctionId(id) => insert!(map[keys::FUNCTION].insert(id)),
145-
ModuleDefId::ConstId(id) => insert!(map[keys::CONST].insert(id)),
146-
ModuleDefId::StaticId(id) => insert!(map[keys::STATIC].insert(id)),
147-
ModuleDefId::TypeAliasId(id) => insert!(map[keys::TYPE_ALIAS].insert(id)),
148-
ModuleDefId::TraitId(id) => insert!(map[keys::TRAIT].insert(id)),
149-
ModuleDefId::TraitAliasId(id) => insert!(map[keys::TRAIT_ALIAS].insert(id)),
130+
ModuleDefId::FunctionId(id) => {
131+
insert_item_loc(db, map, file_id, id, keys::FUNCTION)
132+
}
133+
ModuleDefId::ConstId(id) => insert_item_loc(db, map, file_id, id, keys::CONST),
134+
ModuleDefId::TypeAliasId(id) => {
135+
insert_item_loc(db, map, file_id, id, keys::TYPE_ALIAS)
136+
}
137+
ModuleDefId::StaticId(id) => insert_item_loc(db, map, file_id, id, keys::STATIC),
138+
ModuleDefId::TraitId(id) => insert_item_loc(db, map, file_id, id, keys::TRAIT),
139+
ModuleDefId::TraitAliasId(id) => {
140+
insert_item_loc(db, map, file_id, id, keys::TRAIT_ALIAS)
141+
}
150142
ModuleDefId::AdtId(adt) => match adt {
151-
AdtId::StructId(id) => insert!(map[keys::STRUCT].insert(id)),
152-
AdtId::UnionId(id) => insert!(map[keys::UNION].insert(id)),
153-
AdtId::EnumId(id) => insert!(map[keys::ENUM].insert(id)),
143+
AdtId::StructId(id) => insert_item_loc(db, map, file_id, id, keys::STRUCT),
144+
AdtId::UnionId(id) => insert_item_loc(db, map, file_id, id, keys::UNION),
145+
AdtId::EnumId(id) => insert_item_loc(db, map, file_id, id, keys::ENUM),
154146
},
155147
ModuleDefId::MacroId(id) => match id {
156148
MacroId::Macro2Id(id) => insert!(map[keys::MACRO2].insert(id)),
@@ -162,29 +154,6 @@ impl ChildBySource for ItemScope {
162154
| ModuleDefId::BuiltinType(_) => (),
163155
}
164156
}
165-
fn add_impl(db: &dyn DefDatabase, map: &mut DynMap, file_id: HirFileId, imp: ImplId) {
166-
let loc = imp.lookup(db);
167-
if loc.id.file_id() == file_id {
168-
map[keys::IMPL].insert(loc.source(db).value, imp)
169-
}
170-
}
171-
fn add_extern_crate(
172-
db: &dyn DefDatabase,
173-
map: &mut DynMap,
174-
file_id: HirFileId,
175-
ext: ExternCrateId,
176-
) {
177-
let loc = ext.lookup(db);
178-
if loc.id.file_id() == file_id {
179-
map[keys::EXTERN_CRATE].insert(loc.source(db).value, ext)
180-
}
181-
}
182-
fn add_use(db: &dyn DefDatabase, map: &mut DynMap, file_id: HirFileId, ext: UseId) {
183-
let loc = ext.lookup(db);
184-
if loc.id.file_id() == file_id {
185-
map[keys::USE].insert(loc.source(db).value, ext)
186-
}
187-
}
188157
}
189158
}
190159

@@ -237,3 +206,21 @@ impl ChildBySource for DefWithBodyId {
237206
}
238207
}
239208
}
209+
210+
fn insert_item_loc<ID, N, Data>(
211+
db: &dyn DefDatabase,
212+
res: &mut DynMap,
213+
file_id: HirFileId,
214+
id: ID,
215+
key: Key<N::Source, ID>,
216+
) where
217+
ID: for<'db> Lookup<Database<'db> = dyn DefDatabase + 'db, Data = Data> + 'static,
218+
Data: ItemTreeLoc<Id = N>,
219+
N: ItemTreeNode,
220+
N::Source: 'static,
221+
{
222+
let loc = id.lookup(db);
223+
if loc.item_tree_id().file_id() == file_id {
224+
res[key].insert(loc.source(db).value, id)
225+
}
226+
}

‎crates/hir-def/src/generics.rs‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -509,47 +509,36 @@ impl GenericParams {
509509
}
510510

511511
fn file_id_and_params_of(
512-
def: GenericDefId,
513512
db: &dyn DefDatabase,
513+
def: GenericDefId,
514514
) -> (HirFileId, Option<ast::GenericParamList>) {
515515
match def {
516-
GenericDefId::FunctionId(it) => {
517-
let src = it.lookup(db).source(db);
518-
(src.file_id, src.value.generic_param_list())
519-
}
520-
GenericDefId::AdtId(AdtId::StructId(it)) => {
521-
let src = it.lookup(db).source(db);
522-
(src.file_id, src.value.generic_param_list())
523-
}
524-
GenericDefId::AdtId(AdtId::UnionId(it)) => {
525-
let src = it.lookup(db).source(db);
526-
(src.file_id, src.value.generic_param_list())
527-
}
528-
GenericDefId::AdtId(AdtId::EnumId(it)) => {
529-
let src = it.lookup(db).source(db);
530-
(src.file_id, src.value.generic_param_list())
531-
}
532-
GenericDefId::TraitId(it) => {
533-
let src = it.lookup(db).source(db);
534-
(src.file_id, src.value.generic_param_list())
535-
}
536-
GenericDefId::TraitAliasId(it) => {
537-
let src = it.lookup(db).source(db);
538-
(src.file_id, src.value.generic_param_list())
539-
}
540-
GenericDefId::TypeAliasId(it) => {
541-
let src = it.lookup(db).source(db);
542-
(src.file_id, src.value.generic_param_list())
543-
}
544-
GenericDefId::ImplId(it) => {
545-
let src = it.lookup(db).source(db);
546-
(src.file_id, src.value.generic_param_list())
547-
}
516+
GenericDefId::FunctionId(it) => file_id_and_params_of_item_loc(db, it),
517+
GenericDefId::TypeAliasId(it) => file_id_and_params_of_item_loc(db, it),
518+
GenericDefId::ConstId(_) => (FileId::BOGUS.into(), None),
519+
GenericDefId::AdtId(AdtId::StructId(it)) => file_id_and_params_of_item_loc(db, it),
520+
GenericDefId::AdtId(AdtId::UnionId(it)) => file_id_and_params_of_item_loc(db, it),
521+
GenericDefId::AdtId(AdtId::EnumId(it)) => file_id_and_params_of_item_loc(db, it),
522+
GenericDefId::TraitId(it) => file_id_and_params_of_item_loc(db, it),
523+
GenericDefId::TraitAliasId(it) => file_id_and_params_of_item_loc(db, it),
524+
GenericDefId::ImplId(it) => file_id_and_params_of_item_loc(db, it),
548525
// We won't be using this ID anyway
549-
GenericDefId::EnumVariantId(_) | GenericDefId::ConstId(_) => (FileId::BOGUS.into(), None),
526+
GenericDefId::EnumVariantId(_) => (FileId::BOGUS.into(), None),
550527
}
551528
}
552529

530+
fn file_id_and_params_of_item_loc<Loc>(
531+
db: &dyn DefDatabase,
532+
def: impl for<'db> Lookup<Database<'db> = dyn DefDatabase + 'db, Data = Loc>,
533+
) -> (HirFileId, Option<ast::GenericParamList>)
534+
where
535+
Loc: HasSource,
536+
Loc::Value: HasGenericParams,
537+
{
538+
let src = def.lookup(db).source(db);
539+
(src.file_id, src.value.generic_param_list())
540+
}
541+
553542
impl HasChildSource<LocalTypeOrConstParamId> for GenericDefId {
554543
type Value = Either<ast::TypeOrConstParam, ast::TraitOrAlias>;
555544
fn child_source(
@@ -559,7 +548,7 @@ impl HasChildSource<LocalTypeOrConstParamId> for GenericDefId {
559548
let generic_params = db.generic_params(*self);
560549
let mut idx_iter = generic_params.type_or_consts.iter().map(|(idx, _)| idx);
561550

562-
let (file_id, generic_params_list) = file_id_and_params_of(*self, db);
551+
let (file_id, generic_params_list) = file_id_and_params_of(db, *self);
563552

564553
let mut params = ArenaMap::default();
565554

@@ -598,7 +587,7 @@ impl HasChildSource<LocalLifetimeParamId> for GenericDefId {
598587
let generic_params = db.generic_params(*self);
599588
let idx_iter = generic_params.lifetimes.iter().map(|(idx, _)| idx);
600589

601-
let (file_id, generic_params_list) = file_id_and_params_of(*self, db);
590+
let (file_id, generic_params_list) = file_id_and_params_of(db, *self);
602591

603592
let mut params = ArenaMap::default();
604593

@@ -614,7 +603,7 @@ impl HasChildSource<LocalLifetimeParamId> for GenericDefId {
614603

615604
impl ChildBySource for GenericDefId {
616605
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap, file_id: HirFileId) {
617-
let (gfile_id, generic_params_list) = file_id_and_params_of(*self, db);
606+
let (gfile_id, generic_params_list) = file_id_and_params_of(db, *self);
618607
if gfile_id != file_id {
619608
return;
620609
}

0 commit comments

Comments
 (0)