Skip to content

Commit 754bdef

Browse files
committed
Sync mut_visit function names with immut visit ones (s/noop_visit/walk/)
1 parent 6f85f20 commit 754bdef

File tree

9 files changed

+226
-235
lines changed

9 files changed

+226
-235
lines changed

compiler/rustc_ast/src/mut_visit.rs

+125-134
Large diffs are not rendered by default.

compiler/rustc_builtin_macros/src/cfg_eval.rs

+14-14
Original file line numberDiff line numberDiff line change
@@ -212,72 +212,72 @@ impl MutVisitor for CfgEval<'_> {
212212
#[instrument(level = "trace", skip(self))]
213213
fn visit_expr(&mut self, expr: &mut P<ast::Expr>) {
214214
self.0.configure_expr(expr, false);
215-
mut_visit::noop_visit_expr(expr, self);
215+
mut_visit::walk_expr(expr, self);
216216
}
217217

218218
#[instrument(level = "trace", skip(self))]
219219
fn visit_method_receiver_expr(&mut self, expr: &mut P<ast::Expr>) {
220220
self.0.configure_expr(expr, true);
221-
mut_visit::noop_visit_expr(expr, self);
221+
mut_visit::walk_expr(expr, self);
222222
}
223223

224224
fn filter_map_expr(&mut self, expr: P<ast::Expr>) -> Option<P<ast::Expr>> {
225225
let mut expr = configure!(self, expr);
226-
mut_visit::noop_visit_expr(&mut expr, self);
226+
mut_visit::walk_expr(&mut expr, self);
227227
Some(expr)
228228
}
229229

230230
fn flat_map_generic_param(
231231
&mut self,
232232
param: ast::GenericParam,
233233
) -> SmallVec<[ast::GenericParam; 1]> {
234-
mut_visit::noop_flat_map_generic_param(configure!(self, param), self)
234+
mut_visit::walk_flat_map_generic_param(configure!(self, param), self)
235235
}
236236

237237
fn flat_map_stmt(&mut self, stmt: ast::Stmt) -> SmallVec<[ast::Stmt; 1]> {
238-
mut_visit::noop_flat_map_stmt(configure!(self, stmt), self)
238+
mut_visit::walk_flat_map_stmt(configure!(self, stmt), self)
239239
}
240240

241241
fn flat_map_item(&mut self, item: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
242-
mut_visit::noop_flat_map_item(configure!(self, item), None, self)
242+
mut_visit::walk_flat_map_item(configure!(self, item), None, self)
243243
}
244244

245245
fn flat_map_assoc_item(
246246
&mut self,
247247
item: P<ast::AssocItem>,
248248
ctxt: AssocCtxt,
249249
) -> SmallVec<[P<ast::AssocItem>; 1]> {
250-
mut_visit::noop_flat_map_item(configure!(self, item), Some(ctxt), self)
250+
mut_visit::walk_flat_map_item(configure!(self, item), Some(ctxt), self)
251251
}
252252

253253
fn flat_map_foreign_item(
254254
&mut self,
255255
foreign_item: P<ast::ForeignItem>,
256256
) -> SmallVec<[P<ast::ForeignItem>; 1]> {
257-
mut_visit::noop_flat_map_item(configure!(self, foreign_item), None, self)
257+
mut_visit::walk_flat_map_item(configure!(self, foreign_item), None, self)
258258
}
259259

260260
fn flat_map_arm(&mut self, arm: ast::Arm) -> SmallVec<[ast::Arm; 1]> {
261-
mut_visit::noop_flat_map_arm(configure!(self, arm), self)
261+
mut_visit::walk_flat_map_arm(configure!(self, arm), self)
262262
}
263263

264264
fn flat_map_expr_field(&mut self, field: ast::ExprField) -> SmallVec<[ast::ExprField; 1]> {
265-
mut_visit::noop_flat_map_expr_field(configure!(self, field), self)
265+
mut_visit::walk_flat_map_expr_field(configure!(self, field), self)
266266
}
267267

268268
fn flat_map_pat_field(&mut self, fp: ast::PatField) -> SmallVec<[ast::PatField; 1]> {
269-
mut_visit::noop_flat_map_pat_field(configure!(self, fp), self)
269+
mut_visit::walk_flat_map_pat_field(configure!(self, fp), self)
270270
}
271271

272272
fn flat_map_param(&mut self, p: ast::Param) -> SmallVec<[ast::Param; 1]> {
273-
mut_visit::noop_flat_map_param(configure!(self, p), self)
273+
mut_visit::walk_flat_map_param(configure!(self, p), self)
274274
}
275275

276276
fn flat_map_field_def(&mut self, sf: ast::FieldDef) -> SmallVec<[ast::FieldDef; 1]> {
277-
mut_visit::noop_flat_map_field_def(configure!(self, sf), self)
277+
mut_visit::walk_flat_map_field_def(configure!(self, sf), self)
278278
}
279279

280280
fn flat_map_variant(&mut self, variant: ast::Variant) -> SmallVec<[ast::Variant; 1]> {
281-
mut_visit::noop_flat_map_variant(configure!(self, variant), self)
281+
mut_visit::walk_flat_map_variant(configure!(self, variant), self)
282282
}
283283
}

compiler/rustc_builtin_macros/src/test_harness.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ impl TestHarnessGenerator<'_> {
122122
impl<'a> MutVisitor for TestHarnessGenerator<'a> {
123123
fn visit_crate(&mut self, c: &mut ast::Crate) {
124124
let prev_tests = mem::take(&mut self.tests);
125-
noop_visit_crate(c, self);
125+
walk_crate(c, self);
126126
self.add_test_cases(ast::CRATE_NODE_ID, c.spans.inner_span, prev_tests);
127127

128128
// Create a main function to run our tests
@@ -144,7 +144,7 @@ impl<'a> MutVisitor for TestHarnessGenerator<'a> {
144144
item.kind
145145
{
146146
let prev_tests = mem::take(&mut self.tests);
147-
noop_visit_item_kind(&mut item.kind, item.ident, item.span, item.id, self);
147+
walk_item_kind(&mut item.kind, item.ident, item.span, item.id, self);
148148
self.add_test_cases(item.id, span, prev_tests);
149149
} else {
150150
// But in those cases, we emit a lint to warn the user of these missing tests.
@@ -192,7 +192,7 @@ struct EntryPointCleaner<'a> {
192192
impl<'a> MutVisitor for EntryPointCleaner<'a> {
193193
fn flat_map_item(&mut self, i: P<ast::Item>) -> SmallVec<[P<ast::Item>; 1]> {
194194
self.depth += 1;
195-
let item = noop_flat_map_item(i, None, self).expect_one("noop did something");
195+
let item = walk_flat_map_item(i, None, self).expect_one("noop did something");
196196
self.depth -= 1;
197197

198198
// Remove any #[rustc_main] or #[start] from the AST so it doesn't

0 commit comments

Comments
 (0)