gccrs: Invalid order of generic parameters

Added more userfriendly message. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_generic_params): Added more user friendly message. gcc/testsuite/ChangeLog: * rust/compile/generics13.rs: for dejagnu, Signed-off-by: Muhammad Mahad <mahadtxt@gmail.com>
Rust-GCC · Aug 17, 2023 · a2d6a99 · a2d6a99
1 parent b9ae354
commit a2d6a99
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h
@@ -3142,9 +3142,12 @@ Parser<ManagedTokenSource>::parse_generic_params (EndTokenPred is_end_token)
 
   // FIXME: Add reordering hint
   if (order_error)
-    rust_error_at (generic_params.front ()->get_locus (),
-		   "invalid order for generic parameters: lifetimes should "
-		   "always come before types");
+    {
+      Error error (generic_params.front ()->get_locus (),
+		   "invalid order for generic parameters: lifetime parameters "
+		   "must be declared prior to type and const parameters");
+      add_error (std::move (error));
+    }
 
   generic_params.shrink_to_fit ();
   return generic_params;

diff --git a/gcc/testsuite/rust/compile/generics13.rs b/gcc/testsuite/rust/compile/generics13.rs
@@ -1 +1 @@
-struct Foo<A, 'a>; // { dg-error "invalid order for generic parameters: lifetimes should always come before types" }
+struct Foo<A, 'a>; // { dg-error "invalid order for generic parameters: lifetime parameters must be declared prior to type and const parameters" }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		struct Foo<A, 'a>; // { dg-error "invalid order for generic parameters: lifetimes should always come before types" }
		struct Foo<A, 'a>; // { dg-error "invalid order for generic parameters: lifetime parameters must be declared prior to type and const parameters" }