hir: Rename get_pattern_mappings method

Unify with the name used in Expr to allow convenient template over
everything that has mappings.

gcc/rust/ChangeLog:

	* backend/rust-compile-base.cc: Rename method.
	* backend/rust-compile-expr.cc (sort_tuple_patterns): Rename method.
	* backend/rust-compile-pattern.cc (CompilePatternCaseLabelExpr::visit): Rename method.
	(CompilePatternBindings::visit): Rename method.
	(CompilePatternLet::visit): Rename method.
	* backend/rust-compile-stmt.cc (CompileStmt::visit): Rename method.
	* backend/rust-compile-var-decl.h: Rename method.
	* hir/rust-ast-lower-pattern.cc (ASTLoweringPattern::translate): Rename method.
	* hir/rust-hir-dump.cc (Dump::visit): Rename method.
	* hir/tree/rust-hir-path.h: Rename method.
	* hir/tree/rust-hir-pattern.h: Rename method.
	* hir/tree/rust-hir.h: Rename method.
	* typecheck/rust-hir-type-check-pattern.cc (TypeCheckPattern::Resolve): Rename method.
	(TypeCheckPattern::visit): Rename method.
	(ClosureParamInfer::visit): Rename method.
	* typecheck/rust-hir-type-check-stmt.cc (TypeCheckStmt::visit): Rename method.
	* util/rust-hir-map.cc (Mappings::insert_hir_pattern): Rename method.

Signed-off-by: Jakub Dupak <dev@jakubdupak.com>

5 files changed, 24 insertions, 25 deletions

diff --git a/gcc/rust/hir/rust-ast-lower-pattern.cc b/gcc/rust/hir/rust-ast-lower-pattern.cc
index f83c4d7..f0f94f6 100644
--- a/gcc/rust/hir/rust-ast-lower-pattern.cc
+++ b/gcc/rust/hir/rust-ast-lower-pattern.cc
@@ -35,8 +35,7 @@ ASTLoweringPattern::translate (AST::Pattern *pattern, bool is_let_top_level)
 
   resolver.mappings->insert_hir_pattern (resolver.translated);
   resolver.mappings->insert_location (
-    resolver.translated->get_pattern_mappings ().get_hirid (),
-    pattern->get_locus ());
+    resolver.translated->get_mappings ().get_hirid (), pattern->get_locus ());
 
   return resolver.translated;
 }
diff --git a/gcc/rust/hir/rust-hir-dump.cc b/gcc/rust/hir/rust-hir-dump.cc
index 342c62e..c3e1cd3 100644
--- a/gcc/rust/hir/rust-hir-dump.cc
+++ b/gcc/rust/hir/rust-hir-dump.cc
@@ -2019,7 +2019,7 @@ Dump::visit (LiteralPattern &e)
 {
   begin ("LiteralPattern");
   put_field ("lit", e.get_literal ().as_string ());
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   end ("LiteralPattern");
 }
 
@@ -2042,7 +2042,7 @@ void
 Dump::visit (WildcardPattern &e)
 {
   begin ("WildcardPattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   end ("WildcardPattern");
 }
 
@@ -2075,7 +2075,7 @@ void
 Dump::visit (RangePattern &e)
 {
   begin ("RangePattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   put_field ("lower", e.get_lower_bound ()->as_string ());
   put_field ("upper", e.get_upper_bound ()->as_string ());
   put_field ("has_ellipsis_syntax",
@@ -2087,7 +2087,7 @@ void
 Dump::visit (ReferencePattern &e)
 {
   begin ("ReferencePattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   put_field ("mut", std::to_string (e.is_mut ()));
   put_field ("pattern", e.get_referenced_pattern ()->as_string ());
   end ("ReferencePattern");
@@ -2161,7 +2161,7 @@ void
 Dump::visit (TupleStructPattern &e)
 {
   begin ("TupleStructPattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
 
   put_field ("path", e.get_path ().as_string ());
 
@@ -2191,7 +2191,7 @@ void
 Dump::visit (TuplePattern &e)
 {
   begin ("TuplePattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   visit_field ("items", e.get_items ());
   end ("TuplePattern");
 }
@@ -2200,7 +2200,7 @@ void
 Dump::visit (SlicePattern &e)
 {
   begin ("SlicePattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   visit_collection ("items", e.get_items ());
   end ("SlicePattern");
 }
@@ -2209,7 +2209,7 @@ void
 Dump::visit (AltPattern &e)
 {
   begin ("AltPattern");
-  do_mappings (e.get_pattern_mappings ());
+  do_mappings (e.get_mappings ());
   visit_collection ("alts", e.get_alts ());
   end ("AltPattern");
 }
diff --git a/gcc/rust/hir/tree/rust-hir-path.h b/gcc/rust/hir/tree/rust-hir-path.h
index 65cc285..f390b43 100644
--- a/gcc/rust/hir/tree/rust-hir-path.h
+++ b/gcc/rust/hir/tree/rust-hir-path.h
@@ -390,9 +390,9 @@ public:
 	   == 0;
   }
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
-    return get_mappings ();
+    return mappings;
   }
 
 protected:
@@ -864,9 +864,9 @@ public:
 
   location_t get_locus () { return locus; }
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
-    return get_mappings ();
+    return mappings;
   }
 
 protected:
diff --git a/gcc/rust/hir/tree/rust-hir-pattern.h b/gcc/rust/hir/tree/rust-hir-pattern.h
index b8aa855..65dc53a 100644
--- a/gcc/rust/hir/tree/rust-hir-pattern.h
+++ b/gcc/rust/hir/tree/rust-hir-pattern.h
@@ -51,7 +51,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -137,7 +137,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -176,7 +176,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -395,7 +395,7 @@ public:
 
   bool get_has_ellipsis_syntax () { return has_ellipsis_syntax; };
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -464,7 +464,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -758,7 +758,7 @@ public:
   PathInExpression &get_path () { return path; }
   StructPatternElements &get_struct_pattern_elems () { return elems; }
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -991,7 +991,7 @@ public:
 
   std::unique_ptr<TupleStructItems> &get_items () { return items; }
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -1218,7 +1218,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -1293,7 +1293,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
@@ -1365,7 +1365,7 @@ public:
   void accept_vis (HIRFullVisitor &vis) override;
   void accept_vis (HIRPatternVisitor &vis) override;
 
-  const Analysis::NodeMapping &get_pattern_mappings () const override final
+  const Analysis::NodeMapping &get_mappings () const override final
   {
     return mappings;
   }
diff --git a/gcc/rust/hir/tree/rust-hir.h b/gcc/rust/hir/tree/rust-hir.h
index bd618f6..81baa50 100644
--- a/gcc/rust/hir/tree/rust-hir.h
+++ b/gcc/rust/hir/tree/rust-hir.h
@@ -420,7 +420,7 @@ public:
 
   virtual void accept_vis (HIRPatternVisitor &vis) = 0;
 
-  virtual const Analysis::NodeMapping &get_pattern_mappings () const = 0;
+  virtual const Analysis::NodeMapping &get_mappings () const = 0;
 
   virtual location_t get_locus () const = 0;