[COMMITTED 14/43] gccrs: Remove redundant expand visitor overloads

[arthur . cohen]

From: Owen Avery <powerboat9.ga...@gmail.com>

gcc/rust/ChangeLog:

        * expand/rust-expand-visitor.cc (ExpandVisitor::visit): Remove
        some redundant function overloads.
        * expand/rust-expand-visitor.h (ExpandVisitor::visit): Likewise.

Signed-off-by: Owen Avery <powerboat9.ga...@gmail.com>
---
 gcc/rust/expand/rust-expand-visitor.cc | 166 -------------------------
 gcc/rust/expand/rust-expand-visitor.h  |  23 ----
 2 files changed, 189 deletions(-)

diff --git a/gcc/rust/expand/rust-expand-visitor.cc 
b/gcc/rust/expand/rust-expand-visitor.cc
index 5fed8b52f73..690c74bee28 100644
--- a/gcc/rust/expand/rust-expand-visitor.cc
+++ b/gcc/rust/expand/rust-expand-visitor.cc
@@ -597,67 +597,10 @@ void
 ExpandVisitor::visit (AST::MetaItemPathExpr &)
 {}
 
-void
-ExpandVisitor::visit (AST::ArithmeticOrLogicalExpr &expr)
-{
-  maybe_expand_expr (expr.get_left_expr_ptr ());
-  maybe_expand_expr (expr.get_right_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::ComparisonExpr &expr)
-{
-  maybe_expand_expr (expr.get_left_expr_ptr ());
-  maybe_expand_expr (expr.get_right_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::LazyBooleanExpr &expr)
-{
-  maybe_expand_expr (expr.get_left_expr_ptr ());
-  maybe_expand_expr (expr.get_right_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::TypeCastExpr &expr)
-{
-  maybe_expand_expr (expr.get_casted_expr_ptr ());
-  maybe_expand_type (expr.get_type_to_cast_to_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::AssignmentExpr &expr)
-{
-  maybe_expand_expr (expr.get_left_expr_ptr ());
-  maybe_expand_expr (expr.get_right_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::CompoundAssignmentExpr &expr)
-{
-  maybe_expand_expr (expr.get_left_expr_ptr ());
-  maybe_expand_expr (expr.get_right_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::GroupedExpr &expr)
-{
-  maybe_expand_expr (expr.get_expr_in_parens_ptr ());
-}
-
 void
 ExpandVisitor::visit (AST::StructExprStruct &expr)
 {}
 
-void
-ExpandVisitor::visit (AST::CallExpr &expr)
-{
-  visit (expr.get_function_expr ());
-
-  for (auto &param : expr.get_params ())
-    maybe_expand_expr (param);
-}
-
 void
 ExpandVisitor::visit (AST::ClosureExprInner &expr)
 {
@@ -686,10 +629,6 @@ ExpandVisitor::visit (AST::ClosureExprInnerTyped &expr)
   visit (expr.get_definition_expr ());
 }
 
-void
-ExpandVisitor::visit (AST::ContinueExpr &expr)
-{}
-
 void
 ExpandVisitor::visit (AST::IfExpr &expr)
 {
@@ -724,13 +663,6 @@ ExpandVisitor::visit (AST::IfLetExprConseqElse &expr)
   visit (expr.get_else_block ());
 }
 
-void
-ExpandVisitor::visit (AST::TupleExpr &expr)
-{
-  for (auto &sub : expr.get_tuple_elems ())
-    maybe_expand_expr (sub);
-}
-
 void
 ExpandVisitor::visit (AST::TypeParam &param)
 {
@@ -856,23 +788,6 @@ ExpandVisitor::visit (AST::Union &union_item)
   expand_struct_fields (union_item.get_variants ());
 }
 
-void
-ExpandVisitor::visit (AST::ConstantItem &const_item)
-{
-  maybe_expand_type (const_item.get_type_ptr ());
-
-  if (const_item.has_expr ())
-    maybe_expand_expr (const_item.get_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::StaticItem &static_item)
-{
-  maybe_expand_type (static_item.get_type_ptr ());
-
-  maybe_expand_expr (static_item.get_expr_ptr ());
-}
-
 void
 ExpandVisitor::visit (AST::Trait &trait)
 {
@@ -994,87 +909,6 @@ void
 ExpandVisitor::visit (AST::StructPatternFieldIdent &field)
 {}
 
-void
-ExpandVisitor::visit (AST::GroupedPattern &pattern)
-{
-  maybe_expand_pattern (pattern.get_pattern_in_parens_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::SlicePatternItemsNoRest &items)
-{
-  for (auto &sub : items.get_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::SlicePatternItemsHasRest &items)
-{
-  for (auto &sub : items.get_lower_patterns ())
-    maybe_expand_pattern (sub);
-  for (auto &sub : items.get_upper_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::AltPattern &pattern)
-{
-  for (auto &alt : pattern.get_alts ())
-    maybe_expand_pattern (alt);
-}
-
-void
-ExpandVisitor::visit (AST::TupleStructItemsNoRest &tuple_items)
-{
-  for (auto &sub : tuple_items.get_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::TupleStructItemsHasRest &tuple_items)
-{
-  for (auto &sub : tuple_items.get_lower_patterns ())
-    maybe_expand_pattern (sub);
-
-  for (auto &sub : tuple_items.get_upper_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::TuplePatternItemsNoRest &tuple_items)
-{
-  for (auto &sub : tuple_items.get_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::TuplePatternItemsHasRest &tuple_items)
-{
-  for (auto &sub : tuple_items.get_lower_patterns ())
-    maybe_expand_pattern (sub);
-
-  for (auto &sub : tuple_items.get_upper_patterns ())
-    maybe_expand_pattern (sub);
-}
-
-void
-ExpandVisitor::visit (AST::LetStmt &stmt)
-{
-  maybe_expand_pattern (stmt.get_pattern_ptr ());
-
-  if (stmt.has_type ())
-    maybe_expand_type (stmt.get_type_ptr ());
-
-  if (stmt.has_init_expr ())
-    maybe_expand_expr (stmt.get_init_expr_ptr ());
-}
-
-void
-ExpandVisitor::visit (AST::ExprStmt &stmt)
-{
-  maybe_expand_expr (stmt.get_expr_ptr ());
-}
-
 void
 ExpandVisitor::visit (AST::BareFunctionType &type)
 {
diff --git a/gcc/rust/expand/rust-expand-visitor.h 
b/gcc/rust/expand/rust-expand-visitor.h
index 08de64e02ed..2a3938afe73 100644
--- a/gcc/rust/expand/rust-expand-visitor.h
+++ b/gcc/rust/expand/rust-expand-visitor.h
@@ -234,27 +234,17 @@ public:
   void visit (AST::AttrInputMacro &) override;
   void visit (AST::MetaItemLitExpr &) override;
   void visit (AST::MetaItemPathExpr &) override;
-  void visit (AST::ArithmeticOrLogicalExpr &expr) override;
-  void visit (AST::ComparisonExpr &expr) override;
-  void visit (AST::LazyBooleanExpr &expr) override;
-  void visit (AST::TypeCastExpr &expr) override;
-  void visit (AST::AssignmentExpr &expr) override;
-  void visit (AST::CompoundAssignmentExpr &expr) override;
-  void visit (AST::GroupedExpr &expr) override;
   void visit (AST::StructExprStruct &expr) override;
 
-  void visit (AST::CallExpr &expr) override;
   void visit (AST::ClosureExprInner &expr) override;
 
   void visit (AST::BlockExpr &expr) override;
 
   void visit (AST::ClosureExprInnerTyped &expr) override;
-  void visit (AST::ContinueExpr &expr) override;
   void visit (AST::IfExpr &expr) override;
   void visit (AST::IfExprConseqElse &expr) override;
   void visit (AST::IfLetExpr &expr) override;
   void visit (AST::IfLetExprConseqElse &expr) override;
-  void visit (AST::TupleExpr &expr) override;
   void visit (AST::TypeParam &param) override;
   void visit (AST::LifetimeWhereClauseItem &) override;
   void visit (AST::TypeBoundWhereClauseItem &item) override;
@@ -272,8 +262,6 @@ public:
   void visit (AST::EnumItemStruct &item) override;
   void visit (AST::EnumItemDiscriminant &item) override;
   void visit (AST::Union &union_item) override;
-  void visit (AST::ConstantItem &const_item) override;
-  void visit (AST::StaticItem &static_item) override;
   void visit (AST::Trait &trait) override;
   void visit (AST::InherentImpl &impl) override;
   void visit (AST::TraitImpl &impl) override;
@@ -290,17 +278,6 @@ public:
   void visit (AST::MetaListPaths &) override;
   void visit (AST::MetaListNameValueStr &) override;
   void visit (AST::StructPatternFieldIdent &field) override;
-  void visit (AST::GroupedPattern &pattern) override;
-  void visit (AST::SlicePatternItemsNoRest &items) override;
-  void visit (AST::SlicePatternItemsHasRest &items) override;
-  void visit (AST::AltPattern &pattern) override;
-  void visit (AST::TupleStructItemsNoRest &tuple_items) override;
-  void visit (AST::TupleStructItemsHasRest &tuple_items) override;
-  void visit (AST::TuplePatternItemsNoRest &tuple_items) override;
-  void visit (AST::TuplePatternItemsHasRest &tuple_items) override;
-
-  void visit (AST::LetStmt &stmt) override;
-  void visit (AST::ExprStmt &stmt) override;
 
   void visit (AST::BareFunctionType &type) override;
   void visit (AST::FunctionParam &param) override;
-- 
2.50.1