diff --git a/gcc/rust/typecheck/rust-hir-path-probe.h b/gcc/rust/typecheck/rust-hir-path-probe.h
index 3fd96e631052..b71d8c33fdef 100644
--- a/gcc/rust/typecheck/rust-hir-path-probe.h
+++ b/gcc/rust/typecheck/rust-hir-path-probe.h
@@ -165,8 +165,11 @@ class ReportMultipleCandidateError : private TypeCheckBase
     for (auto &c : candidates)
       r.add_range (c.locus);
 
+    std::string rich_msg = "multiple " + query.as_string () + " found";
+    r.add_fixit_replace (rich_msg.c_str ());
+
     rust_error_at (r, ErrorCode::E0034,
-		   "multiple applicable items in scope for: %s",
+		   "multiple applicable items in scope for: %qs",
 		   query.as_string ().c_str ());
   }
 };
diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
index e8fbe34afd02..af350ed67d30 100644
--- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc
+++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc
@@ -1065,11 +1065,18 @@ TypeCheckExpr::visit (HIR::MethodCallExpr &expr)
   if (candidates.size () > 1)
     {
       rich_location r (line_table, expr.get_method_name ().get_locus ());
+      std::string rich_msg
+	= "multiple " + expr.get_method_name ().get_segment ().as_string ()
+	  + " found";
+
       for (auto &c : candidates)
 	r.add_range (c.candidate.locus);
 
+      r.add_fixit_replace (rich_msg.c_str ());
+
       rust_error_at (
-	r, "multiple candidates found for method %<%s%>",
+	r, ErrorCode::E0034,
+	"multiple applicable items in scope for method %qs",
 	expr.get_method_name ().get_segment ().as_string ().c_str ());
       return;
     }
diff --git a/gcc/testsuite/rust/compile/generics6.rs b/gcc/testsuite/rust/compile/generics6.rs
index 00b93c33ebee..33093cf706b9 100644
--- a/gcc/testsuite/rust/compile/generics6.rs
+++ b/gcc/testsuite/rust/compile/generics6.rs
@@ -26,7 +26,7 @@ impl Foo<f32> {
 }
 
 fn main() {
-    let a: i32 = Foo::test(); // { dg-error "multiple applicable items in scope for: test" }
+    let a: i32 = Foo::test(); // { dg-error "multiple applicable items in scope for: .test." }
     // { dg-error {Failed to resolve expression of function call} "" { target *-*-* } .-1 }
 }
 
diff --git a/gcc/testsuite/rust/compile/generics7.rs b/gcc/testsuite/rust/compile/generics7.rs
index f2cd607a330c..ae0dc7e906a5 100644
--- a/gcc/testsuite/rust/compile/generics7.rs
+++ b/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 "multiple applicable items in scope for method .bar." "" { target *-*-* } .-1 }
 }
diff --git a/gcc/testsuite/rust/compile/issue-925.rs b/gcc/testsuite/rust/compile/issue-925.rs
index 2d536a547252..d5eed7e75898 100644
--- a/gcc/testsuite/rust/compile/issue-925.rs
+++ b/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 "multiple applicable items in scope for method .foo." "" { target *-*-* } .-1 }
 }