mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #8352

Browse Source 
8352: Remove dead legacy macro expansion code r=lnicola a=brandondong

I was investigating some unrelated macro issue when I noticed this dead code. This legacy macro expansion logic was changed in https://github.com/rust-analyzer/rust-analyzer/pull/8128.

Co-authored-by: Brandon <brandondong604@hotmail.com>
This commit is contained in:
bors[bot] 2021-04-05 19:00:27 +00:00 committed by GitHub
commit 72781085bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/hir_def/src/nameres/collector.rs
View File

@ -215,7 +215,7 @@ struct MacroDirective {
#[derive(Clone, Debug, Eq, PartialEq)]
enum MacroDirectiveKind {
FnLike { ast_id: AstIdWithPath<ast::MacroCall>, legacy: Option<MacroCallId> },
FnLike { ast_id: AstIdWithPath<ast::MacroCall> },
Derive { ast_id: AstIdWithPath<ast::Item> },
}
@ -806,13 +806,7 @@ impl DefCollector<'_> {
let mut res = ReachedFixedPoint::Yes;
macros.retain(|directive| {
match &directive.kind {
MacroDirectiveKind::FnLike { ast_id, legacy } => {
if let Some(call_id) = legacy {
res = ReachedFixedPoint::No;
resolved.push((directive.module_id, *call_id, directive.depth));
return false;
}
MacroDirectiveKind::FnLike { ast_id } => {
match macro_call_as_call_id(
ast_id,
self.db,
@ -1535,7 +1529,7 @@ impl ModCollector<'_, '_> {
self.def_collector.unexpanded_macros.push(MacroDirective {
module_id: self.module_id,
depth: self.macro_depth + 1,
kind: MacroDirectiveKind::FnLike { ast_id, legacy: None },
kind: MacroDirectiveKind::FnLike { ast_id },
});
}