gccrs: [E0592] Duplicate def of method or associated functions

gcc/rust/ChangeLog:

	* typecheck/rust-hir-inherent-impl-overlap.h:
	Added rich location and errorcode.
	* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit):
	likewise.

gcc/testsuite/ChangeLog:

	* rust/compile/generics7.rs: Updated dejagnu comment.
	* rust/compile/generics8.rs: likewise.
	* rust/compile/issue-925.rs: likewise.

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

gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h

@@ -129,8 +129,11 @@ class OverlappingImplItemPass : public TypeCheckBase
 			   const std::string &name)
   {
     rich_location r (line_table, dup->get_locus ());
+    std::string msg = "duplicate definitions for " + name;
+    r.add_fixit_replace (query->get_locus (), msg.c_str ());
     r.add_range (query->get_locus ());
-    rust_error_at (r, "duplicate definitions with name %s", name.c_str ());
+    rust_error_at (r, ErrorCode::E0592, "duplicate definitions with name %qs",
+		   name.c_str ());
   }
 
 private:

gcc/rust/typecheck/rust-hir-type-check-expr.cc

@@ -1065,11 +1065,16 @@ TypeCheckExpr::visit (HIR::MethodCallExpr &expr)
   if (candidates.size () > 1)
     {
       rich_location r (line_table, expr.get_method_name ().get_locus ());
+      std::string msg = "duplicate definitions for "
+			+ expr.get_method_name ().get_segment ().as_string ();
       for (auto &c : candidates)
-	r.add_range (c.candidate.locus);
+	{
+	  r.add_fixit_replace (c.candidate.locus, msg.c_str ());
+	  r.add_range (c.candidate.locus);
+	}
 
       rust_error_at (
-	r, "multiple candidates found for method %<%s%>",
+	r, ErrorCode::E0592, "duplicate definitions with name %<%s%>",
 	expr.get_method_name ().get_segment ().as_string ().c_str ());
       return;
     }

gcc/testsuite/rust/compile/generics7.rs

@@ -26,5 +26,5 @@ impl<T> Foo<T> {
 fn main() {
     let a = Foo { a: 123 };
     a.bar();
-    // { dg-error "multiple candidates found for method .bar." "" { target *-*-* } .-1 }
+    // { dg-error "duplicate definitions with name .bar." "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust/compile/generics8.rs

@@ -10,7 +10,7 @@ impl<T> Foo<i32, T> {
 }
 
 impl Foo<i32, f32> {
-    fn test() -> f32 { // { dg-error "duplicate definitions with name test" }
+    fn test() -> f32 { // { dg-error "duplicate definitions with name .test." }
         123f32
     }
 }

gcc/testsuite/rust/compile/issue-925.rs

@@ -21,5 +21,5 @@ impl B for S {
 fn test() {
     let a = S;
     a.foo();
-    // { dg-error "multiple candidates found for method .foo." "" { target *-*-* } .-1 }
+    // { dg-error "duplicate definitions with name .foo." "" { target *-*-* } .-1 }
 }