From: Muhammad Mahad Date: Thu, 17 Aug 2023 05:42:52 +0000 (+0500) Subject: gccrs: gccrs:[E0592] methods or associated functions with same name already defined X-Git-Tag: basepoints/gcc-15~2171 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc68505f4cedfd06cc72657f3e9d14cc57335362;p=thirdparty%2Fgcc.git gccrs: gccrs:[E0592] methods or associated functions with same name already defined 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: Added Errorcode hint. * rust/compile/generics8.rs: Updated dejagnu comment. * rust/compile/issue-925.rs: Added Errorcode hint. Signed-off-by: Muhammad Mahad --- diff --git a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h index ae5a5d57c8d2..abb93ca0e4af 100644 --- a/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h +++ b/gcc/rust/typecheck/rust-hir-inherent-impl-overlap.h @@ -129,8 +129,11 @@ public: 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: diff --git a/gcc/rust/typecheck/rust-hir-type-check-expr.cc b/gcc/rust/typecheck/rust-hir-type-check-expr.cc index 898ea1173333..f09119674707 100644 --- a/gcc/rust/typecheck/rust-hir-type-check-expr.cc +++ b/gcc/rust/typecheck/rust-hir-type-check-expr.cc @@ -1097,8 +1097,7 @@ TypeCheckExpr::visit (HIR::MethodCallExpr &expr) r.add_fixit_replace (rich_msg.c_str ()); rust_error_at ( - r, ErrorCode::E0034, - "multiple applicable items in scope for method %qs", + r, ErrorCode::E0592, "duplicate definitions with name %qs", expr.get_method_name ().get_segment ().as_string ().c_str ()); return; } diff --git a/gcc/testsuite/rust/compile/generics7.rs b/gcc/testsuite/rust/compile/generics7.rs index ae0dc7e906a5..dcedead4b9f3 100644 --- a/gcc/testsuite/rust/compile/generics7.rs +++ b/gcc/testsuite/rust/compile/generics7.rs @@ -22,9 +22,9 @@ impl Foo { self.a } } - +// E0592 fn main() { let a = Foo { a: 123 }; a.bar(); - // { dg-error "multiple applicable items in scope for method .bar." "" { target *-*-* } .-1 } + // { dg-error "duplicate definitions with name .bar." "" { target *-*-* } .-1 } } diff --git a/gcc/testsuite/rust/compile/generics8.rs b/gcc/testsuite/rust/compile/generics8.rs index 99df0c9b58cc..88c4bac1b076 100644 --- a/gcc/testsuite/rust/compile/generics8.rs +++ b/gcc/testsuite/rust/compile/generics8.rs @@ -10,7 +10,7 @@ impl Foo { } impl Foo { - fn test() -> f32 { // { dg-error "duplicate definitions with name test" } + fn test() -> f32 { // { dg-error "duplicate definitions with name .test." } 123f32 } } diff --git a/gcc/testsuite/rust/compile/issue-925.rs b/gcc/testsuite/rust/compile/issue-925.rs index d5eed7e75898..507fe9444e5f 100644 --- a/gcc/testsuite/rust/compile/issue-925.rs +++ b/gcc/testsuite/rust/compile/issue-925.rs @@ -17,9 +17,9 @@ impl A for S { impl B for S { fn foo(&self) {} } - +// E0592 fn test() { let a = S; a.foo(); - // { dg-error "multiple applicable items in scope for method .foo." "" { target *-*-* } .-1 } + // { dg-error "duplicate definitions with name .foo." "" { target *-*-* } .-1 } }