nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #109850 - MU001999:master, r=estebank

Browse Source 
Emits non-overlapping suggestions for arguments with wrong types

Fixes #109831
This commit is contained in:
bors 2023-04-11 03:07:58 +00:00
commit b80ee3969f
3 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View File

@ -1191,11 +1191,11 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
// index position where it *should have been*, which is *after* the previous one.
if let Some(provided_idx) = provided_idx {
prev = provided_idx.index() as i64;
continue;
}
let idx = ProvidedIdx::from_usize((prev + 1) as usize);
if let None = provided_idx
&& let Some((_, arg_span)) = provided_arg_tys.get(idx)
{
if let Some((_, arg_span)) = provided_arg_tys.get(idx) {
prev += 1;
// There is a type that was *not* found anywhere, so it isn't a move, but a
// replacement and we look at what type it should have been. This will allow us
// To suggest a multipart suggestion when encountering `foo(1, "")` where the def

9
tests/ui/argument-suggestions/issue-109831.rs Normal file
View File

@ -0,0 +1,9 @@
struct A;
struct B;
fn f(b1: B, b2: B, a2: C) {} //~ ERROR E0412
fn main() {
f(A, A, B, C); //~ ERROR E0425
//~^ ERROR E0061
}

51
tests/ui/argument-suggestions/issue-109831.stderr Normal file
View File

@ -0,0 +1,51 @@
error[E0412]: cannot find type `C` in this scope
--> $DIR/issue-109831.rs:4:24
|
LL | struct A;
| --------- similarly named struct `A` defined here
...
LL | fn f(b1: B, b2: B, a2: C) {}
| ^
|
help: a struct with a similar name exists
|
LL | fn f(b1: B, b2: B, a2: A) {}
| ~
help: you might be missing a type parameter
|
LL | fn f<C>(b1: B, b2: B, a2: C) {}
| +++
error[E0425]: cannot find value `C` in this scope
--> $DIR/issue-109831.rs:7:16
|
LL | struct A;
| --------- similarly named unit struct `A` defined here
...
LL | f(A, A, B, C);
| ^ help: a unit struct with a similar name exists: `A`
error[E0061]: this function takes 3 arguments but 4 arguments were supplied
--> $DIR/issue-109831.rs:7:5
|
LL | f(A, A, B, C);
| ^ - - - unexpected argument
| | |
| | expected `B`, found `A`
| expected `B`, found `A`
|
note: function defined here
--> $DIR/issue-109831.rs:4:4
|
LL | fn f(b1: B, b2: B, a2: C) {}
| ^ ----- ----- -----
help: remove the extra argument
|
LL - f(A, A, B, C);
LL + f(/* B */, /* B */, B);
|
error: aborting due to 3 previous errors
Some errors have detailed explanations: E0061, E0412, E0425.
For more information about an error, try `rustc --explain E0061`.