Skip to content

Commit 3468839

Browse files
committed
Unify {visit,walk}_param
1 parent 356f126 commit 3468839

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

compiler/rustc_ast/src/visitors.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,6 @@ macro_rules! make_ast_visitor {
281281
make_visit!{ForeignItem; visit_foreign_item, walk_item}
282282
make_visit!{GenericParam; visit_generic_param, walk_generic_param}
283283
make_visit!{Item; visit_item, walk_item}
284-
make_visit!{Param; visit_param, walk_param}
285284
make_visit!{Path, _ id: NodeId; visit_path, walk_path}
286285
make_visit!{Stmt; visit_stmt, walk_stmt}
287286
make_visit!{UseTree, id: NodeId, _ nested: bool; visit_use_tree, walk_use_tree}
@@ -336,6 +335,7 @@ macro_rules! make_ast_visitor {
336335
make_visit!{MacCall; visit_mac_call, walk_mac}
337336
make_visit!{MutTy; visit_mt, walk_mt}
338337
make_visit!{Option<P<QSelf>>; visit_qself, walk_qself}
338+
make_visit!{Param; visit_param, walk_param}
339339
make_visit!{ParenthesizedArgs; visit_parenthesized_parameter_data, walk_parenthesized_parameter_data}
340340
make_visit!{PatField; visit_pat_field, walk_pat_field}
341341
make_visit!{PathSegment; visit_path_segment, walk_path_segment}
@@ -524,6 +524,19 @@ macro_rules! make_ast_visitor {
524524
return_result!(V)
525525
}
526526

527+
pub fn walk_param<$($lt,)? V: $trait$(<$lt>)?>(
528+
vis: &mut V,
529+
param: ref_t!(Param)
530+
) -> result!(V) {
531+
let Param { attrs, id, pat, span, ty, is_placeholder: _ } = param;
532+
try_v!(visit_id!(vis, id));
533+
visit_list!(vis, visit_attribute, attrs);
534+
try_v!(vis.visit_pat(pat));
535+
try_v!(vis.visit_ty(ty));
536+
try_v!(visit_span!(vis, span));
537+
return_result!(V)
538+
}
539+
527540
pub fn walk_parenthesized_parameter_data<$($lt,)? V: $trait$(<$lt>)?>(
528541
vis: &mut V,
529542
args: ref_t!(ParenthesizedArgs)
@@ -1486,14 +1499,6 @@ pub mod visit {
14861499
visitor.visit_expr_post(expression)
14871500
}
14881501

1489-
pub fn walk_param<'a, V: Visitor<'a>>(visitor: &mut V, param: &'a Param) -> V::Result {
1490-
let Param { attrs, ty, pat, id: _, span: _, is_placeholder: _ } = param;
1491-
walk_list!(visitor, visit_attribute, attrs);
1492-
try_visit!(visitor.visit_pat(pat));
1493-
try_visit!(visitor.visit_ty(ty));
1494-
V::Result::output()
1495-
}
1496-
14971502
pub fn walk_arm<'a, V: Visitor<'a>>(visitor: &mut V, arm: &'a Arm) -> V::Result {
14981503
let Arm { attrs, pat, guard, body, span: _, id: _, is_placeholder: _ } = arm;
14991504
walk_list!(visitor, visit_attribute, attrs);
@@ -1896,12 +1901,7 @@ pub mod mut_visit {
18961901
vis: &mut T,
18971902
mut param: Param,
18981903
) -> SmallVec<[Param; 1]> {
1899-
let Param { attrs, id, pat, span, ty, is_placeholder: _ } = &mut param;
1900-
vis.visit_id(id);
1901-
visit_attrs(vis, attrs);
1902-
vis.visit_pat(pat);
1903-
vis.visit_ty(ty);
1904-
vis.visit_span(span);
1904+
vis.visit_param(&mut param);
19051905
smallvec![param]
19061906
}
19071907

0 commit comments

Comments
 (0)