From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue, 3 Oct 2023 21:56:33 +0000 (-0400)
Subject: gccrs: Adjust methods for TuplePatternItems to match TupleStructItems
X-Git-Tag: basepoints/gcc-15~2108
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4e2110cac3f965d4a0c47f8440b99e47471c5b4d;p=thirdparty%2Fgcc.git

gccrs: Adjust methods for TuplePatternItems to match TupleStructItems

gcc/rust/ChangeLog:

	* hir/tree/rust-hir-pattern.h
	(TuplePatternItems::get_pattern_type): Rename to...
	(TuplePatternItems::get_item_type): ...here.
	(TuplePatternItemsMultiple::get_pattern_type): Rename to...
	(TuplePatternItemsMultiple::get_item_type): ...here.
	(TuplePatternItemsRanged::get_pattern_type): Rename to...
	(TuplePatternItemsRanged::get_item_type): ...here.

	* backend/rust-compile-expr.cc: Adjust calls to renamed methods.
	* backend/rust-compile-pattern.cc: Likewise.
	* typecheck/rust-hir-type-check-pattern.cc: Likewise.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 929f3c0f5e41..2e4bd57b3778 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -1038,7 +1038,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr)
 
       auto items
 	= HIR::TuplePattern (ref).get_items ()->clone_tuple_pattern_items ();
-      if (items->get_pattern_type ()
+      if (items->get_item_type ()
 	  == HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE)
 	{
 	  auto items_ref
diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 66726d20d422..53de49558b8d 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -416,7 +416,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
   tree access_expr = Backend::var_expression (tmp_var, pattern.get_locus ());
   ctx->add_statement (init_stmt);
 
-  switch (pattern.get_items ()->get_pattern_type ())
+  switch (pattern.get_items ()->get_item_type ())
     {
       case HIR::TuplePatternItems::TuplePatternItemType::RANGED: {
 	size_t tuple_idx = 0;
diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h
index c8defd4d7952..652faa4d9802 100644
--- a/gcc/rust/hir/tree/rust-hir-pattern.h
+++ b/gcc/rust/hir/tree/rust-hir-pattern.h
@@ -1033,7 +1033,7 @@ public:
 
   virtual std::string as_string () const = 0;
 
-  virtual TuplePatternItemType get_pattern_type () const = 0;
+  virtual TuplePatternItemType get_item_type () const = 0;
 
 protected:
   // pure virtual clone implementation
@@ -1078,7 +1078,7 @@ public:
 
   void accept_vis (HIRFullVisitor &vis) override;
 
-  TuplePatternItemType get_pattern_type () const override
+  TuplePatternItemType get_item_type () const override
   {
     return TuplePatternItemType::MULTIPLE;
   }
@@ -1148,7 +1148,7 @@ public:
 
   void accept_vis (HIRFullVisitor &vis) override;
 
-  TuplePatternItemType get_pattern_type () const override
+  TuplePatternItemType get_item_type () const override
   {
     return TuplePatternItemType::RANGED;
   }
diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index eacdd7cf1a2b..4c001453a54f 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -296,7 +296,7 @@ void
 TypeCheckPattern::visit (HIR::TuplePattern &pattern)
 {
   std::unique_ptr<HIR::TuplePatternItems> items;
-  switch (pattern.get_items ()->get_pattern_type ())
+  switch (pattern.get_items ()->get_item_type ())
     {
       case HIR::TuplePatternItems::TuplePatternItemType::MULTIPLE: {
 	HIR::TuplePatternItemsMultiple &ref