Remove match arm pattern vector to single pattern

gcc/rust/ast/rust-ast-builder.cc

@@ -484,10 +484,7 @@ Builder::match (std::unique_ptr<Expr> &&scrutinee,
 MatchArm
 Builder::match_arm (std::unique_ptr<Pattern> &&pattern)
 {
-  auto patterns = std::vector<std::unique_ptr<Pattern>> ();
-  patterns.emplace_back (std::move (pattern));
-
-  return MatchArm (std::move (patterns), loc);
+  return MatchArm (std::move (pattern), loc);
 }
 
 MatchCase

gcc/rust/ast/rust-ast-collector.cc

@@ -1431,10 +1431,7 @@ TokenCollector::visit (WhileLetLoopExpr &expr)
   push (Rust::Token::make (WHILE, expr.get_locus ()));
   push (Rust::Token::make (LET, UNDEF_LOCATION));
   // TODO: The reference mention only one Pattern
-  for (auto &item : expr.get_patterns ())
-    {
-      visit (item);
-    }
+  visit (expr.get_pattern ());
   push (Rust::Token::make (EQUAL, UNDEF_LOCATION));
   visit (expr.get_scrutinee_expr ());
   visit (expr.get_loop_block ());
@@ -1473,10 +1470,7 @@ TokenCollector::visit (IfLetExpr &expr)
 {
   push (Rust::Token::make (IF, expr.get_locus ()));
   push (Rust::Token::make (LET, UNDEF_LOCATION));
-  for (auto &pattern : expr.get_patterns ())
-    {
-      visit (pattern);
-    }
+  visit (expr.get_pattern ());
   push (Rust::Token::make (EQUAL, UNDEF_LOCATION));
   visit (expr.get_value_expr ());
   visit (expr.get_if_block ());
@@ -1495,10 +1489,7 @@ void
 TokenCollector::visit (MatchArm &arm)
 {
   visit_items_as_lines (arm.get_outer_attrs ());
-  for (auto &pattern : arm.get_patterns ())
-    {
-      visit (pattern);
-    }
+  visit (arm.get_pattern ());
   if (arm.has_match_arm_guard ())
     {
       push (Rust::Token::make (IF, UNDEF_LOCATION));

gcc/rust/ast/rust-ast-pointer-visitor.cc

@@ -587,8 +587,7 @@ void
 PointerVisitor::visit (AST::WhileLetLoopExpr &expr)
 {
   visit_outer_attrs (expr);
-  for (auto &pattern : expr.get_patterns ())
-    reseat (pattern);
+  reseat (expr.get_pattern ());
 
   if (expr.has_loop_label ())
     visit (expr.get_loop_label ());
@@ -627,8 +626,7 @@ void
 PointerVisitor::visit (AST::IfLetExpr &expr)
 {
   visit_outer_attrs (expr);
-  for (auto &pattern : expr.get_patterns ())
-    reseat (pattern);
+  reseat (expr.get_pattern ());
   reseat (expr.get_value_expr_ptr ());
   visit (expr.get_if_block ());
 }
@@ -644,8 +642,7 @@ void
 PointerVisitor::visit (AST::MatchArm &arm)
 {
   visit_outer_attrs (arm);
-  for (auto &pattern : arm.get_patterns ())
-    reseat (pattern);
+  reseat (arm.get_pattern ());
   if (arm.has_match_arm_guard ())
     reseat (arm.get_guard_expr_ptr ());
 }

gcc/rust/ast/rust-ast-visitor.cc

@@ -607,8 +607,7 @@ void
 DefaultASTVisitor::visit (AST::WhileLetLoopExpr &expr)
 {
   visit_outer_attrs (expr);
-  for (auto &pattern : expr.get_patterns ())
-    visit (pattern);
+  visit (expr.get_pattern ());
 
   if (expr.has_loop_label ())
     visit (expr.get_loop_label ());
@@ -647,8 +646,7 @@ void
 DefaultASTVisitor::visit (AST::IfLetExpr &expr)
 {
   visit_outer_attrs (expr);
-  for (auto &pattern : expr.get_patterns ())
-    visit (pattern);
+  visit (expr.get_pattern ());
   visit (expr.get_value_expr ());
   visit (expr.get_if_block ());
 }
@@ -664,8 +662,7 @@ void
 DefaultASTVisitor::visit (AST::MatchArm &arm)
 {
   visit_outer_attrs (arm);
-  for (auto &pattern : arm.get_patterns ())
-    visit (pattern);
+  visit (arm.get_pattern ());
   if (arm.has_match_arm_guard ())
     visit (arm.get_guard_expr ());
 }

gcc/rust/ast/rust-ast.cc

@@ -1943,14 +1943,13 @@ IfLetExpr::as_string () const
   str += append_attributes (outer_attrs, OUTER);
 
   str += "\n Condition match arm patterns: ";
-  if (match_arm_patterns.empty ())
+  if (match_arm_pattern == nullptr)
     {
       str += "none";
     }
   else
     {
-      for (const auto &pattern : match_arm_patterns)
-	str += "\n  " + pattern->as_string ();
+      str += "\n  " + match_arm_pattern->as_string ();
     }
 
   str += "\n Scrutinee expr: " + value->as_string ();
@@ -2167,14 +2166,13 @@ WhileLetLoopExpr::as_string () const
     str += get_loop_label ().as_string ();
 
   str += "\n Match arm patterns: ";
-  if (match_arm_patterns.empty ())
+  if (match_arm_pattern == nullptr)
     {
       str += "none";
     }
   else
     {
-      for (const auto &pattern : match_arm_patterns)
-	str += "\n  " + pattern->as_string ();
+      str += "\n  " + match_arm_pattern->as_string ();
     }
 
   str += "\n Scrutinee expr: " + scrutinee->as_string ();
@@ -2253,14 +2251,13 @@ MatchArm::as_string () const
   std::string str = append_attributes (outer_attrs, OUTER);
 
   str += "\nPatterns: ";
-  if (match_arm_patterns.empty ())
+  if (match_arm_pattern == nullptr)
     {
       str += "none";
     }
   else
     {
-      for (const auto &pattern : match_arm_patterns)
-	str += "\n " + pattern->as_string ();
+      str += "\n " + match_arm_pattern->as_string ();
     }
 
   str += "\nGuard expr: ";

gcc/rust/ast/rust-desugar-question-mark.cc

@@ -39,11 +39,7 @@ MatchArm
 make_match_arm (std::unique_ptr<Pattern> &&pattern)
 {
   auto loc = pattern->get_locus ();
-
-  auto patterns = std::vector<std::unique_ptr<Pattern>> ();
-  patterns.emplace_back (std::move (pattern));
-
-  return MatchArm (std::move (patterns), loc);
+  return MatchArm (std::move (pattern), loc);
 }
 
 MatchCase

gcc/rust/ast/rust-desugar-while-let.cc

@@ -53,9 +53,9 @@ DesugarWhileLet::DesugarCtx::make_continue_arm (
 std::unique_ptr<Expr>
 DesugarWhileLet::desugar (WhileLetLoopExpr &expr)
 {
-  rust_assert (expr.get_patterns ().size () == 1);
+  rust_assert (expr.get_pattern () != nullptr);
 
-  auto pattern = expr.get_patterns ()[0]->clone_pattern ();
+  auto pattern = expr.get_pattern ()->clone_pattern ();
   auto body = expr.get_loop_block ().clone_block_expr ();
   auto scrutinee = expr.get_scrutinee_expr ().clone_expr ();