bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Handle Annotatable::Stmt in some builtin macros

Browse source 
This is preparation for PR #78296, which will require us to handle
statement items in addition to normal items.
This commit is contained in:
Aaron Hill 2020-11-22 19:32:39 -05:00
parent 25a691003c
commit e9546bdbaf
No known key found for this signature in database
GPG key ID: B4087E510E98B164
3 changed files with 70 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_builtin_macros/src/deriving/mod.rs
View file

@ -54,7 +54,27 @@ impl MultiItemModifier for BuiltinDerive {
// so we are doing it here in a centralized way.
let span = ecx.with_def_site_ctxt(span);
let mut items = Vec::new();
(self.0)(ecx, span, meta_item, &item, &mut |a| items.push(a));
match item {
Annotatable::Stmt(stmt) => {
if let ast::StmtKind::Item(item) = stmt.into_inner().kind {
(self.0)(ecx, span, meta_item, &Annotatable::Item(item), &mut |a| {
// Cannot use 'ecx.stmt_item' here, because we need to pass 'ecx'
// to the function
items.push(Annotatable::Stmt(P(ast::Stmt {
id: ast::DUMMY_NODE_ID,
kind: ast::StmtKind::Item(a.expect_item()),
span,
tokens: None,
})));
});
} else {
unreachable!("should have already errored on non-item statement")
}
}
_ => {
(self.0)(ecx, span, meta_item, &item, &mut |a| items.push(a));
}
}
ExpandResult::Ready(items)
}
}