Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only highlight unmatchable parameters at the definition site #136583

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Only highlight unmatchable parameters at the definition site #136583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
316 changes: 155 additions & 161 deletions compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tests/ui/argument-suggestions/basic.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ note: function defined here
--> $DIR/basic.rs:16:4
|
LL | fn swapped(_i: u32, _s: &str) {}
| ^^^^^^^ ------- --------
| ^^^^^^^
help: swap these arguments
|
LL | swapped(1, "");
Expand All @@ -76,7 +76,7 @@ note: function defined here
--> $DIR/basic.rs:17:4
|
LL | fn permuted(_x: X, _y: Y, _z: Z) {}
| ^^^^^^^^ ----- ----- -----
| ^^^^^^^^
help: reorder these arguments
|
LL | permuted(X {}, Y {}, Z {});
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/argument-suggestions/complex.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ note: function defined here
--> $DIR/complex.rs:11:4
|
LL | fn complex(_i: u32, _s: &str, _e: E, _f: F, _g: G, _x: X, _y: Y, _z: Z ) {}
| ^^^^^^^ ------- -------- ----- ----- ----- ----- ----- -----
| ^^^^^^^ ------- -----
help: did you mean
|
LL | complex(/* u32 */, &"", /* E */, F::X2, G{}, X {}, Y {}, Z {});
Expand Down
34 changes: 17 additions & 17 deletions tests/ui/argument-suggestions/extra_arguments.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(1, 1);
Expand All @@ -61,7 +61,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(1, "");
Expand All @@ -80,7 +80,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra arguments
|
LL - one_arg(1, "", 1.0);
Expand All @@ -97,7 +97,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:3:4
|
LL | fn two_arg_same(_a: i32, _b: i32) {}
| ^^^^^^^^^^^^ ------- -------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_same(1, 1, 1);
Expand All @@ -114,7 +114,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:3:4
|
LL | fn two_arg_same(_a: i32, _b: i32) {}
| ^^^^^^^^^^^^ ------- -------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_same(1, 1, 1.0);
Expand All @@ -131,7 +131,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_diff(1, 1, "");
Expand All @@ -148,7 +148,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_diff(1, "", "");
Expand All @@ -167,7 +167,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra arguments
|
LL - two_arg_diff(1, 1, "", "");
Expand All @@ -186,7 +186,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra arguments
|
LL - two_arg_diff(1, "", 1, "");
Expand All @@ -203,7 +203,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:3:4
|
LL | fn two_arg_same(_a: i32, _b: i32) {}
| ^^^^^^^^^^^^ ------- -------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_same(1, 1, "");
Expand All @@ -220,7 +220,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - two_arg_diff(1, 1, "");
Expand All @@ -240,7 +240,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:3:4
|
LL | fn two_arg_same(_a: i32, _b: i32) {}
| ^^^^^^^^^^^^ ------- -------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - 1,
Expand All @@ -261,7 +261,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:4:4
|
LL | fn two_arg_diff(_a: i32, _b: &str) {}
| ^^^^^^^^^^^^ ------- --------
| ^^^^^^^^^^^^
help: remove the extra argument
|
LL - 1,
Expand Down Expand Up @@ -335,7 +335,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(1, panic!());
Expand All @@ -352,7 +352,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(panic!(), 1);
Expand All @@ -369,7 +369,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(stringify!($e), 1);
Expand All @@ -386,7 +386,7 @@ note: function defined here
--> $DIR/extra_arguments.rs:2:4
|
LL | fn one_arg<T>(_a: T) {}
| ^^^^^^^ -----
| ^^^^^^^
help: remove the extra argument
|
LL - one_arg(for _ in 1.. {}, 1);
Expand Down
12 changes: 6 additions & 6 deletions tests/ui/argument-suggestions/invalid_arguments.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:8:4
|
LL | fn three_arg_diff(_a: i32, _b: f32, _c: &str) {}
| ^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^ ------- -------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:29:3
Expand All @@ -164,7 +164,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:8:4
|
LL | fn three_arg_diff(_a: i32, _b: f32, _c: &str) {}
| ^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^ ------- --------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:30:3
Expand All @@ -178,7 +178,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:8:4
|
LL | fn three_arg_diff(_a: i32, _b: f32, _c: &str) {}
| ^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^ ------- --------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:32:3
Expand Down Expand Up @@ -249,7 +249,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:9:4
|
LL | fn three_arg_repeat(_a: i32, _b: i32, _c: &str) {}
| ^^^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^^^ ------- -------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:39:3
Expand All @@ -263,7 +263,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:9:4
|
LL | fn three_arg_repeat(_a: i32, _b: i32, _c: &str) {}
| ^^^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^^^ ------- --------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:40:3
Expand All @@ -277,7 +277,7 @@ note: function defined here
--> $DIR/invalid_arguments.rs:9:4
|
LL | fn three_arg_repeat(_a: i32, _b: i32, _c: &str) {}
| ^^^^^^^^^^^^^^^^ ------- ------- --------
| ^^^^^^^^^^^^^^^^ ------- --------

error[E0308]: arguments to this function are incorrect
--> $DIR/invalid_arguments.rs:42:3
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/argument-suggestions/issue-100478.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ note: function defined here
--> $DIR/issue-100478.rs:30:4
|
LL | fn three_diff(_a: T1, _b: T2, _c: T3) {}
| ^^^^^^^^^^ ------ ------ ------
| ^^^^^^^^^^ ------ ------
help: provide the arguments
|
LL | three_diff(/* T1 */, T2::new(0), /* T3 */);
Expand All @@ -31,7 +31,7 @@ note: function defined here
--> $DIR/issue-100478.rs:31:4
|
LL | fn four_shuffle(_a: T1, _b: T2, _c: T3, _d: T4) {}
| ^^^^^^^^^^^^ ------ ------ ------ ------
| ^^^^^^^^^^^^
help: did you mean
|
LL | four_shuffle(T1::default(), T2::default(), T3::default(), T4::default());
Expand All @@ -50,7 +50,7 @@ note: function defined here
--> $DIR/issue-100478.rs:31:4
|
LL | fn four_shuffle(_a: T1, _b: T2, _c: T3, _d: T4) {}
| ^^^^^^^^^^^^ ------ ------ ------ ------
| ^^^^^^^^^^^^ ------
help: swap these arguments
|
LL | four_shuffle(T1::default(), T2::default(), T3::default(), /* T4 */);
Expand All @@ -69,7 +69,7 @@ note: function defined here
--> $DIR/issue-100478.rs:29:4
|
LL | fn foo(p1: T1, p2: Arc<T2>, p3: T3, p4: Arc<T4>, p5: T5, p6: T6, p7: T7, p8: Arc<T8>) {}
| ^^^ ------ ----------- ------ ----------- ------ ------ ------ -----------
| ^^^ -----------
help: provide the argument
|
LL | foo(p1, /* Arc<T2> */, p3, p4, p5, p6, p7, p8);
Expand Down
56 changes: 2 additions & 54 deletions tests/ui/argument-suggestions/issue-101097.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,6 @@ note: function defined here
|
LL | fn f(
| ^
LL | a1: A,
| -----
LL | a2: A,
| -----
LL | b1: B,
| -----
LL | b2: B,
| -----
LL | c1: C,
| -----
LL | c2: C,
| -----
help: did you mean
|
LL | f(A, A, B, B, C, C);
Expand All @@ -41,18 +29,6 @@ note: function defined here
|
LL | fn f(
| ^
LL | a1: A,
| -----
LL | a2: A,
| -----
LL | b1: B,
| -----
LL | b2: B,
| -----
LL | c1: C,
| -----
LL | c2: C,
| -----
help: did you mean
|
LL | f(A, A, B, B, C, C);
Expand All @@ -72,14 +48,7 @@ note: function defined here
|
LL | fn f(
| ^
LL | a1: A,
| -----
LL | a2: A,
| -----
LL | b1: B,
| -----
LL | b2: B,
| -----
...
LL | c1: C,
| -----
LL | c2: C,
Expand All @@ -104,18 +73,6 @@ note: function defined here
|
LL | fn f(
| ^
LL | a1: A,
| -----
LL | a2: A,
| -----
LL | b1: B,
| -----
LL | b2: B,
| -----
LL | c1: C,
| -----
LL | c2: C,
| -----
help: did you mean
|
LL | f(A, A, B, B, C, C);
Expand All @@ -137,18 +94,9 @@ note: function defined here
|
LL | fn f(
| ^
LL | a1: A,
| -----
LL | a2: A,
| -----
...
LL | b1: B,
| -----
LL | b2: B,
| -----
LL | c1: C,
| -----
LL | c2: C,
| -----
help: did you mean
|
LL | f(A, A, /* B */, B, C, C);
Expand Down
Loading
Loading