gccrs: 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 --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc
index dc7f76d652dd499602631b6d4a7ac110d6e17c9a..4bfd1b3ca4fe3cf41ec3cf2fc395566db07a214f 100644 (file)
--- 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 6efa2d98dbfb5f667d53b744af30e487b3f49fd3..9aa0553f65722a58891098eb2b334388730fcfe6 100644 (file)
--- 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() {