From 93aeb16eb21709de38ba8484fa82ed4e05ae5665 Mon Sep 17 00:00:00 2001 From: Jonas Schievink Date: Fri, 19 Mar 2021 19:56:13 +0100 Subject: Return `Either` from `MacroDefId::ast_id` --- crates/hir_def/src/attr.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'crates/hir_def/src/attr.rs') diff --git a/crates/hir_def/src/attr.rs b/crates/hir_def/src/attr.rs index 0360fb627..beeaaf117 100644 --- a/crates/hir_def/src/attr.rs +++ b/crates/hir_def/src/attr.rs @@ -208,9 +208,10 @@ impl Attrs { AdtId::UnionId(it) => attrs_from_item_tree(it.lookup(db).id, db), }, AttrDefId::TraitId(it) => attrs_from_item_tree(it.lookup(db).id, db), - AttrDefId::MacroDefId(it) => { - it.ast_id().map_or_else(Default::default, |ast_id| attrs_from_ast(ast_id, db)) - } + AttrDefId::MacroDefId(it) => it + .ast_id() + .left() + .map_or_else(Default::default, |ast_id| attrs_from_ast(ast_id, db)), AttrDefId::ImplId(it) => attrs_from_item_tree(it.lookup(db).id, db), AttrDefId::ConstId(it) => attrs_from_item_tree(it.lookup(db).id, db), AttrDefId::StaticId(it) => attrs_from_item_tree(it.lookup(db).id, db), -- cgit v1.2.3