Skip to content

Commit 4dbec2d

Browse files
author
Brandon
committed
Remove dead legacy macro expansion code
1 parent 97dbbad commit 4dbec2d

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

crates/hir_def/src/nameres/collector.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ struct MacroDirective {
207207

208208
#[derive(Clone, Debug, Eq, PartialEq)]
209209
enum MacroDirectiveKind {
210-
FnLike { ast_id: AstIdWithPath<ast::MacroCall>, legacy: Option<MacroCallId> },
210+
FnLike { ast_id: AstIdWithPath<ast::MacroCall> },
211211
Derive { ast_id: AstIdWithPath<ast::Item> },
212212
}
213213

@@ -783,13 +783,7 @@ impl DefCollector<'_> {
783783
let mut res = ReachedFixedPoint::Yes;
784784
macros.retain(|directive| {
785785
match &directive.kind {
786-
MacroDirectiveKind::FnLike { ast_id, legacy } => {
787-
if let Some(call_id) = legacy {
788-
res = ReachedFixedPoint::No;
789-
resolved.push((directive.module_id, *call_id, directive.depth));
790-
return false;
791-
}
792-
786+
MacroDirectiveKind::FnLike { ast_id } => {
793787
match macro_call_as_call_id(
794788
ast_id,
795789
self.db,
@@ -1493,7 +1487,7 @@ impl ModCollector<'_, '_> {
14931487
self.def_collector.unexpanded_macros.push(MacroDirective {
14941488
module_id: self.module_id,
14951489
depth: self.macro_depth + 1,
1496-
kind: MacroDirectiveKind::FnLike { ast_id, legacy: None },
1490+
kind: MacroDirectiveKind::FnLike { ast_id },
14971491
});
14981492
}
14991493

0 commit comments

Comments
 (0)