Skip to content

Commit 4a3d57b

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#127253
Rollup merge of rust-lang#127253 - chenyukang:yukang-fix-126246-fn-parameters-check, r=estebank Fix incorrect suggestion for extra argument with a type error Fixes rust-lang#126246 I tried to fix it in the `find_errors` of ArgMatrix, but seems it's hard to avoid breaking some other test cases. The root cause is we eliminate the first argument even with a type error at here: https://github.com/rust-lang/rust/blob/6292b2af620dbd771ebb687c3a93c69ba8f97268/compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs#L664 So the left argument is always treated as extra one. But if there is already a type error, an error message will be generated firstly, which make this issue a trivial one.
2 parents aa1d4f6 + 9f32459 commit 4a3d57b

File tree

3 files changed

+171
-0
lines changed

3 files changed

+171
-0
lines changed

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+26
Original file line numberDiff line numberDiff line change
@@ -951,6 +951,32 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
951951
return err.emit();
952952
}
953953

954+
// Special case, we found an extra argument is provided, which is very common in practice.
955+
// but there is a obviously better removing suggestion compared to the current one,
956+
// try to find the argument with Error type, if we removed it all the types will become good,
957+
// then we will replace the current suggestion.
958+
if let [Error::Extra(provided_idx)] = &errors[..] {
959+
let remove_idx_is_perfect = |idx: usize| -> bool {
960+
let removed_arg_tys = provided_arg_tys
961+
.iter()
962+
.enumerate()
963+
.filter_map(|(j, arg)| if idx == j { None } else { Some(arg) })
964+
.collect::<IndexVec<ProvidedIdx, _>>();
965+
std::iter::zip(formal_and_expected_inputs.iter(), removed_arg_tys.iter()).all(
966+
|((expected_ty, _), (provided_ty, _))| {
967+
!provided_ty.references_error()
968+
&& self.can_coerce(*provided_ty, *expected_ty)
969+
},
970+
)
971+
};
972+
973+
if !remove_idx_is_perfect(provided_idx.as_usize()) {
974+
if let Some(i) = (0..provided_args.len()).find(|&i| remove_idx_is_perfect(i)) {
975+
errors = vec![Error::Extra(ProvidedIdx::from_usize(i))];
976+
}
977+
}
978+
}
979+
954980
let mut err = if formal_and_expected_inputs.len() == provided_args.len() {
955981
struct_span_code_err!(
956982
self.dcx(),

‎tests/ui/argument-suggestions/suggest-better-removing-issue-126246.rs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
fn add_one(x: i32) -> i32 {
2+
x + 1
3+
}
4+
5+
fn add_two(x: i32, y: i32) -> i32 {
6+
x + y
7+
}
8+
9+
fn main() {
10+
add_one(2, 2); //~ ERROR this function takes 1 argument but 2 arguments were supplied
11+
add_one(no_such_local, 10); //~ ERROR cannot find value `no_such_local` in this scope
12+
//~| ERROR this function takes 1 argument but 2 arguments were supplied
13+
add_one(10, no_such_local); //~ ERROR cannot find value `no_such_local` in this scope
14+
//~| ERROR this function takes 1 argument but 2 arguments were supplied
15+
add_two(10, no_such_local, 10); //~ ERROR cannot find value `no_such_local` in this scope
16+
//~| ERROR this function takes 2 arguments but 3 arguments were supplied
17+
add_two(no_such_local, 10, 10); //~ ERROR cannot find value `no_such_local` in this scope
18+
//~| ERROR this function takes 2 arguments but 3 arguments were supplied
19+
add_two(10, 10, no_such_local); //~ ERROR cannot find value `no_such_local` in this scope
20+
//~| ERROR this function takes 2 arguments but 3 arguments were supplied
21+
}

‎tests/ui/argument-suggestions/suggest-better-removing-issue-126246.stderr

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
error[E0425]: cannot find value `no_such_local` in this scope
2+
--> $DIR/suggest-better-removing-issue-126246.rs:11:13
3+
|
4+
LL | add_one(no_such_local, 10);
5+
| ^^^^^^^^^^^^^ not found in this scope
6+
7+
error[E0425]: cannot find value `no_such_local` in this scope
8+
--> $DIR/suggest-better-removing-issue-126246.rs:13:17
9+
|
10+
LL | add_one(10, no_such_local);
11+
| ^^^^^^^^^^^^^ not found in this scope
12+
13+
error[E0425]: cannot find value `no_such_local` in this scope
14+
--> $DIR/suggest-better-removing-issue-126246.rs:15:17
15+
|
16+
LL | add_two(10, no_such_local, 10);
17+
| ^^^^^^^^^^^^^ not found in this scope
18+
19+
error[E0425]: cannot find value `no_such_local` in this scope
20+
--> $DIR/suggest-better-removing-issue-126246.rs:17:13
21+
|
22+
LL | add_two(no_such_local, 10, 10);
23+
| ^^^^^^^^^^^^^ not found in this scope
24+
25+
error[E0425]: cannot find value `no_such_local` in this scope
26+
--> $DIR/suggest-better-removing-issue-126246.rs:19:21
27+
|
28+
LL | add_two(10, 10, no_such_local);
29+
| ^^^^^^^^^^^^^ not found in this scope
30+
31+
error[E0061]: this function takes 1 argument but 2 arguments were supplied
32+
--> $DIR/suggest-better-removing-issue-126246.rs:10:5
33+
|
34+
LL | add_one(2, 2);
35+
| ^^^^^^^ ---
36+
| | |
37+
| | unexpected argument of type `{integer}`
38+
| help: remove the extra argument
39+
|
40+
note: function defined here
41+
--> $DIR/suggest-better-removing-issue-126246.rs:1:4
42+
|
43+
LL | fn add_one(x: i32) -> i32 {
44+
| ^^^^^^^ ------
45+
46+
error[E0061]: this function takes 1 argument but 2 arguments were supplied
47+
--> $DIR/suggest-better-removing-issue-126246.rs:11:5
48+
|
49+
LL | add_one(no_such_local, 10);
50+
| ^^^^^^^ ---------------
51+
| |
52+
| unexpected argument
53+
| help: remove the extra argument
54+
|
55+
note: function defined here
56+
--> $DIR/suggest-better-removing-issue-126246.rs:1:4
57+
|
58+
LL | fn add_one(x: i32) -> i32 {
59+
| ^^^^^^^ ------
60+
61+
error[E0061]: this function takes 1 argument but 2 arguments were supplied
62+
--> $DIR/suggest-better-removing-issue-126246.rs:13:5
63+
|
64+
LL | add_one(10, no_such_local);
65+
| ^^^^^^^ ---------------
66+
| | |
67+
| | unexpected argument
68+
| help: remove the extra argument
69+
|
70+
note: function defined here
71+
--> $DIR/suggest-better-removing-issue-126246.rs:1:4
72+
|
73+
LL | fn add_one(x: i32) -> i32 {
74+
| ^^^^^^^ ------
75+
76+
error[E0061]: this function takes 2 arguments but 3 arguments were supplied
77+
--> $DIR/suggest-better-removing-issue-126246.rs:15:5
78+
|
79+
LL | add_two(10, no_such_local, 10);
80+
| ^^^^^^^ ---------------
81+
| | |
82+
| | unexpected argument
83+
| help: remove the extra argument
84+
|
85+
note: function defined here
86+
--> $DIR/suggest-better-removing-issue-126246.rs:5:4
87+
|
88+
LL | fn add_two(x: i32, y: i32) -> i32 {
89+
| ^^^^^^^ ------ ------
90+
91+
error[E0061]: this function takes 2 arguments but 3 arguments were supplied
92+
--> $DIR/suggest-better-removing-issue-126246.rs:17:5
93+
|
94+
LL | add_two(no_such_local, 10, 10);
95+
| ^^^^^^^ ---------------
96+
| |
97+
| unexpected argument
98+
| help: remove the extra argument
99+
|
100+
note: function defined here
101+
--> $DIR/suggest-better-removing-issue-126246.rs:5:4
102+
|
103+
LL | fn add_two(x: i32, y: i32) -> i32 {
104+
| ^^^^^^^ ------ ------
105+
106+
error[E0061]: this function takes 2 arguments but 3 arguments were supplied
107+
--> $DIR/suggest-better-removing-issue-126246.rs:19:5
108+
|
109+
LL | add_two(10, 10, no_such_local);
110+
| ^^^^^^^ ---------------
111+
| | |
112+
| | unexpected argument
113+
| help: remove the extra argument
114+
|
115+
note: function defined here
116+
--> $DIR/suggest-better-removing-issue-126246.rs:5:4
117+
|
118+
LL | fn add_two(x: i32, y: i32) -> i32 {
119+
| ^^^^^^^ ------ ------
120+
121+
error: aborting due to 11 previous errors
122+
123+
Some errors have detailed explanations: E0061, E0425.
124+
For more information about an error, try `rustc --explain E0061`.

0 commit comments

Comments
 (0)