diff options
author | Muhammad Mahad <mahadtxt@gmail.com> | 2023-08-15 20:19:36 +0500 |
---|---|---|
committer | CohenArthur <arthur.cohen@embecosm.com> | 2023-08-17 13:33:23 +0000 |
commit | d4bf5e3f23bfbbfc3b42ca523fc6f46cae064808 (patch) | |
tree | 49a82a00409fdf38abff4851d889478c138794de /gcc/rust | |
parent | 9ef8689c7faeec4f6833bff39aa2301f14209c9a (diff) | |
download | gcc-d4bf5e3f23bfbbfc3b42ca523fc6f46cae064808.zip gcc-d4bf5e3f23bfbbfc3b42ca523fc6f46cae064808.tar.gz gcc-d4bf5e3f23bfbbfc3b42ca523fc6f46cae064808.tar.bz2 |
gccrs: [E0034] found more than one items for method
Multiple items found with same prototype.
Fixes: https://github.com/Rust-GCC/gccrs/issues/2366
gcc/rust/ChangeLog:
* typecheck/rust-hir-path-probe.h:
Fixes issue & added rich location message.
* typecheck/rust-hir-type-check-expr.cc (TypeCheckExpr::visit):
Added rich location and error code.
gcc/testsuite/ChangeLog:
* rust/compile/generics6.rs: Updated dejagnu comment.
* rust/compile/generics7.rs: likewise.
* rust/compile/issue-925.rs: likewise.
Signed-off-by: Muhammad Mahad <mahadtxt@gmail.com>
Diffstat (limited to 'gcc/rust')
-rw-r--r-- | gcc/rust/typecheck/rust-hir-path-probe.h | 5 | ||||
-rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check-expr.cc | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/rust/typecheck/rust-hir-path-probe.h b/gcc/rust/typecheck/rust-hir-path-probe.h index 09874f0..d829d9a 100644 --- a/gcc/rust/typecheck/rust-hir-path-probe.h +++ b/gcc/rust/typecheck/rust-hir-path-probe.h @@ -165,8 +165,11 @@ public: 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 3a252a6..1ce54c4 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; } |