gccrs: Non-allowed default type paramters

gcc/rust/ChangeLog:

	* hir/rust-ast-lower-item.cc (ASTLoweringItem::visit):
	Added more helpful error message.

gcc/testsuite/ChangeLog:

	* rust/compile/generics10.rs: for dejagnu.

Signed-off-by: Muhammad Mahad <mahadtxt@gmail.com>

diff --git a/gcc/rust/hir/rust-ast-lower-item.cc b/gcc/rust/hir/rust-ast-lower-item.cc
index 6eaf75ffd0b4bcd7d2962a0f9fd66bc5a6840b6f..6d91c23e8d23c009989f59ae2349c5a82de8286c 100644 (file)
--- a/gcc/rust/hir/rust-ast-lower-item.cc
+++ b/gcc/rust/hir/rust-ast-lower-item.cc
@@ -499,10 +499,15 @@ ASTLoweringItem::visit (AST::InherentImpl &impl_block)
 
                if (t.has_type ())
                  {
-                   // see https://github.com/rust-lang/rust/issues/36887
-                   rust_error_at (
+                   rich_location rich_locus (line_table, t.get_locus ());
+                   rich_locus.add_fixit_replace (
                      t.get_locus (),
-                     "defaults for type parameters are not allowed here");
+                     "for more information, see issue #36887 "
+                     "<https://github.com/rust-lang/rust/issues/36887>");
+                   rust_error_at (rich_locus,
+                                  "defaults for type parameters are only "
+                                  "allowed in %<struct%>, %<enum%>, %<type%>, "
+                                  "or %<trait%> definitions");
                  }
              }
              break;
@@ -645,10 +650,15 @@ ASTLoweringItem::visit (AST::TraitImpl &impl_block)
 
                if (t.has_type ())
                  {
-                   // see https://github.com/rust-lang/rust/issues/36887
-                   rust_error_at (
-                     t.get_locus (),
-                     "defaults for type parameters are not allowed here");
+                   rich_location rich_locus (line_table, t.get_locus ());
+                   rich_locus.add_fixit_replace (
+                     t.get_locus (), "for more information, see issue #36887 "
+                                     "<https://github.com/rust-lang/rust/"
+                                     "issues/36887>");
+                   rust_error_at (rich_locus,
+                                  "defaults for type parameters are only "
+                                  "allowed in %<struct%>, %<enum%>, %<type%>, "
+                                  "or %<trait%> definitions");
                  }
              }
              break;

diff --git a/gcc/testsuite/rust/compile/generics10.rs b/gcc/testsuite/rust/compile/generics10.rs
index a734fa8a19786da45c9efff65116478441a5bd91..c66a08f7e169edbd6051ca89c04bdf862777410b 100644 (file)
--- a/gcc/testsuite/rust/compile/generics10.rs
+++ b/gcc/testsuite/rust/compile/generics10.rs
@@ -1,6 +1,6 @@
 struct Foo<A, B>(A, B);
 
-impl<X = i32> Foo<X, f32> { // { dg-error "defaults for type parameters are not allowed here" }
+impl<X = i32> Foo<X, f32> { // { dg-error "defaults for type parameters are only allowed in .struct., .enum., .type., or .trait. definitions" }
     fn new(a: X, b: f32) -> Self {
         Self(a, b)
     }