[gcc/devel/rust/master] Fix unresolved label error message

[Thomas Schwinge]

https://gcc.gnu.org/g:5562e72c96ef45a561c7ec0e9bf6f1ebb87b982c

commit 5562e72c96ef45a561c7ec0e9bf6f1ebb87b982c
Author: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date:   Wed Apr 2 17:38:28 2025 +0200

    Fix unresolved label error message
    
    gcc/rust/ChangeLog:
    
            * resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit):
            Change error message to match rustc.
    
    gcc/testsuite/ChangeLog:
    
            * rust/compile/undeclared_label.rs: Change test
            expected string.
    
    Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>

Diff:
---
 gcc/rust/resolve/rust-ast-resolve-expr.cc      | 8 ++++----
 gcc/testsuite/rust/compile/undeclared_label.rs | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc
index 1e10e3b0692c..d83663810262 100644
--- a/gcc/rust/resolve/rust-ast-resolve-expr.cc
+++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc
@@ -486,8 +486,8 @@ ResolveExpr::visit (AST::BreakExpr &expr)
 	    &resolved_node))
 	{
 	  rust_error_at (label.get_locus (), ErrorCode::E0426,
-			 "use of undeclared label %qs in %<break%>",
-			 label.get_lifetime_name ().c_str ());
+			 "use of undeclared label %qs",
+			 label.as_string ().c_str ());
 	  return;
 	}
       resolver->insert_resolved_label (label.get_node_id (), resolved_node);
@@ -609,8 +609,8 @@ ResolveExpr::visit (AST::ContinueExpr &expr)
 	    &resolved_node))
 	{
 	  rust_error_at (expr.get_label ().get_locus (), ErrorCode::E0426,
-			 "use of undeclared label %qs in %<continue%>",
-			 label.get_lifetime_name ().c_str ());
+			 "use of undeclared label %qs",
+			 label.as_string ().c_str ());
 	  return;
 	}
       resolver->insert_resolved_label (label.get_node_id (), resolved_node);
diff --git a/gcc/testsuite/rust/compile/undeclared_label.rs b/gcc/testsuite/rust/compile/undeclared_label.rs
index 6efa2d98dbfb..9aa0553f6572 100644
--- a/gcc/testsuite/rust/compile/undeclared_label.rs
+++ b/gcc/testsuite/rust/compile/undeclared_label.rs
@@ -2,12 +2,12 @@
 #![allow(unused)]
 fn resolve_label_continue() -> () {
     loop {
-        continue 'a; // { dg-error "use of undeclared label .a. in .continue." }
+        continue 'a; // { dg-error "use of undeclared label .'a." }
     }
 }
 fn resolve_label_break() -> () {
     loop {
-        break 'crabby; // { dg-error "use of undeclared label .crabby. in .break." }
+        break 'crabby; // { dg-error "use of undeclared label .'crabby." }
     }
 }
 fn main() {