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>

13 files changed, 66 insertions, 69 deletions

diff --git a/gcc/rust/backend/rust-compile-base.cc b/gcc/rust/backend/rust-compile-base.cc
index 9a51c47..7aab59b 100644
--- a/gcc/rust/backend/rust-compile-base.cc
+++ b/gcc/rust/backend/rust-compile-base.cc
@@ -615,7 +615,7 @@ HIRCompileBase::compile_function (
       param_vars.push_back (compiled_param_var);
 
       const HIR::Pattern &param_pattern = *referenced_param.get_param_name ();
-      ctx->insert_var_decl (param_pattern.get_pattern_mappings ().get_hirid (),
+      ctx->insert_var_decl (param_pattern.get_mappings ().get_hirid (),
 			    compiled_param_var);
     }
 
diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index 2882f8e..351d5d7 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -1072,7 +1072,7 @@ sort_tuple_patterns (HIR::MatchExpr &expr)
 
 	      // Construct a TuplePattern from the rest of the patterns
 	      result_pattern = std::unique_ptr<HIR::Pattern> (
-		new HIR::TuplePattern (ref.get_pattern_mappings (),
+		new HIR::TuplePattern (ref.get_mappings (),
 				       std::move (new_items),
 				       ref.get_locus ()));
 	    }
diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 39ba74e..5358c8a 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -85,8 +85,8 @@ CompilePatternCaseLabelExpr::visit (HIR::LiteralPattern &pattern)
 {
   // Compile the literal
   HIR::LiteralExpr *litexpr
-    = new HIR::LiteralExpr (pattern.get_pattern_mappings (),
-			    pattern.get_literal (), pattern.get_locus (),
+    = new HIR::LiteralExpr (pattern.get_mappings (), pattern.get_literal (),
+			    pattern.get_locus (),
 			    std::vector<AST::Attribute> ());
 
   // Note: Floating point literals are currently accepted but will likely be
@@ -164,10 +164,10 @@ void
 CompilePatternCaseLabelExpr::visit (HIR::RangePattern &pattern)
 {
   tree upper = compile_range_pattern_bound (pattern.get_upper_bound ().get (),
-					    pattern.get_pattern_mappings (),
+					    pattern.get_mappings (),
 					    pattern.get_locus (), ctx);
   tree lower = compile_range_pattern_bound (pattern.get_lower_bound ().get (),
-					    pattern.get_pattern_mappings (),
+					    pattern.get_mappings (),
 					    pattern.get_locus (), ctx);
 
   case_label_expr = build_case_label (lower, upper, associated_case_label);
@@ -239,7 +239,7 @@ CompilePatternBindings::visit (HIR::TupleStructPattern &pattern)
 						      pattern->get_locus ());
 
 		ctx->insert_pattern_binding (
-		  pattern->get_pattern_mappings ().get_hirid (), binding);
+		  pattern->get_mappings ().get_hirid (), binding);
 	      }
 	  }
 	else
@@ -255,7 +255,7 @@ CompilePatternBindings::visit (HIR::TupleStructPattern &pattern)
 						      pattern->get_locus ());
 
 		ctx->insert_pattern_binding (
-		  pattern->get_pattern_mappings ().get_hirid (), binding);
+		  pattern->get_mappings ().get_hirid (), binding);
 	      }
 	  }
       }
@@ -362,7 +362,7 @@ CompilePatternBindings::visit (HIR::ReferencePattern &pattern)
 void
 CompilePatternBindings::visit (HIR::IdentifierPattern &pattern)
 {
-  ctx->insert_pattern_binding (pattern.get_pattern_mappings ().get_hirid (),
+  ctx->insert_pattern_binding (pattern.get_mappings ().get_hirid (),
 			       match_scrutinee_expr);
 }
 
@@ -371,7 +371,7 @@ CompilePatternLet::visit (HIR::IdentifierPattern &pattern)
 {
   Bvariable *var = nullptr;
   rust_assert (
-    ctx->lookup_var_decl (pattern.get_pattern_mappings ().get_hirid (), &var));
+    ctx->lookup_var_decl (pattern.get_mappings ().get_hirid (), &var));
 
   auto fnctx = ctx->peek_fn ();
   if (ty->is_unit ())
@@ -429,7 +429,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items_lower)
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
@@ -448,7 +448,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items_upper)
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
@@ -470,7 +470,7 @@ CompilePatternLet::visit (HIR::TuplePattern &pattern)
 	for (auto &sub : items.get_patterns ())
 	  {
 	    TyTy::BaseType *ty_sub = nullptr;
-	    HirId pattern_id = pattern.get_pattern_mappings ().get_hirid ();
+	    HirId pattern_id = pattern.get_mappings ().get_hirid ();
 	    bool ok = ctx->get_tyctx ()->lookup_type (pattern_id, &ty_sub);
 	    rust_assert (ok);
 
diff --git a/gcc/rust/backend/rust-compile-stmt.cc b/gcc/rust/backend/rust-compile-stmt.cc
index 5c1170b..839fa0c 100644
--- a/gcc/rust/backend/rust-compile-stmt.cc
+++ b/gcc/rust/backend/rust-compile-stmt.cc
@@ -49,7 +49,7 @@ CompileStmt::visit (HIR::LetStmt &stmt)
     return;
 
   HIR::Pattern &stmt_pattern = *stmt.get_pattern ();
-  HirId stmt_id = stmt_pattern.get_pattern_mappings ().get_hirid ();
+  HirId stmt_id = stmt_pattern.get_mappings ().get_hirid ();
 
   TyTy::BaseType *ty = nullptr;
   if (!ctx->get_tyctx ()->lookup_type (stmt_id, &ty))
diff --git a/gcc/rust/backend/rust-compile-var-decl.h b/gcc/rust/backend/rust-compile-var-decl.h
index 91c55ee..eb7977b 100644
--- a/gcc/rust/backend/rust-compile-var-decl.h
+++ b/gcc/rust/backend/rust-compile-var-decl.h
@@ -47,7 +47,7 @@ public:
 				 translated_type, NULL /*decl_var*/,
 				 pattern.get_locus ());
 
-    HirId stmt_id = pattern.get_pattern_mappings ().get_hirid ();
+    HirId stmt_id = pattern.get_mappings ().get_hirid ();
     ctx->insert_var_decl (stmt_id, var);
 
     locals.push_back (var);
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;
 
diff --git a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
index 397d57f..a5bceae 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-pattern.cc
@@ -34,10 +34,9 @@ TypeCheckPattern::Resolve (HIR::Pattern *pattern, TyTy::BaseType *parent)
   pattern->accept_vis (resolver);
 
   if (resolver.infered == nullptr)
-    return new TyTy::ErrorType (pattern->get_pattern_mappings ().get_hirid ());
+    return new TyTy::ErrorType (pattern->get_mappings ().get_hirid ());
 
-  resolver.context->insert_type (pattern->get_pattern_mappings (),
-				 resolver.infered);
+  resolver.context->insert_type (pattern->get_mappings (), resolver.infered);
   return resolver.infered;
 }
 
@@ -135,7 +134,7 @@ TypeCheckPattern::visit (HIR::TupleStructPattern &pattern)
 	    TyTy::BaseType *fty = field->get_field_type ();
 
 	    // setup the type on this pattern type
-	    context->insert_type (pattern->get_pattern_mappings (), fty);
+	    context->insert_type (pattern->get_mappings (), fty);
 	  }
       }
       break;
@@ -289,7 +288,7 @@ TypeCheckPattern::visit (HIR::WildcardPattern &pattern)
   // wildcard patterns within the MatchArm's are simply just the same type as
   // the parent
   infered = parent->clone ();
-  infered->set_ref (pattern.get_pattern_mappings ().get_hirid ());
+  infered->set_ref (pattern.get_mappings ().get_hirid ());
 }
 
 void
@@ -332,9 +331,8 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern)
 	      = TypeCheckPattern::Resolve (p.get (), par_type);
 	    pattern_elems.push_back (TyTy::TyVar (elem->get_ref ()));
 	  }
-	infered
-	  = new TyTy::TupleType (pattern.get_pattern_mappings ().get_hirid (),
-				 pattern.get_locus (), pattern_elems);
+	infered = new TyTy::TupleType (pattern.get_mappings ().get_hirid (),
+				       pattern.get_locus (), pattern_elems);
       }
       break;
 
@@ -352,8 +350,8 @@ TypeCheckPattern::visit (HIR::TuplePattern &pattern)
 void
 TypeCheckPattern::visit (HIR::LiteralPattern &pattern)
 {
-  infered = resolve_literal (pattern.get_pattern_mappings (),
-			     pattern.get_literal (), pattern.get_locus ());
+  infered = resolve_literal (pattern.get_mappings (), pattern.get_literal (),
+			     pattern.get_locus ());
 }
 
 void
@@ -363,14 +361,14 @@ TypeCheckPattern::visit (HIR::RangePattern &pattern)
   TyTy::BaseType *upper = nullptr, *lower = nullptr;
 
   upper = typecheck_range_pattern_bound (pattern.get_upper_bound (),
-					 pattern.get_pattern_mappings (),
+					 pattern.get_mappings (),
 					 pattern.get_locus ());
 
   lower = typecheck_range_pattern_bound (pattern.get_lower_bound (),
-					 pattern.get_pattern_mappings (),
+					 pattern.get_mappings (),
 					 pattern.get_locus ());
 
-  infered = unify_site (pattern.get_pattern_mappings ().get_hirid (),
+  infered = unify_site (pattern.get_mappings ().get_hirid (),
 			TyTy::TyWithLocation (upper),
 			TyTy::TyWithLocation (lower), pattern.get_locus ());
 }
@@ -402,11 +400,10 @@ TypeCheckPattern::visit (HIR::ReferencePattern &pattern)
   TyTy::BaseType *infered_base
     = TypeCheckPattern::Resolve (pattern.get_referenced_pattern ().get (),
 				 ref_ty_ty->get_base ());
-  infered
-    = new TyTy::ReferenceType (pattern.get_pattern_mappings ().get_hirid (),
-			       TyTy::TyVar (infered_base->get_ref ()),
-			       pattern.is_mut () ? Mutability::Mut
-						 : Mutability::Imm);
+  infered = new TyTy::ReferenceType (pattern.get_mappings ().get_hirid (),
+				     TyTy::TyVar (infered_base->get_ref ()),
+				     pattern.is_mut () ? Mutability::Mut
+						       : Mutability::Imm);
 }
 
 void
@@ -488,7 +485,7 @@ TypeCheckPattern::visit (HIR::AltPattern &pattern)
   for (auto &type : types)
     {
       alt_pattern_type
-	= unify_site (pattern.get_pattern_mappings ().get_hirid (),
+	= unify_site (pattern.get_mappings ().get_hirid (),
 		      TyTy::TyWithLocation (alt_pattern_type),
 		      TyTy::TyWithLocation (type, type->get_locus ()),
 		      pattern.get_locus ());
@@ -519,7 +516,7 @@ ClosureParamInfer::ClosureParamInfer ()
 void
 ClosureParamInfer::visit (HIR::WildcardPattern &pattern)
 {
-  HirId id = pattern.get_pattern_mappings ().get_hirid ();
+  HirId id = pattern.get_mappings ().get_hirid ();
   infered = new TyTy::InferType (id, TyTy::InferType::InferTypeKind::GENERAL,
 				 TyTy::InferType::TypeHint::Default (),
 				 pattern.get_locus ());
@@ -528,7 +525,7 @@ ClosureParamInfer::visit (HIR::WildcardPattern &pattern)
 void
 ClosureParamInfer::visit (HIR::IdentifierPattern &pattern)
 {
-  HirId id = pattern.get_pattern_mappings ().get_hirid ();
+  HirId id = pattern.get_mappings ().get_hirid ();
   infered = new TyTy::InferType (id, TyTy::InferType::InferTypeKind::GENERAL,
 				 TyTy::InferType::TypeHint::Default (),
 				 pattern.get_locus ());
@@ -540,7 +537,7 @@ ClosureParamInfer::visit (HIR::ReferencePattern &pattern)
   TyTy::BaseType *element
     = ClosureParamInfer::Resolve (pattern.get_referenced_pattern ().get ());
 
-  HirId id = pattern.get_pattern_mappings ().get_hirid ();
+  HirId id = pattern.get_mappings ().get_hirid ();
   infered = new TyTy::ReferenceType (id, TyTy::TyVar (element->get_ref ()),
 				     pattern.get_mutability ());
 }
diff --git a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
index 680e323..219dd15 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-stmt.cc
@@ -87,7 +87,7 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt)
 	return;
 
       init_expr_ty->append_reference (
-	stmt_pattern.get_pattern_mappings ().get_hirid ());
+	stmt_pattern.get_mappings ().get_hirid ());
     }
 
   TyTy::BaseType *specified_ty = nullptr;
@@ -122,10 +122,11 @@ TypeCheckStmt::visit (HIR::LetStmt &stmt)
       // let x;
       else
 	{
-	  auto infer = new TyTy::InferType (
-	    stmt_pattern.get_pattern_mappings ().get_hirid (),
-	    TyTy::InferType::InferTypeKind::GENERAL,
-	    TyTy::InferType::TypeHint::Default (), stmt.get_locus ());
+	  auto infer
+	    = new TyTy::InferType (stmt_pattern.get_mappings ().get_hirid (),
+				   TyTy::InferType::InferTypeKind::GENERAL,
+				   TyTy::InferType::TypeHint::Default (),
+				   stmt.get_locus ());
 	  TypeCheckPattern::Resolve (&stmt_pattern, infer);
 	}
     }
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index a15d310..55e22f6 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -709,11 +709,11 @@ Mappings::lookup_hir_struct_field (HirId id)
 void
 Mappings::insert_hir_pattern (HIR::Pattern *pattern)
 {
-  auto id = pattern->get_pattern_mappings ().get_hirid ();
+  auto id = pattern->get_mappings ().get_hirid ();
   rust_assert (lookup_hir_pattern (id) == nullptr);
 
   hirPatternMappings[id] = pattern;
-  insert_node_to_hir (pattern->get_pattern_mappings ().get_nodeid (), id);
+  insert_node_to_hir (pattern->get_mappings ().get_nodeid (), id);
 }
 
 HIR::Pattern *