Skip to content

Commit 95149cf

Browse files
committed
Unify walk_foreign_mod
1 parent 8f4ed75 commit 95149cf

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

compiler/rustc_ast/src/visitors.rs

+10-12
Original file line numberDiff line numberDiff line change
@@ -1283,6 +1283,16 @@ macro_rules! make_ast_visitor {
12831283
return_result!(V)
12841284
}
12851285

1286+
pub fn walk_foreign_mod<$($lt,)? V: $trait$(<$lt>)?>(
1287+
vis: &mut V,
1288+
foreign_mod: ref_t!(ForeignMod)
1289+
) -> result!(V) {
1290+
let ForeignMod { safety, abi: _, items } = foreign_mod;
1291+
visit_safety!(vis, safety);
1292+
visit_list!(vis, visit_foreign_item, flat_map_foreign_item, items);
1293+
return_result!(V)
1294+
}
1295+
12861296
pub fn walk_assoc_item<$($lt,)? V: $trait$(<$lt>)?>(
12871297
visitor: &mut V,
12881298
item: ref_t!(Item<AssocItemKind>),
@@ -1897,12 +1907,6 @@ pub mod visit {
18971907
}
18981908
V::Result::output()
18991909
}
1900-
1901-
fn walk_foreign_mod<'a, V: Visitor<'a>>(vis: &mut V, foreign_mod: &'a ForeignMod) -> V::Result {
1902-
let ForeignMod { safety: _, abi: _, items } = foreign_mod;
1903-
walk_list!(vis, visit_foreign_item, items);
1904-
V::Result::output()
1905-
}
19061910
}
19071911

19081912
pub mod mut_visit {
@@ -2034,12 +2038,6 @@ pub mod mut_visit {
20342038
vis.visit_span(close);
20352039
}
20362040

2037-
fn walk_foreign_mod<T: MutVisitor>(vis: &mut T, foreign_mod: &mut ForeignMod) {
2038-
let ForeignMod { safety, abi: _, items } = foreign_mod;
2039-
visit_safety(vis, safety);
2040-
items.flat_map_in_place(|item| vis.flat_map_foreign_item(item));
2041-
}
2042-
20432041
fn walk_attribute<T: MutVisitor>(vis: &mut T, attr: &mut Attribute) {
20442042
let Attribute { kind, id: _, style: _, span } = attr;
20452043
match kind {

0 commit comments

Comments
 (0)