[gcc/devel/rust/master] continue #94ac628fd20; refactoring codebase to use "rust_sorry_at"

[gcc/devel/rust/master] continue #94ac628fd20; refactoring codebase to use "rust_sorry_at"

[Thomas Schwinge]

https://gcc.gnu.org/g:747700e045c3bf3f3d84b04f6799886f067704ae

commit 747700e045c3bf3f3d84b04f6799886f067704ae
Author: andrewnaguib <24280372+ndrwnaguib@users.noreply.github.com>
Date:   Fri Jun 17 06:53:18 2022 -0700

    continue #94ac628fd20; refactoring codebase to use "rust_sorry_at"

Diff:
---
 gcc/rust/backend/rust-compile-expr.cc     | 4 ++--
 gcc/rust/backend/rust-compile-pattern.cc  | 3 +--
 gcc/rust/privacy/rust-privacy-reporter.cc | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/gcc/rust/backend/rust-compile-expr.cc b/gcc/rust/backend/rust-compile-expr.cc
index b153451b470..d12dc78cf41 100644
--- a/gcc/rust/backend/rust-compile-expr.cc
+++ b/gcc/rust/backend/rust-compile-expr.cc
@@ -239,8 +239,8 @@ CompileExpr::visit (HIR::MatchExpr &expr)
     {
       // FIXME: CASE_LABEL_EXPR does not support floating point types.
       // Find another way to compile these.
-      sorry_at (expr.get_locus ().gcc_location (),
-		"match on floating-point types is not yet supported");
+      rust_sorry_at (expr.get_locus (),
+		     "match on floating-point types is not yet supported");
     }
 
   TyTy::BaseType *expr_tyty = nullptr;
diff --git a/gcc/rust/backend/rust-compile-pattern.cc b/gcc/rust/backend/rust-compile-pattern.cc
index 2f3449a1eb7..7e7fadd3fab 100644
--- a/gcc/rust/backend/rust-compile-pattern.cc
+++ b/gcc/rust/backend/rust-compile-pattern.cc
@@ -96,8 +96,7 @@ CompilePatternCaseLabelExpr::visit (HIR::LiteralPattern &pattern)
   // floating point types.
   if (pattern.get_literal ().get_lit_type () == HIR::Literal::LitType::FLOAT)
     {
-      sorry_at (pattern.get_locus ().gcc_location (),
-		"floating-point literal in pattern");
+      rust_sorry_at (pattern.get_locus (), "floating-point literal in pattern");
     }
 
   tree lit = CompileExpr::Compile (litexpr, ctx);
diff --git a/gcc/rust/privacy/rust-privacy-reporter.cc b/gcc/rust/privacy/rust-privacy-reporter.cc
index 4b010a05b02..f2752b6b965 100644
--- a/gcc/rust/privacy/rust-privacy-reporter.cc
+++ b/gcc/rust/privacy/rust-privacy-reporter.cc
@@ -164,8 +164,7 @@ PrivacyReporter::check_base_type_privacy (Analysis::NodeMapping &node_mappings,
       return recursive_check (
 	static_cast<const TyTy::ProjectionType *> (ty)->get ());
     case TyTy::CLOSURE:
-      sorry_at (locus.gcc_location (),
-		"privacy pass for closures is not handled yet");
+      rust_sorry_at (locus, "privacy pass for closures is not handled yet");
       break;
 
       // If we're dealing with a generic param, there's nothing we should be