[COMMITTED 082/220] gccrs: Rename get_pattern_to_bind to get_subpattern

[arthur . cohen]

From: Zhi Heng <yapz...@gmail.com>

gcc/rust/ChangeLog:

        * ast/rust-ast-collector.cc: Rename get_pattern_to_bind to 
get_subpattern
        * ast/rust-ast-visitor.cc: Ditto.
        * ast/rust-pattern.h: Ditto.
        * expand/rust-cfg-strip.cc: Ditto.
        * hir/rust-ast-lower-pattern.cc: Ditto.

Signed-off-by: Yap Zhi Heng <yapz...@gmail.com>
---
 gcc/rust/ast/rust-ast-collector.cc     | 2 +-
 gcc/rust/ast/rust-ast-visitor.cc       | 2 +-
 gcc/rust/ast/rust-pattern.h            | 3 +--
 gcc/rust/expand/rust-cfg-strip.cc      | 2 +-
 gcc/rust/hir/rust-ast-lower-pattern.cc | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/gcc/rust/ast/rust-ast-collector.cc 
b/gcc/rust/ast/rust-ast-collector.cc
index b0e06ab85db..5a8d462dbd7 100644
--- a/gcc/rust/ast/rust-ast-collector.cc
+++ b/gcc/rust/ast/rust-ast-collector.cc
@@ -2485,7 +2485,7 @@ TokenCollector::visit (IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       push (Rust::Token::make (PATTERN_BIND, UNDEF_LOCATION));
-      visit (pattern.get_pattern_to_bind ());
+      visit (pattern.get_subpattern ());
     }
 }
 
diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc
index 02f4f1664d6..f21a5bbfcb7 100644
--- a/gcc/rust/ast/rust-ast-visitor.cc
+++ b/gcc/rust/ast/rust-ast-visitor.cc
@@ -1200,7 +1200,7 @@ void
 DefaultASTVisitor::visit (AST::IdentifierPattern &pattern)
 {
   if (pattern.has_subpattern ())
-    visit (pattern.get_pattern_to_bind ());
+    visit (pattern.get_subpattern ());
 }
 
 void
diff --git a/gcc/rust/ast/rust-pattern.h b/gcc/rust/ast/rust-pattern.h
index 195a08f4fcd..b9c0fd9bb2f 100644
--- a/gcc/rust/ast/rust-pattern.h
+++ b/gcc/rust/ast/rust-pattern.h
@@ -137,8 +137,7 @@ public:
 
   void accept_vis (ASTVisitor &vis) override;
 
-  // TODO: is this better? Or is a "vis_pattern" better?
-  Pattern &get_pattern_to_bind ()
+  Pattern &get_subpattern ()
   {
     rust_assert (has_subpattern ());
     return *subpattern;
diff --git a/gcc/rust/expand/rust-cfg-strip.cc 
b/gcc/rust/expand/rust-cfg-strip.cc
index 0db6122d5c3..774e2b46b94 100644
--- a/gcc/rust/expand/rust-cfg-strip.cc
+++ b/gcc/rust/expand/rust-cfg-strip.cc
@@ -2267,7 +2267,7 @@ CfgStrip::visit (AST::IdentifierPattern &pattern)
 
   AST::DefaultASTVisitor::visit (pattern);
 
-  auto &sub_pattern = pattern.get_pattern_to_bind ();
+  auto &sub_pattern = pattern.get_subpattern ();
   if (sub_pattern.is_marked_for_strip ())
     rust_error_at (sub_pattern.get_locus (),
                   "cannot strip pattern in this position");
diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc 
b/gcc/rust/hir/rust-ast-lower-pattern.cc
index 9baf81d6ee9..bb5b93b2c49 100644
--- a/gcc/rust/hir/rust-ast-lower-pattern.cc
+++ b/gcc/rust/hir/rust-ast-lower-pattern.cc
@@ -53,7 +53,7 @@ ASTLoweringPattern::visit (AST::IdentifierPattern &pattern)
   if (pattern.has_subpattern ())
     {
       subpattern = std::unique_ptr<Pattern> (
-       ASTLoweringPattern::translate (pattern.get_pattern_to_bind ()));
+       ASTLoweringPattern::translate (pattern.get_subpattern ()));
     }
   translated
     = new HIR::IdentifierPattern (mapping, pattern.get_ident (),
-- 
2.49.0