rustc_ast: `visit_mac` -> `visit_mac_call`
This commit is contained in:
parent
3237b3886c
commit
90fafc8c8f
|
@ -210,7 +210,7 @@ pub trait MutVisitor: Sized {
|
||||||
noop_visit_local(l, self);
|
noop_visit_local(l, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_mac(&mut self, mac: &mut MacCall) {
|
fn visit_mac_call(&mut self, mac: &mut MacCall) {
|
||||||
noop_visit_mac(mac, self);
|
noop_visit_mac(mac, self);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -491,7 +491,7 @@ pub fn noop_visit_ty<T: MutVisitor>(ty: &mut P<Ty>, vis: &mut T) {
|
||||||
vis.visit_id(id);
|
vis.visit_id(id);
|
||||||
visit_vec(bounds, |bound| vis.visit_param_bound(bound));
|
visit_vec(bounds, |bound| vis.visit_param_bound(bound));
|
||||||
}
|
}
|
||||||
TyKind::MacCall(mac) => vis.visit_mac(mac),
|
TyKind::MacCall(mac) => vis.visit_mac_call(mac),
|
||||||
}
|
}
|
||||||
vis.visit_span(span);
|
vis.visit_span(span);
|
||||||
}
|
}
|
||||||
|
@ -943,7 +943,7 @@ pub fn noop_visit_item_kind<T: MutVisitor>(kind: &mut ItemKind, vis: &mut T) {
|
||||||
vis.visit_generics(generics);
|
vis.visit_generics(generics);
|
||||||
visit_bounds(bounds, vis);
|
visit_bounds(bounds, vis);
|
||||||
}
|
}
|
||||||
ItemKind::MacCall(m) => vis.visit_mac(m),
|
ItemKind::MacCall(m) => vis.visit_mac_call(m),
|
||||||
ItemKind::MacroDef(def) => vis.visit_macro_def(def),
|
ItemKind::MacroDef(def) => vis.visit_macro_def(def),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -972,7 +972,7 @@ pub fn noop_flat_map_assoc_item<T: MutVisitor>(
|
||||||
visit_bounds(bounds, visitor);
|
visit_bounds(bounds, visitor);
|
||||||
visit_opt(ty, |ty| visitor.visit_ty(ty));
|
visit_opt(ty, |ty| visitor.visit_ty(ty));
|
||||||
}
|
}
|
||||||
AssocItemKind::MacCall(mac) => visitor.visit_mac(mac),
|
AssocItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
|
||||||
}
|
}
|
||||||
visitor.visit_span(span);
|
visitor.visit_span(span);
|
||||||
smallvec![item]
|
smallvec![item]
|
||||||
|
@ -1063,7 +1063,7 @@ pub fn noop_flat_map_foreign_item<T: MutVisitor>(
|
||||||
visit_bounds(bounds, visitor);
|
visit_bounds(bounds, visitor);
|
||||||
visit_opt(ty, |ty| visitor.visit_ty(ty));
|
visit_opt(ty, |ty| visitor.visit_ty(ty));
|
||||||
}
|
}
|
||||||
ForeignItemKind::MacCall(mac) => visitor.visit_mac(mac),
|
ForeignItemKind::MacCall(mac) => visitor.visit_mac_call(mac),
|
||||||
}
|
}
|
||||||
visitor.visit_span(span);
|
visitor.visit_span(span);
|
||||||
smallvec![item]
|
smallvec![item]
|
||||||
|
@ -1102,7 +1102,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {
|
||||||
visit_vec(elems, |elem| vis.visit_pat(elem))
|
visit_vec(elems, |elem| vis.visit_pat(elem))
|
||||||
}
|
}
|
||||||
PatKind::Paren(inner) => vis.visit_pat(inner),
|
PatKind::Paren(inner) => vis.visit_pat(inner),
|
||||||
PatKind::MacCall(mac) => vis.visit_mac(mac),
|
PatKind::MacCall(mac) => vis.visit_mac_call(mac),
|
||||||
}
|
}
|
||||||
vis.visit_span(span);
|
vis.visit_span(span);
|
||||||
}
|
}
|
||||||
|
@ -1267,7 +1267,7 @@ pub fn noop_visit_expr<T: MutVisitor>(
|
||||||
}
|
}
|
||||||
visit_vec(inputs, |(_c, expr)| vis.visit_expr(expr));
|
visit_vec(inputs, |(_c, expr)| vis.visit_expr(expr));
|
||||||
}
|
}
|
||||||
ExprKind::MacCall(mac) => vis.visit_mac(mac),
|
ExprKind::MacCall(mac) => vis.visit_mac_call(mac),
|
||||||
ExprKind::Struct(path, fields, expr) => {
|
ExprKind::Struct(path, fields, expr) => {
|
||||||
vis.visit_path(path);
|
vis.visit_path(path);
|
||||||
fields.flat_map_in_place(|field| vis.flat_map_field(field));
|
fields.flat_map_in_place(|field| vis.flat_map_field(field));
|
||||||
|
@ -1328,7 +1328,7 @@ pub fn noop_flat_map_stmt_kind<T: MutVisitor>(
|
||||||
StmtKind::Empty => smallvec![StmtKind::Empty],
|
StmtKind::Empty => smallvec![StmtKind::Empty],
|
||||||
StmtKind::MacCall(mut mac) => {
|
StmtKind::MacCall(mut mac) => {
|
||||||
let MacCallStmt { mac: mac_, style: _, attrs } = mac.deref_mut();
|
let MacCallStmt { mac: mac_, style: _, attrs } = mac.deref_mut();
|
||||||
vis.visit_mac(mac_);
|
vis.visit_mac_call(mac_);
|
||||||
visit_thin_attrs(attrs, vis);
|
visit_thin_attrs(attrs, vis);
|
||||||
smallvec![StmtKind::MacCall(mac)]
|
smallvec![StmtKind::MacCall(mac)]
|
||||||
}
|
}
|
||||||
|
|
|
@ -176,7 +176,7 @@ pub trait Visitor<'ast>: Sized {
|
||||||
fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {
|
fn visit_lifetime(&mut self, lifetime: &'ast Lifetime) {
|
||||||
walk_lifetime(self, lifetime)
|
walk_lifetime(self, lifetime)
|
||||||
}
|
}
|
||||||
fn visit_mac(&mut self, mac: &'ast MacCall) {
|
fn visit_mac_call(&mut self, mac: &'ast MacCall) {
|
||||||
walk_mac(self, mac)
|
walk_mac(self, mac)
|
||||||
}
|
}
|
||||||
fn visit_mac_def(&mut self, _mac: &'ast MacroDef, _id: NodeId) {
|
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) {
|
||||||
visitor.visit_generics(generics);
|
visitor.visit_generics(generics);
|
||||||
walk_list!(visitor, visit_param_bound, bounds);
|
walk_list!(visitor, visit_param_bound, bounds);
|
||||||
}
|
}
|
||||||
ItemKind::MacCall(ref mac) => visitor.visit_mac(mac),
|
ItemKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
|
||||||
ItemKind::MacroDef(ref ts) => visitor.visit_mac_def(ts, item.id),
|
ItemKind::MacroDef(ref ts) => visitor.visit_mac_def(ts, item.id),
|
||||||
}
|
}
|
||||||
walk_list!(visitor, visit_attribute, &item.attrs);
|
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) {
|
||||||
}
|
}
|
||||||
TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),
|
TyKind::Typeof(ref expression) => visitor.visit_anon_const(expression),
|
||||||
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Err => {}
|
TyKind::Infer | TyKind::ImplicitSelf | TyKind::Err => {}
|
||||||
TyKind::MacCall(ref mac) => visitor.visit_mac(mac),
|
TyKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
|
||||||
TyKind::Never | TyKind::CVarArgs => {}
|
TyKind::Never | TyKind::CVarArgs => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -527,7 +527,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
|
||||||
PatKind::Tuple(ref elems) | PatKind::Slice(ref elems) | PatKind::Or(ref elems) => {
|
PatKind::Tuple(ref elems) | PatKind::Slice(ref elems) | PatKind::Or(ref elems) => {
|
||||||
walk_list!(visitor, visit_pat, elems);
|
walk_list!(visitor, visit_pat, elems);
|
||||||
}
|
}
|
||||||
PatKind::MacCall(ref mac) => visitor.visit_mac(mac),
|
PatKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -552,7 +552,7 @@ pub fn walk_foreign_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a ForeignI
|
||||||
walk_list!(visitor, visit_ty, ty);
|
walk_list!(visitor, visit_ty, ty);
|
||||||
}
|
}
|
||||||
ForeignItemKind::MacCall(mac) => {
|
ForeignItemKind::MacCall(mac) => {
|
||||||
visitor.visit_mac(mac);
|
visitor.visit_mac_call(mac);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -657,7 +657,7 @@ pub fn walk_assoc_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a AssocItem,
|
||||||
walk_list!(visitor, visit_ty, ty);
|
walk_list!(visitor, visit_ty, ty);
|
||||||
}
|
}
|
||||||
AssocItemKind::MacCall(mac) => {
|
AssocItemKind::MacCall(mac) => {
|
||||||
visitor.visit_mac(mac);
|
visitor.visit_mac_call(mac);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -687,7 +687,7 @@ pub fn walk_stmt<'a, V: Visitor<'a>>(visitor: &mut V, statement: &'a Stmt) {
|
||||||
StmtKind::Empty => {}
|
StmtKind::Empty => {}
|
||||||
StmtKind::MacCall(ref mac) => {
|
StmtKind::MacCall(ref mac) => {
|
||||||
let MacCallStmt { ref mac, style: _, ref attrs } = **mac;
|
let MacCallStmt { ref mac, style: _, ref attrs } = **mac;
|
||||||
visitor.visit_mac(mac);
|
visitor.visit_mac_call(mac);
|
||||||
for attr in attrs.iter() {
|
for attr in attrs.iter() {
|
||||||
visitor.visit_attribute(attr);
|
visitor.visit_attribute(attr);
|
||||||
}
|
}
|
||||||
|
@ -818,7 +818,7 @@ pub fn walk_expr<'a, V: Visitor<'a>>(visitor: &mut V, expression: &'a Expr) {
|
||||||
ExprKind::Ret(ref optional_expression) => {
|
ExprKind::Ret(ref optional_expression) => {
|
||||||
walk_list!(visitor, visit_expr, optional_expression);
|
walk_list!(visitor, visit_expr, optional_expression);
|
||||||
}
|
}
|
||||||
ExprKind::MacCall(ref mac) => visitor.visit_mac(mac),
|
ExprKind::MacCall(ref mac) => visitor.visit_mac_call(mac),
|
||||||
ExprKind::Paren(ref subexpression) => visitor.visit_expr(subexpression),
|
ExprKind::Paren(ref subexpression) => visitor.visit_expr(subexpression),
|
||||||
ExprKind::InlineAsm(ref ia) => {
|
ExprKind::InlineAsm(ref ia) => {
|
||||||
for (op, _) in &ia.operands {
|
for (op, _) in &ia.operands {
|
||||||
|
|
|
@ -114,7 +114,7 @@ impl<'ast> Visitor<'ast> for NodeCounter {
|
||||||
self.count += 1;
|
self.count += 1;
|
||||||
walk_lifetime(self, lifetime)
|
walk_lifetime(self, lifetime)
|
||||||
}
|
}
|
||||||
fn visit_mac(&mut self, mac: &MacCall) {
|
fn visit_mac_call(&mut self, mac: &MacCall) {
|
||||||
self.count += 1;
|
self.count += 1;
|
||||||
walk_mac(self, mac)
|
walk_mac(self, mac)
|
||||||
}
|
}
|
||||||
|
|
|
@ -358,7 +358,7 @@ fn find_type_parameters(
|
||||||
visit::walk_ty(self, ty)
|
visit::walk_ty(self, ty)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_mac(&mut self, mac: &ast::MacCall) {
|
fn visit_mac_call(&mut self, mac: &ast::MacCall) {
|
||||||
self.cx.span_err(mac.span(), "`derive` cannot be used on items with type macros");
|
self.cx.span_err(mac.span(), "`derive` cannot be used on items with type macros");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,6 @@ use crate::mbe::macro_parser::{MatchedNonterminal, MatchedSeq, NamedMatch};
|
||||||
use rustc_ast::mut_visit::{self, MutVisitor};
|
use rustc_ast::mut_visit::{self, MutVisitor};
|
||||||
use rustc_ast::token::{self, NtTT, Token};
|
use rustc_ast::token::{self, NtTT, Token};
|
||||||
use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndSpacing};
|
use rustc_ast::tokenstream::{DelimSpan, TokenStream, TokenTree, TreeAndSpacing};
|
||||||
use rustc_ast::MacCall;
|
|
||||||
use rustc_data_structures::fx::FxHashMap;
|
use rustc_data_structures::fx::FxHashMap;
|
||||||
use rustc_data_structures::sync::Lrc;
|
use rustc_data_structures::sync::Lrc;
|
||||||
use rustc_errors::{pluralize, PResult};
|
use rustc_errors::{pluralize, PResult};
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
use crate::tests::{matches_codepattern, string_to_crate};
|
use crate::tests::{matches_codepattern, string_to_crate};
|
||||||
|
|
||||||
use rustc_ast as ast;
|
use rustc_ast as ast;
|
||||||
use rustc_ast::mut_visit::{self, MutVisitor};
|
use rustc_ast::mut_visit::MutVisitor;
|
||||||
use rustc_ast_pretty::pprust;
|
use rustc_ast_pretty::pprust;
|
||||||
use rustc_span::symbol::Ident;
|
use rustc_span::symbol::Ident;
|
||||||
use rustc_span::with_default_session_globals;
|
use rustc_span::with_default_session_globals;
|
||||||
|
|
|
@ -270,7 +270,7 @@ impl<'a, T: EarlyLintPass> ast_visit::Visitor<'a> for EarlyContextAndPass<'a, T>
|
||||||
self.check_id(id);
|
self.check_id(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_mac(&mut self, mac: &'a ast::MacCall) {
|
fn visit_mac_call(&mut self, mac: &'a ast::MacCall) {
|
||||||
run_early_pass!(self, check_mac, mac);
|
run_early_pass!(self, check_mac, mac);
|
||||||
ast_visit::walk_mac(self, mac);
|
ast_visit::walk_mac(self, mac);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use super::{Parser, PathStyle};
|
use super::{Parser, PathStyle};
|
||||||
use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
|
use crate::{maybe_recover_from_interpolated_ty_qpath, maybe_whole};
|
||||||
use rustc_ast::mut_visit::{noop_visit_mac, noop_visit_pat, MutVisitor};
|
use rustc_ast::mut_visit::{noop_visit_pat, MutVisitor};
|
||||||
use rustc_ast::ptr::P;
|
use rustc_ast::ptr::P;
|
||||||
use rustc_ast::token;
|
use rustc_ast::token;
|
||||||
use rustc_ast::{self as ast, AttrVec, Attribute, FieldPat, MacCall, Pat, PatKind, RangeEnd};
|
use rustc_ast::{self as ast, AttrVec, Attribute, FieldPat, MacCall, Pat, PatKind, RangeEnd};
|
||||||
|
|
|
@ -336,7 +336,7 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
|
||||||
ast_visit::walk_lifetime(self, lifetime)
|
ast_visit::walk_lifetime(self, lifetime)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn visit_mac(&mut self, mac: &'v ast::MacCall) {
|
fn visit_mac_call(&mut self, mac: &'v ast::MacCall) {
|
||||||
self.record("MacCall", Id::None, mac);
|
self.record("MacCall", Id::None, mac);
|
||||||
ast_visit::walk_mac(self, mac)
|
ast_visit::walk_mac(self, mac)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// Regression test; used to ICE with 'visit_mac disabled by default' due to a
|
// Regression test; used to ICE with 'visit_mac_call disabled by default' due to a
|
||||||
// `MutVisitor` in `fn make_all_value_bindings_mutable` (`parse/parser/pat.rs`).
|
// `MutVisitor` in `fn make_all_value_bindings_mutable` (`parse/parser/pat.rs`).
|
||||||
|
|
||||||
macro_rules! mac1 {
|
macro_rules! mac1 {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
use crate::utils::{span_lint, span_lint_and_then};
|
use crate::utils::{span_lint, span_lint_and_then};
|
||||||
use rustc_ast::ast::{
|
use rustc_ast::ast::{
|
||||||
Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, MacCall, Pat, PatKind,
|
Arm, AssocItem, AssocItemKind, Attribute, Block, FnDecl, Item, ItemKind, Local, Pat, PatKind,
|
||||||
};
|
};
|
||||||
use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
|
use rustc_ast::visit::{walk_block, walk_expr, walk_pat, Visitor};
|
||||||
use rustc_lint::{EarlyContext, EarlyLintPass};
|
use rustc_lint::{EarlyContext, EarlyLintPass};
|
||||||
|
|
Loading…
Reference in New Issue