diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index d6ac115cd2ee..4201688b3bcf 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -351,8 +351,15 @@ BaseType::satisfies_bound (const TypeBoundPredicate &predicate, r.add_range (predicate.get_locus ()); r.add_range (mappings->lookup_location (i.get_hirid ())); + std::string rich_msg + = "expected " + bound_ty->destructure ()->get_name () + + ", found " + + impl_item_ty->destructure ()->get_name (); + r.add_fixit_replace (rich_msg.c_str ()); + rust_error_at ( - r, "expected %<%s%> got %<%s%>", + r, ErrorCode::E0271, + "type mismatch, expected %qs but got %qs", bound_ty->destructure ()->get_name ().c_str (), impl_item_ty->destructure ()->get_name ().c_str ()); } diff --git a/gcc/testsuite/rust/compile/issue-1725-2.rs b/gcc/testsuite/rust/compile/issue-1725-2.rs index 01ed287f545e..726d9677f11f 100644 --- a/gcc/testsuite/rust/compile/issue-1725-2.rs +++ b/gcc/testsuite/rust/compile/issue-1725-2.rs @@ -26,6 +26,6 @@ pub fn foo>(a: T) -> i32 { pub fn main() { foo(123f32); - // { dg-error "expected .i32. got .f32." "" { target *-*-* } .-1 } + // { dg-error "type mismatch, expected .i32. but got .f32." "" { target *-*-* } .-1 } // { dg-error "bounds not satisfied for f32 .Add. is not satisfied" "" { target *-*-* } .-2 } }