Skip to content

Commit 421125f

Browse files
committed
Simplify rustc_ast::visit::Visitor::visit_enum_def.
It's passed three arguments that are never used.
1 parent 8c53038 commit 421125f

File tree

3 files changed

+9
-34
lines changed

3 files changed

+9
-34
lines changed

compiler/rustc_ast/src/visit.rs

+4-15
Original file line numberDiff line numberDiff line change
@@ -177,14 +177,8 @@ pub trait Visitor<'ast>: Sized {
177177
fn visit_field_def(&mut self, s: &'ast FieldDef) {
178178
walk_field_def(self, s)
179179
}
180-
fn visit_enum_def(
181-
&mut self,
182-
enum_definition: &'ast EnumDef,
183-
generics: &'ast Generics,
184-
item_id: NodeId,
185-
_: Span,
186-
) {
187-
walk_enum_def(self, enum_definition, generics, item_id)
180+
fn visit_enum_def(&mut self, enum_definition: &'ast EnumDef) {
181+
walk_enum_def(self, enum_definition)
188182
}
189183
fn visit_variant(&mut self, v: &'ast Variant) {
190184
walk_variant(self, v)
@@ -334,7 +328,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
334328
}
335329
ItemKind::Enum(ref enum_definition, ref generics) => {
336330
visitor.visit_generics(generics);
337-
visitor.visit_enum_def(enum_definition, generics, item.id, item.span)
331+
visitor.visit_enum_def(enum_definition)
338332
}
339333
ItemKind::Impl(box Impl {
340334
defaultness: _,
@@ -377,12 +371,7 @@ pub fn walk_item<'a, V: Visitor<'a>>(visitor: &mut V, item: &'a Item) {
377371
walk_list!(visitor, visit_attribute, &item.attrs);
378372
}
379373

380-
pub fn walk_enum_def<'a, V: Visitor<'a>>(
381-
visitor: &mut V,
382-
enum_definition: &'a EnumDef,
383-
_: &'a Generics,
384-
_: NodeId,
385-
) {
374+
pub fn walk_enum_def<'a, V: Visitor<'a>>(visitor: &mut V, enum_definition: &'a EnumDef) {
386375
walk_list!(visitor, visit_variant, &enum_definition.variants);
387376
}
388377

compiler/rustc_ast_passes/src/ast_validation.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -1547,16 +1547,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
15471547
self.with_banned_assoc_ty_bound(|this| visit::walk_struct_def(this, s))
15481548
}
15491549

1550-
fn visit_enum_def(
1551-
&mut self,
1552-
enum_definition: &'a EnumDef,
1553-
generics: &'a Generics,
1554-
item_id: NodeId,
1555-
_: Span,
1556-
) {
1557-
self.with_banned_assoc_ty_bound(|this| {
1558-
visit::walk_enum_def(this, enum_definition, generics, item_id)
1559-
})
1550+
fn visit_enum_def(&mut self, enum_definition: &'a EnumDef) {
1551+
self.with_banned_assoc_ty_bound(|this| visit::walk_enum_def(this, enum_definition))
15601552
}
15611553

15621554
fn visit_fn(&mut self, fk: FnKind<'a>, span: Span, id: NodeId) {

compiler/rustc_ast_passes/src/node_count.rs

+3-9
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,9 @@ impl<'ast> Visitor<'ast> for NodeCounter {
9191
self.count += 1;
9292
walk_field_def(self, s)
9393
}
94-
fn visit_enum_def(
95-
&mut self,
96-
enum_definition: &EnumDef,
97-
generics: &Generics,
98-
item_id: NodeId,
99-
_: Span,
100-
) {
101-
self.count += 1;
102-
walk_enum_def(self, enum_definition, generics, item_id)
94+
fn visit_enum_def(&mut self, enum_definition: &EnumDef) {
95+
self.count += 1;
96+
walk_enum_def(self, enum_definition)
10397
}
10498
fn visit_variant(&mut self, v: &Variant) {
10599
self.count += 1;

0 commit comments

Comments
 (0)