bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify types in proc_macro_harness.rs.

Browse source 
This gives the more obvious derive/attr/bang distinction, and reduces
code size slightly.
This commit is contained in:
Nicholas Nethercote 2022-05-13 11:45:51 +10:00
parent 2ece157e17
commit 1a9514d5ce
1 changed files with 17 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
compiler/rustc_builtin_macros/src/proc_macro_harness.rs
View file

@ -22,21 +22,16 @@ struct ProcMacroDerive {
attrs: Vec<Symbol>, attrs: Vec<Symbol>,
} }
enum ProcMacroDefType {
Attr,
Bang,
}
struct ProcMacroDef { struct ProcMacroDef {
id: NodeId, id: NodeId,
function_name: Ident, function_name: Ident,
span: Span, span: Span,
def_type: ProcMacroDefType,
} }
enum ProcMacro { enum ProcMacro {
Derive(ProcMacroDerive), Derive(ProcMacroDerive),
Def(ProcMacroDef), Attr(ProcMacroDef),
Bang(ProcMacroDef),
} }
struct CollectProcMacros<'a> { struct CollectProcMacros<'a> {
@ -128,11 +123,10 @@ impl<'a> CollectProcMacros<'a> {
fn collect_attr_proc_macro(&mut self, item: &'a ast::Item) { fn collect_attr_proc_macro(&mut self, item: &'a ast::Item) {
if self.in_root && item.vis.kind.is_pub() { if self.in_root && item.vis.kind.is_pub() {
self.macros.push(ProcMacro::Def(ProcMacroDef { self.macros.push(ProcMacro::Attr(ProcMacroDef {
id: item.id, id: item.id,
span: item.span, span: item.span,
function_name: item.ident, function_name: item.ident,
def_type: ProcMacroDefType::Attr,
})); }));
} else { } else {
let msg = if !self.in_root { let msg = if !self.in_root {
@ -147,11 +141,10 @@ impl<'a> CollectProcMacros<'a> {
fn collect_bang_proc_macro(&mut self, item: &'a ast::Item) { fn collect_bang_proc_macro(&mut self, item: &'a ast::Item) {
if self.in_root && item.vis.kind.is_pub() { if self.in_root && item.vis.kind.is_pub() {
self.macros.push(ProcMacro::Def(ProcMacroDef { self.macros.push(ProcMacro::Bang(ProcMacroDef {
id: item.id, id: item.id,
span: item.span, span: item.span,
function_name: item.ident, function_name: item.ident,
def_type: ProcMacroDefType::Bang,
})); }));
} else { } else {
let msg = if !self.in_root { let msg = if !self.in_root {
@ -308,6 +301,17 @@ fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
let proc_macro_ty_method_path = |cx: &ExtCtxt<'_>, method| { let proc_macro_ty_method_path = |cx: &ExtCtxt<'_>, method| {
cx.expr_path(cx.path(span, vec![proc_macro, bridge, client, proc_macro_ty, method])) cx.expr_path(cx.path(span, vec![proc_macro, bridge, client, proc_macro_ty, method]))
}; };
let attr_or_bang = |cx: &mut ExtCtxt<'_>, ca: &ProcMacroDef, ident| {
cx.resolver.declare_proc_macro(ca.id);
cx.expr_call(
span,
proc_macro_ty_method_path(cx, ident),
vec![
cx.expr_str(ca.span, ca.function_name.name),
local_path(cx, ca.span, ca.function_name),
],
)
};
macros macros
.iter() .iter()
.map(|m| match m { .map(|m| match m {
@ -329,22 +333,8 @@ fn mk_decls(cx: &mut ExtCtxt<'_>, macros: &[ProcMacro]) -> P<ast::Item> {
], ],
) )
} }
ProcMacro::Def(ca) => { ProcMacro::Attr(ca) => attr_or_bang(cx, &ca, attr),
cx.resolver.declare_proc_macro(ca.id); ProcMacro::Bang(ca) => attr_or_bang(cx, &ca, bang),
let ident = match ca.def_type {
ProcMacroDefType::Attr => attr,
ProcMacroDefType::Bang => bang,
};
cx.expr_call(
span,
proc_macro_ty_method_path(cx, ident),
vec![
cx.expr_str(ca.span, ca.function_name.name),
local_path(cx, ca.span, ca.function_name),
],
)
}
}) })
.collect() .collect()
}; };