Skip to content

Commit 527064e

Browse files
maxcabrajacmaxcabrajac
committed
Format
1 parent 3e0c777 commit 527064e

File tree

4 files changed

+79
-23
lines changed

4 files changed

+79
-23
lines changed

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,15 @@ impl<A: Array> ExpectOne<A> for SmallVec<A> {
3737
}
3838

3939
pub trait WalkItemKind {
40-
fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, ctxt: AssocCtxt, visitor: &mut impl MutVisitor);
40+
fn walk(
41+
&mut self,
42+
span: Span,
43+
id: NodeId,
44+
ident: &mut Ident,
45+
visibility: &mut Visibility,
46+
ctxt: AssocCtxt,
47+
visitor: &mut impl MutVisitor,
48+
);
4149
}
4250

4351
pub trait MutVisitor: Sized {
@@ -1093,7 +1101,15 @@ pub fn walk_item_kind(
10931101
}
10941102

10951103
impl WalkItemKind for ItemKind {
1096-
fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, _ctxt: AssocCtxt, vis: &mut impl MutVisitor) {
1104+
fn walk(
1105+
&mut self,
1106+
span: Span,
1107+
id: NodeId,
1108+
ident: &mut Ident,
1109+
visibility: &mut Visibility,
1110+
_ctxt: AssocCtxt,
1111+
vis: &mut impl MutVisitor,
1112+
) {
10971113
match self {
10981114
ItemKind::ExternCrate(_orig_name) => {}
10991115
ItemKind::Use(use_tree) => vis.visit_use_tree(use_tree),
@@ -1106,7 +1122,11 @@ impl WalkItemKind for ItemKind {
11061122
}
11071123
ItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
11081124
visit_defaultness(vis, defaultness);
1109-
vis.visit_fn(FnKind::Fn(FnCtxt::Free, ident, sig, visibility, generics, body), span, id);
1125+
vis.visit_fn(
1126+
FnKind::Fn(FnCtxt::Free, ident, sig, visibility, generics, body),
1127+
span,
1128+
id,
1129+
);
11101130
}
11111131
ItemKind::Mod(safety, mod_kind) => {
11121132
visit_safety(vis, safety);
@@ -1205,15 +1225,27 @@ impl WalkItemKind for ItemKind {
12051225
}
12061226

12071227
impl WalkItemKind for AssocItemKind {
1208-
fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, ctxt: AssocCtxt, visitor: &mut impl MutVisitor) {
1228+
fn walk(
1229+
&mut self,
1230+
span: Span,
1231+
id: NodeId,
1232+
ident: &mut Ident,
1233+
visibility: &mut Visibility,
1234+
ctxt: AssocCtxt,
1235+
visitor: &mut impl MutVisitor,
1236+
) {
12091237
match self {
12101238
AssocItemKind::Const(item) => {
12111239
visit_const_item(item, visitor);
12121240
}
12131241
AssocItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
12141242
visit_defaultness(visitor, defaultness);
12151243
// TODO: use AssocCtxt
1216-
visitor.visit_fn(FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, visibility, generics, body), span, id);
1244+
visitor.visit_fn(
1245+
FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, visibility, generics, body),
1246+
span,
1247+
id,
1248+
);
12171249
}
12181250
AssocItemKind::Type(box TyAlias {
12191251
defaultness,
@@ -1317,15 +1349,27 @@ pub fn walk_flat_map_assoc_item<K: WalkItemKind>(
13171349
}
13181350

13191351
impl WalkItemKind for ForeignItemKind {
1320-
fn walk(&mut self, span: Span, id: NodeId, ident: &mut Ident, visibility: &mut Visibility, _ctxt: AssocCtxt, visitor: &mut impl MutVisitor) {
1352+
fn walk(
1353+
&mut self,
1354+
span: Span,
1355+
id: NodeId,
1356+
ident: &mut Ident,
1357+
visibility: &mut Visibility,
1358+
_ctxt: AssocCtxt,
1359+
visitor: &mut impl MutVisitor,
1360+
) {
13211361
match self {
13221362
ForeignItemKind::Static(box StaticItem { ty, mutability: _, expr, safety: _ }) => {
13231363
visitor.visit_ty(ty);
13241364
visit_opt(expr, |expr| visitor.visit_expr(expr));
13251365
}
13261366
ForeignItemKind::Fn(box Fn { defaultness, generics, sig, body }) => {
13271367
visit_defaultness(visitor, defaultness);
1328-
visitor.visit_fn(FnKind::Fn(FnCtxt::Foreign, ident, sig, visibility, generics, body), span, id);
1368+
visitor.visit_fn(
1369+
FnKind::Fn(FnCtxt::Foreign, ident, sig, visibility, generics, body),
1370+
span,
1371+
id,
1372+
);
13291373
}
13301374
ForeignItemKind::TyAlias(box TyAlias {
13311375
defaultness,
@@ -1796,8 +1840,20 @@ impl<N: DummyAstNode, T: DummyAstNode> DummyAstNode for crate::ast_traits::AstNo
17961840
#[derive(Debug)]
17971841
pub enum FnKind<'a> {
17981842
/// E.g., `fn foo()`, `fn foo(&self)`, or `extern "Abi" fn foo()`.
1799-
Fn(FnCtxt, &'a mut Ident, &'a mut FnSig, &'a mut Visibility, &'a mut Generics, &'a mut Option<P<Block>>),
1843+
Fn(
1844+
FnCtxt,
1845+
&'a mut Ident,
1846+
&'a mut FnSig,
1847+
&'a mut Visibility,
1848+
&'a mut Generics,
1849+
&'a mut Option<P<Block>>,
1850+
),
18001851

18011852
/// E.g., `|x, y| body`.
1802-
Closure(&'a mut ClosureBinder, &'a mut Option<CoroutineKind>, &'a mut P<FnDecl>, &'a mut P<Expr>),
1853+
Closure(
1854+
&'a mut ClosureBinder,
1855+
&'a mut Option<CoroutineKind>,
1856+
&'a mut P<FnDecl>,
1857+
&'a mut P<Expr>,
1858+
),
18031859
}

‎compiler/rustc_ast/src/visit.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -858,8 +858,7 @@ impl WalkItemKind for AssocItemKind {
858858
visit_opt!(visitor, visit_expr, expr);
859859
}
860860
AssocItemKind::Fn(box Fn { defaultness: _, generics, sig, body }) => {
861-
let kind =
862-
FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, vis, generics, body);
861+
let kind = FnKind::Fn(FnCtxt::Assoc(ctxt), ident, sig, vis, generics, body);
863862
try_visit!(visitor.visit_fn(kind, *span, *id));
864863
}
865864
AssocItemKind::Type(box TyAlias {

‎compiler/rustc_ast_passes/src/ast_validation.rs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -946,8 +946,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
946946

947947
self.visit_vis(&item.vis);
948948
self.visit_ident(&item.ident);
949-
let kind =
950-
FnKind::Fn(FnCtxt::Free, &item.ident, sig, &item.vis, generics, body);
949+
let kind = FnKind::Fn(FnCtxt::Free, &item.ident, sig, &item.vis, generics, body);
951950
self.visit_fn(kind, item.span, item.id);
952951
walk_list!(self, visit_attribute, &item.attrs);
953952
return; // Avoid visiting again.
@@ -1476,14 +1475,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
14761475
{
14771476
self.visit_vis(&item.vis);
14781477
self.visit_ident(&item.ident);
1479-
let kind = FnKind::Fn(
1480-
FnCtxt::Assoc(ctxt),
1481-
&item.ident,
1482-
sig,
1483-
&item.vis,
1484-
generics,
1485-
body,
1486-
);
1478+
let kind =
1479+
FnKind::Fn(FnCtxt::Assoc(ctxt), &item.ident, sig, &item.vis, generics, body);
14871480
walk_list!(self, visit_attribute, &item.attrs);
14881481
self.visit_fn(kind, item.span, item.id);
14891482
}

‎compiler/rustc_builtin_macros/src/test_harness.rs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use rustc_ast as ast;
66
use rustc_ast::entry::EntryPointType;
77
use rustc_ast::mut_visit::*;
88
use rustc_ast::ptr::P;
9-
use rustc_ast::visit::{walk_item, AssocCtxt, Visitor};
9+
use rustc_ast::visit::{AssocCtxt, Visitor, walk_item};
1010
use rustc_ast::{ModKind, attr};
1111
use rustc_errors::DiagCtxtHandle;
1212
use rustc_expand::base::{ExtCtxt, ResolverExpand};
@@ -144,7 +144,15 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
144144
item.kind
145145
{
146146
let prev_tests = mem::take(&mut self.tests);
147-
walk_item_kind(&mut item.kind, item.span, item.id, &mut item.ident, &mut item.vis, AssocCtxt::Trait /* ignored */, self);
147+
walk_item_kind(
148+
&mut item.kind,
149+
item.span,
150+
item.id,
151+
&mut item.ident,
152+
&mut item.vis,
153+
AssocCtxt::Trait, /* ignored */
154+
self,
155+
);
148156
self.add_test_cases(item.id, span, prev_tests);
149157
} else {
150158
// But in those cases, we emit a lint to warn the user of these missing tests.

0 commit comments

Comments
 (0)