Skip to content

Commit 90fafc8

Browse files
petrochenkovpetrochenkov
committed
rustc_ast: visit_mac -> visit_mac_call 
1 parent 3237b38 commit 90fafc8

File tree

11 files changed

+24
-25
lines changed

11 files changed

+24
-25
lines changed

‎compiler/rustc_ast/src/mut_visit.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ pub trait MutVisitor: Sized {
210210
noop_visit_local(l, self);
211211
}
212212

213-
fn visit_mac(&mut self, mac: &mut MacCall) {
213+
fn visit_mac_call(&mut self, mac: &mut MacCall) {
214214
noop_visit_mac(mac, self);
215215
}
216216

@@ -491,7 +491,7 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
491491
vis.visit_id(id);
492492
visit_vec(bounds, |bound| vis.visit_param_bound(bound));
493493
}
494-
TyKind::MacCall(mac) => vis.visit_mac(mac),
494+
TyKind::MacCall(mac) => vis.visit_mac_call(mac),
495495
}
496496
vis.visit_span(span);
497497
}
@@ -943,7 +943,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
943943
vis.visit_generics(generics);
944944
visit_bounds(bounds, vis);
945945
}
946-
ItemKind::MacCall(m) => vis.visit_mac(m),
946+
ItemKind::MacCall(m) => vis.visit_mac_call(m),
947947
ItemKind::MacroDef(def) => vis.visit_macro_def(def),
948948
}
949949
}
@@ -972,7 +972,7 @@ pub fn noop_flat_map_assoc_item<T: MutVisitor>(
972972
visit_bounds(bounds, visitor);
973973
visit_opt(ty, |ty| visitor.visit_ty(ty));
974974
}
975-
AssocItemKind::MacCall(mac) => visitor.visit_mac(mac),
975+
AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
976976
}
977977
visitor.visit_span(span);
978978
smallvec![item]
@@ -1063,7 +1063,7 @@ pub fn noop_flat_map_foreign_item<T: MutVisitor>(
10631063
visit_bounds(bounds, visitor);
10641064
visit_opt(ty, |ty| visitor.visit_ty(ty));
10651065
}
1066-
ForeignItemKind::MacCall(mac) => visitor.visit_mac(mac),
1066+
ForeignItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
10671067
}
10681068
visitor.visit_span(span);
10691069
smallvec![item]
@@ -1102,7 +1102,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {
11021102
visit_vec(elems, |elem| vis.visit_pat(elem))
11031103
}
11041104
PatKind::Paren(inner) => vis.visit_pat(inner),
1105-
PatKind::MacCall(mac) => vis.visit_mac(mac),
1105+
PatKind::MacCall(mac) => vis.visit_mac_call(mac),
11061106
}
11071107
vis.visit_span(span);
11081108
}
@@ -1267,7 +1267,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
12671267
}
12681268
visit_vec(inputs, |(_c, expr)| vis.visit_expr(expr));
12691269
}
1270-
ExprKind::MacCall(mac) => vis.visit_mac(mac),
1270+
ExprKind::MacCall(mac) => vis.visit_mac_call(mac),
12711271
ExprKind::Struct(path, fields, expr) => {
12721272
vis.visit_path(path);
12731273
fields.flat_map_in_place(|field| vis.flat_map_field(field));
@@ -1328,7 +1328,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(
13281328
StmtKind::Empty => smallvec![StmtKind::Empty],
13291329
StmtKind::MacCall(mut mac) => {
13301330
let MacCallStmt { mac: mac_, style: _, attrs } = mac.deref_mut();
1331-
vis.visit_mac(mac_);
1331+
vis.visit_mac_call(mac_);
13321332
visit_thin_attrs(attrs, vis);
13331333
smallvec![StmtKind::MacCall(mac)]
13341334
}

‎compiler/rustc_ast/src/visit.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub trait Visitor<'ast>: Sized {
176176
fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {
177177
walk_lifetime(self, lifetime)
178178
}
179-
fn visit_mac(&mut self, mac: &'ast MacCall) {
179+
fn visit_mac_call(&mut self, mac: &'ast MacCall) {
180180
walk_mac(self, mac)
181181
}
182182
fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) {
@@ -341,7 +341,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
341341
visitor.visit_generics(generics);
342342
walk_list!(visitor, visit_param_bound, bounds);
343343
}
344-
ItemKind::MacCall(ref mac) => visitor.visit_mac(mac),
344+
ItemKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
345345
ItemKind::MacroDef(ref ts) => visitor.visit_mac_def(ts, item.id),
346346
}
347347
walk_list!(visitor, visit_attribute, &item.attrs);
@@ -409,7 +409,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) {
409409
}
410410
TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),
411411
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Err => {}
412-
TyKind::MacCall(ref mac) => visitor.visit_mac(mac),
412+
TyKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
413413
TyKind::Never | TyKind::CVarArgs => {}
414414
}
415415
}
@@ -527,7 +527,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
527527
PatKind::Tuple(ref elems) | PatKind::Slice(ref elems) | PatKind::Or(ref elems) => {
528528
walk_list!(visitor, visit_pat, elems);
529529
}
530-
PatKind::MacCall(ref mac) => visitor.visit_mac(mac),
530+
PatKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
531531
}
532532
}
533533

@@ -552,7 +552,7 @@ pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a ForeignI
552552
walk_list!(visitor, visit_ty, ty);
553553
}
554554
ForeignItemKind::MacCall(mac) => {
555-
visitor.visit_mac(mac);
555+
visitor.visit_mac_call(mac);
556556
}
557557
}
558558
}
@@ -657,7 +657,7 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem,
657657
walk_list!(visitor, visit_ty, ty);
658658
}
659659
AssocItemKind::MacCall(mac) => {
660-
visitor.visit_mac(mac);
660+
visitor.visit_mac_call(mac);
661661
}
662662
}
663663
}
@@ -687,7 +687,7 @@ pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {
687687
StmtKind::Empty => {}
688688
StmtKind::MacCall(ref mac) => {
689689
let MacCallStmt { ref mac, style: _, ref attrs } = **mac;
690-
visitor.visit_mac(mac);
690+
visitor.visit_mac_call(mac);
691691
for attr in attrs.iter() {
692692
visitor.visit_attribute(attr);
693693
}
@@ -818,7 +818,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
818818
ExprKind::Ret(ref optional_expression) => {
819819
walk_list!(visitor, visit_expr, optional_expression);
820820
}
821-
ExprKind::MacCall(ref mac) => visitor.visit_mac(mac),
821+
ExprKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
822822
ExprKind::Paren(ref subexpression) => visitor.visit_expr(subexpression),
823823
ExprKind::InlineAsm(ref ia) => {
824824
for (op, _) in &ia.operands {

‎compiler/rustc_ast_passes/src/node_count.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {
114114
self.count += 1;
115115
walk_lifetime(self, lifetime)
116116
}
117-
fn visit_mac(&mut self, mac: &MacCall) {
117+
fn visit_mac_call(&mut self, mac: &MacCall) {
118118
self.count += 1;
119119
walk_mac(self, mac)
120120
}

‎compiler/rustc_builtin_macros/src/deriving/generic/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ fn find_type_parameters(
358358
visit::walk_ty(self, ty)
359359
}
360360

361-
fn visit_mac(&mut self, mac: &ast::MacCall) {
361+
fn visit_mac_call(&mut self, mac: &ast::MacCall) {
362362
self.cx.span_err(mac.span(), "`derive` cannot be used on items with type macros");
363363
}
364364
}

‎compiler/rustc_expand/src/mbe/transcribe.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq, NamedMatch};
55
use rustc_ast::mut_visit::{self, MutVisitor};
66
use rustc_ast::token::{self, NtTT, Token};
77
use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndSpacing};
8-
use rustc_ast::MacCall;
98
use rustc_data_structures::fx::FxHashMap;
109
use rustc_data_structures::sync::Lrc;
1110
use rustc_errors::{pluralize, PResult};

‎compiler/rustc_expand/src/mut_visit/tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::tests::{matches_codepattern, string_to_crate};
22

33
use rustc_ast as ast;
4-
use rustc_ast::mut_visit::{self, MutVisitor};
4+
use rustc_ast::mut_visit::MutVisitor;
55
use rustc_ast_pretty::pprust;
66
use rustc_span::symbol::Ident;
77
use rustc_span::with_default_session_globals;

‎compiler/rustc_lint/src/early.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
270270
self.check_id(id);
271271
}
272272

273-
fn visit_mac(&mut self, mac: &'a ast::MacCall) {
273+
fn visit_mac_call(&mut self, mac: &'a ast::MacCall) {
274274
run_early_pass!(self, check_mac, mac);
275275
ast_visit::walk_mac(self, mac);
276276
}

‎compiler/rustc_parse/src/parser/pat.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use super::{Parser, PathStyle};
22
use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
3-
use rustc_ast::mut_visit::{noop_visit_mac, noop_visit_pat, MutVisitor};
3+
use rustc_ast::mut_visit::{noop_visit_pat, MutVisitor};
44
use rustc_ast::ptr::P;
55
use rustc_ast::token;
66
use rustc_ast::{self as ast, AttrVec, Attribute, FieldPat, MacCall, Pat, PatKind, RangeEnd};

‎compiler/rustc_passes/src/hir_stats.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
336336
ast_visit::walk_lifetime(self, lifetime)
337337
}
338338

339-
fn visit_mac(&mut self, mac: &'v ast::MacCall) {
339+
fn visit_mac_call(&mut self, mac: &'v ast::MacCall) {
340340
self.record("MacCall", Id::None, mac);
341341
ast_visit::walk_mac(self, mac)
342342
}

‎src/test/ui/parser/issue-65122-mac-invoc-in-mut-patterns.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Regression test; used to ICE with 'visit_mac disabled by default' due to a
1+
// Regression test; used to ICE with 'visit_mac_call disabled by default' due to a
22
// `MutVisitor` in `fn make_all_value_bindings_mutable` (`parse/parser/pat.rs`).
33

44
macro_rules! mac1 {

‎src/tools/clippy/clippy_lints/src/non_expressive_names.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::utils::{span_lint, span_lint_and_then};
22
use rustc_ast::ast::{
3-
Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, MacCall, Pat, PatKind,
3+
Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, Pat, PatKind,
44
};
55
use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
66
use rustc_lint::{EarlyContext, EarlyLintPass};

0 commit comments

Comments
 (0)