Skip to content

Commit 930639c

Browse files
committed
Unify walk_precise_capturing_arg
1 parent ad7e63b commit 930639c

File tree

1 file changed

+16
-26
lines changed

1 file changed

+16
-26
lines changed

compiler/rustc_ast/src/visitors.rs

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,22 @@ macro_rules! make_ast_visitor {
916916
return_result!(V)
917917
}
918918

919+
pub fn walk_precise_capturing_arg<$($lt,)? V: $trait$(<$lt>)?>(
920+
vis: &mut V,
921+
arg: ref_t!(PreciseCapturingArg)
922+
) -> result!(V) {
923+
match arg {
924+
PreciseCapturingArg::Lifetime(lt) => {
925+
try_v!(vis.visit_lifetime(lt, LifetimeCtxt::GenericArg));
926+
}
927+
PreciseCapturingArg::Arg(path, id) => {
928+
try_v!(visit_id!(vis, id));
929+
try_v!(vis.visit_path(path, *id));
930+
}
931+
}
932+
return_result!(V)
933+
}
934+
919935
make_walk_flat_map!{Arm, walk_flat_map_arm, visit_arm}
920936
make_walk_flat_map!{Attribute, walk_flat_map_attribute, visit_attribute}
921937
make_walk_flat_map!{ExprField, walk_flat_map_expr_field, visit_expr_field}
@@ -1327,20 +1343,6 @@ pub mod visit {
13271343
}
13281344
}
13291345

1330-
pub fn walk_precise_capturing_arg<'a, V: Visitor<'a>>(
1331-
visitor: &mut V,
1332-
arg: &'a PreciseCapturingArg,
1333-
) {
1334-
match arg {
1335-
PreciseCapturingArg::Lifetime(lt) => {
1336-
visitor.visit_lifetime(lt, LifetimeCtxt::GenericArg);
1337-
}
1338-
PreciseCapturingArg::Arg(path, id) => {
1339-
visitor.visit_path(path, *id);
1340-
}
1341-
}
1342-
}
1343-
13441346
pub fn walk_generic_param<'a, V: Visitor<'a>>(
13451347
visitor: &mut V,
13461348
param: &'a GenericParam,
@@ -2210,18 +2212,6 @@ pub mod mut_visit {
22102212
}
22112213
}
22122214

2213-
fn walk_precise_capturing_arg<T: MutVisitor>(vis: &mut T, arg: &mut PreciseCapturingArg) {
2214-
match arg {
2215-
PreciseCapturingArg::Lifetime(lt) => {
2216-
vis.visit_lifetime(lt, LifetimeCtxt::GenericArg);
2217-
}
2218-
PreciseCapturingArg::Arg(path, id) => {
2219-
vis.visit_id(id);
2220-
vis.visit_path(path, *id);
2221-
}
2222-
}
2223-
}
2224-
22252215
pub fn walk_generic_param<T: MutVisitor>(vis: &mut T, param: &mut GenericParam) {
22262216
let GenericParam { id, ident, attrs, bounds, kind, colon_span, is_placeholder: _ } = param;
22272217
vis.visit_id(id);

0 commit comments

Comments
 (0)