bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify rustc_ast::visit::Visitor::visit_enum_def.

Browse source 
It's passed three arguments that are never used.
This commit is contained in:
Nicholas Nethercote 2022-08-10 12:02:48 +10:00
parent 8c5303898e
commit 421125f30a
3 changed files with 8 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

19
compiler/rustc_ast/src/visit.rs
View file

@ -177,14 +177,8 @@ pub trait Visitor<'ast>: Sized {
fn visit_field_def(&mut self, s: &'ast FieldDef) { fn visit_field_def(&mut self, s: &'ast FieldDef) {
walk_field_def(self, s) walk_field_def(self, s)
} }
fn visit_enum_def( fn visit_enum_def(&mut self, enum_definition: &'ast EnumDef) {
&mut self, walk_enum_def(self, enum_definition)
enum_definition: &'ast EnumDef,
generics: &'ast Generics,
item_id: NodeId,
_: Span,
) {
walk_enum_def(self, enum_definition, generics, item_id)
} }
fn visit_variant(&mut self, v: &'ast Variant) { fn visit_variant(&mut self, v: &'ast Variant) {
walk_variant(self, v) walk_variant(self, v)
@ -334,7 +328,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
} }
ItemKind::Enum(ref enum_definition, ref generics) => { ItemKind::Enum(ref enum_definition, ref generics) => {
visitor.visit_generics(generics); visitor.visit_generics(generics);
visitor.visit_enum_def(enum_definition, generics, item.id, item.span) visitor.visit_enum_def(enum_definition)
} }
ItemKind::Impl(box Impl { ItemKind::Impl(box Impl {
defaultness: _, defaultness: _,
@ -377,12 +371,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
walk_list!(visitor, visit_attribute, &item.attrs); walk_list!(visitor, visit_attribute, &item.attrs);
} }
pub fn walk_enum_def<'a, V: Visitor<'a>>( pub fn walk_enum_def<'a, V: Visitor<'a>>(visitor: &mut V, enum_definition: &'a EnumDef) {
visitor: &mut V,
enum_definition: &'a EnumDef,
_: &'a Generics,
_: NodeId,
) {
walk_list!(visitor, visit_variant, &enum_definition.variants); walk_list!(visitor, visit_variant, &enum_definition.variants);
} }

12
compiler/rustc_ast_passes/src/ast_validation.rs
View file

@ -1547,16 +1547,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
self.with_banned_assoc_ty_bound(|this| visit::walk_struct_def(this, s)) self.with_banned_assoc_ty_bound(|this| visit::walk_struct_def(this, s))
} }
fn visit_enum_def( fn visit_enum_def(&mut self, enum_definition: &'a EnumDef) {
&mut self, self.with_banned_assoc_ty_bound(|this| visit::walk_enum_def(this, enum_definition))
enum_definition: &'a EnumDef,
generics: &'a Generics,
item_id: NodeId,
_: Span,
) {
self.with_banned_assoc_ty_bound(|this| {
visit::walk_enum_def(this, enum_definition, generics, item_id)
})
} }
fn visit_fn(&mut self, fk: FnKind<'a>, span: Span, id: NodeId) { fn visit_fn(&mut self, fk: FnKind<'a>, span: Span, id: NodeId) {

10
compiler/rustc_ast_passes/src/node_count.rs
View file

@ -91,15 +91,9 @@ impl<'ast> Visitor<'ast> for NodeCounter {
self.count += 1; self.count += 1;
walk_field_def(self, s) walk_field_def(self, s)
} }
fn visit_enum_def( fn visit_enum_def(&mut self, enum_definition: &EnumDef) {
&mut self,
enum_definition: &EnumDef,
generics: &Generics,
item_id: NodeId,
_: Span,
) {
self.count += 1; self.count += 1;
walk_enum_def(self, enum_definition, generics, item_id) walk_enum_def(self, enum_definition)
} }
fn visit_variant(&mut self, v: &Variant) { fn visit_variant(&mut self, v: &Variant) {
self.count += 1; self.count += 1;