Skip to content

Commit 7e1f672

Browse files
committed
Unify {visit,walk}_macro_def
1 parent 1542f08 commit 7e1f672

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

compiler/rustc_ast/src/visitors.rs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ macro_rules! make_ast_visitor {
208208

209209
make_visit!{CoroutineKind; visit_coroutine_kind, walk_coroutine_kind}
210210
make_visit!{FnHeader; visit_fn_header, walk_fn_header}
211-
make_visit!{MacroDef; visit_macro_def, walk_macro_def}
212211
make_visit!{MetaItem; visit_meta_item, walk_meta_item}
213212
make_visit!{MetaItemInner; visit_meta_list_item, walk_meta_list_item}
214213

@@ -303,9 +302,6 @@ macro_rules! make_ast_visitor {
303302
fn visit_fn(&mut self, fk: FnKind<'ast>, _: Span, _: NodeId) -> Self::Result {
304303
walk_fn(self, fk)
305304
}
306-
fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) -> Self::Result {
307-
Self::Result::output()
308-
}
309305
fn visit_fn_header(&mut self, _header: &'ast FnHeader) -> Self::Result {
310306
Self::Result::output()
311307
}
@@ -340,6 +336,7 @@ macro_rules! make_ast_visitor {
340336
make_visit!{Lifetime, _ ctxt: LifetimeCtxt; visit_lifetime, walk_lifetime}
341337
make_visit!{Local; visit_local, walk_local}
342338
make_visit!{MacCall; visit_mac_call, walk_mac_call}
339+
make_visit!{MacroDef, _ id: NodeId; visit_macro_def, walk_macro_def}
343340
make_visit!{MutTy; visit_mt, walk_mt}
344341
make_visit!{Option<P<QSelf>>; visit_qself, walk_qself}
345342
make_visit!{Param; visit_param, walk_param}
@@ -819,6 +816,15 @@ macro_rules! make_ast_visitor {
819816
return_result!(V)
820817
}
821818

819+
pub fn walk_macro_def<$($lt,)? V: $trait$(<$lt>)?>(
820+
vis: &mut V,
821+
macro_def: ref_t!(MacroDef),
822+
) -> result!(V) {
823+
let MacroDef { body, macro_rules: _ } = macro_def;
824+
visit_delim_args!(vis, body);
825+
return_result!(V)
826+
}
827+
822828
pub fn walk_mt<$($lt,)? V: $trait$(<$lt>)?>(
823829
vis: &mut V,
824830
mt: ref_t!(MutTy)
@@ -1394,7 +1400,7 @@ pub mod visit {
13941400
walk_list!(visitor, visit_param_bound, bounds, BoundKind::Bound);
13951401
}
13961402
ItemKind::MacCall(mac) => try_visit!(visitor.visit_mac_call(mac)),
1397-
ItemKind::MacroDef(ts) => try_visit!(visitor.visit_mac_def(ts, *id)),
1403+
ItemKind::MacroDef(ts) => try_visit!(visitor.visit_macro_def(ts, *id)),
13981404
ItemKind::Delegation(box Delegation {
13991405
id,
14001406
qself,
@@ -1878,11 +1884,6 @@ pub mod mut_visit {
18781884
smallvec![variant]
18791885
}
18801886

1881-
fn walk_macro_def<T: MutVisitor>(vis: &mut T, macro_def: &mut MacroDef) {
1882-
let MacroDef { body, macro_rules: _ } = macro_def;
1883-
visit_delim_args(vis, body);
1884-
}
1885-
18861887
fn walk_meta_list_item<T: MutVisitor>(vis: &mut T, li: &mut MetaItemInner) {
18871888
match li {
18881889
MetaItemInner::MetaItem(mi) => vis.visit_meta_item(mi),
@@ -2236,7 +2237,7 @@ pub mod mut_visit {
22362237
visit_bounds(vis, bounds, BoundKind::Bound);
22372238
}
22382239
ItemKind::MacCall(m) => vis.visit_mac_call(m),
2239-
ItemKind::MacroDef(def) => vis.visit_macro_def(def),
2240+
ItemKind::MacroDef(def) => vis.visit_macro_def(def, id),
22402241
ItemKind::Delegation(box Delegation {
22412242
id,
22422243
qself,

compiler/rustc_lint/src/early.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
289289
lint_callback!(self, check_attribute, attr);
290290
}
291291

292-
fn visit_mac_def(&mut self, mac: &'a ast::MacroDef, id: ast::NodeId) {
292+
fn visit_macro_def(&mut self, mac: &'a ast::MacroDef, id: ast::NodeId) {
293293
lint_callback!(self, check_mac_def, mac);
294294
self.check_id(id);
295295
}

0 commit comments

Comments
 (0)