Suggest using type args directly instead of equality constraint #122591

gurry · 2024-03-16T12:02:03Z

When type arguments are written erroneously using an equality constraint we suggest specifying them directly without the equality constraint.

Fixes #122162

Changes the diagnostic in the issue from:

error[E0229]: associated type bindings are not allowed here
9 | impl std::cmp::PartialEq<Rhs = T> for S {
  |                          ^^^^^^^ associated type not allowed here
  |

to

error[E0229]: associated type bindings are not allowed here
9 | impl std::cmp::PartialEq<Rhs = T> for S {
  |                          ^^^^^^^ associated type not allowed here
  |
help: to use `T` as a generic argument specify it directly
  |
  |      impl std::cmp::PartialEq<T> for S {
  |                               ~

rustbot · 2024-03-16T12:02:11Z

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

tests/ui/associated-type-bounds/issue-102335-ty.stderr

compiler/rustc_hir_analysis/src/astconv/errors.rs

bors · 2024-03-21T09:00:30Z

☔ The latest upstream changes (presumably #121123) made this pull request unmergeable. Please resolve the merge conflicts.

gurry · 2024-03-22T02:07:27Z

@rustbot label -S-waiting-on-review +S-waiting-on-author

lcnr · 2024-03-22T11:01:13Z

r? @fmease

bors · 2024-03-22T13:14:38Z

☔ The latest upstream changes (presumably #120926) made this pull request unmergeable. Please resolve the merge conflicts.

rustbot · 2024-03-22T14:20:15Z

HIR ty lowering was modified

cc @fmease

gurry · 2024-03-23T07:35:38Z

@rustbot label +S-waiting-on-review -S-waiting-on-author

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

tests/rustdoc-ui/invalid_associated_const.stderr

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

tests/ui/associated-types/associated-types-eq-2.stderr

gurry · 2024-04-01T05:05:37Z

@fmease I have updated the code as per your review comments. The main thing to note is that I have changed the approach such that we make the "use directly" suggestion only there is a type param with a matching name. If not, we suggest removal.
@rustbot label -S-waiting-on-author +S-waiting-on-review

gurry · 2024-04-03T12:02:41Z

☔ The latest upstream changes (presumably #123396) made this pull request unmergeable. Please resolve the merge conflicts.

Rebased

fmease

Sorry for taking so long again! I should have more time for review now.
I have a couple of suggestions.

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

tests/ui/associated-consts/issue-102335-const.stderr

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

tests/ui/associated-types/associated-types-eq-2.rs

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

fmease · 2024-04-12T15:13:42Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

+
+        // Check if the type has a generic param with the
+        // same name as the assoc type name in type binding
+        let generics = tcx.generics_of(def_id);


generics_of can panic if the definition (identified by the def_id) can't have generic parameters. Could you check if we can indeed panic here, e.g. if the definition is a type parameter:

fn f<T>() { let _: T<X = ()>; }

If it does, we need to add some checks before trying to use generics_of.

No, this does not ICE

fmease · 2024-04-12T15:15:46Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/errors.rs

+        && let hir::TypeBindingKind::Equality { term } = binding.kind
+    {
+        // Suggests removal of the offending binding
+        let suggest_removal = |e: &mut Diag<'_>| {


Note to self: I still need to review this function. I suspect it can be simplified by a lot but let's see.

gurry · 2024-04-13T06:14:45Z

Sorry for taking so long again! I should have more time for review now. I have a couple of suggestions.

No worries @fmease.

I'll incorporate your suggestions.

gurry · 2024-04-19T01:37:26Z

@fmease please review

gurry · 2024-04-21T03:14:20Z

@rustbot label -S-waiting-on-author +S-waiting-on-review

fmease · 2024-04-21T14:36:07Z

I've left some comments here (linking this from here for visibility).

gurry · 2024-04-22T05:55:55Z

I've left some comments here (linking this from here for visibility).

Thanks for all the suggestions. They have made the PR so much better.

If you're okay, we can merge this PR and take up the problems around macros in a later PR.

@rustbot label -S-waiting-on-author +S-waiting-on-review

fmease · 2024-04-23T10:42:41Z

If you're okay, we can merge this PR and take up the problems around macros in a later PR.

👍

@bors r+ rollup

bors · 2024-04-23T10:42:43Z

📌 Commit f7ebad4 has been approved by fmease

It is now in the queue for this repository.

Rollup of 7 pull requests Successful merges: - rust-lang#120929 (Wrap dyn type with parentheses in suggestion) - rust-lang#122591 (Suggest using type args directly instead of equality constraint) - rust-lang#122598 (deref patterns: lower deref patterns to MIR) - rust-lang#123048 (alloc::Layout: explicitly document size invariant on the type level) - rust-lang#123993 (Do `check_coroutine_obligations` once per typeck root) - rust-lang#124218 (Allow nesting subdiagnostics in #[derive(Subdiagnostic)]) - rust-lang#124285 (Mark ``@RUSTC_BUILTIN`` search path usage as unstable) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#122591 - gurry:122162-impl-type-binding-suggestion, r=fmease Suggest using type args directly instead of equality constraint When type arguments are written erroneously using an equality constraint we suggest specifying them directly without the equality constraint. Fixes rust-lang#122162 Changes the diagnostic in the issue from: ```rust error[E0229]: associated type bindings are not allowed here 9 | impl std::cmp::PartialEq<Rhs = T> for S { | ^^^^^^^ associated type not allowed here | ``` to ```rust error[E0229]: associated type bindings are not allowed here 9 | impl std::cmp::PartialEq<Rhs = T> for S { | ^^^^^^^ associated type not allowed here | help: to use `T` as a generic argument specify it directly | | impl std::cmp::PartialEq<T> for S { | ~ ```

rustbot assigned lcnr Mar 16, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 16, 2024

fmease reviewed Mar 16, 2024

View reviewed changes

tests/ui/associated-type-bounds/issue-102335-ty.stderr Outdated Show resolved Hide resolved

compiler/rustc_hir_analysis/src/astconv/errors.rs Outdated Show resolved Hide resolved

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 22, 2024

rustbot assigned fmease and unassigned lcnr Mar 22, 2024

gurry force-pushed the 122162-impl-type-binding-suggestion branch from d29a5a1 to 560d463 Compare March 22, 2024 11:48

This comment has been minimized.

Sign in to view

gurry force-pushed the 122162-impl-type-binding-suggestion branch 2 times, most recently from 3aec774 to ec93aaa Compare March 22, 2024 14:20

This comment has been minimized.

Sign in to view

gurry force-pushed the 122162-impl-type-binding-suggestion branch from ec93aaa to 274ad2a Compare March 23, 2024 03:16

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 23, 2024

gurry force-pushed the 122162-impl-type-binding-suggestion branch from 274ad2a to f31eb72 Compare March 23, 2024 08:31

fmease requested changes Mar 29, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 29, 2024

gurry force-pushed the 122162-impl-type-binding-suggestion branch from f31eb72 to fcdffd6 Compare April 1, 2024 03:38

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 1, 2024

gurry force-pushed the 122162-impl-type-binding-suggestion branch from fcdffd6 to 52e9774 Compare April 3, 2024 10:42

fmease requested changes Apr 12, 2024

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 12, 2024

fmease reviewed Apr 12, 2024

View reviewed changes

Emit suggestions when equality constraints are wrongly used

f7ebad4

gurry force-pushed the 122162-impl-type-binding-suggestion branch from 52e9774 to f7ebad4 Compare April 16, 2024 05:42

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 21, 2024

fmease added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 21, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 22, 2024

fmease approved these changes Apr 23, 2024

View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 23, 2024

fmease mentioned this pull request Apr 23, 2024

Rollup of 7 pull requests #124295

Merged

bors merged commit 68939f7 into rust-lang:master Apr 23, 2024
12 checks passed

rustbot added this to the 1.79.0 milestone Apr 23, 2024

gurry deleted the 122162-impl-type-binding-suggestion branch April 24, 2024 00:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Suggest using type args directly instead of equality constraint #122591

Suggest using type args directly instead of equality constraint #122591

gurry commented Mar 16, 2024 •

edited

Loading

rustbot commented Mar 16, 2024

bors commented Mar 21, 2024

gurry commented Mar 22, 2024

lcnr commented Mar 22, 2024

This comment has been minimized.

bors commented Mar 22, 2024

rustbot commented Mar 22, 2024

This comment has been minimized.

gurry commented Mar 23, 2024

gurry commented Apr 1, 2024 •

edited

Loading

gurry commented Apr 3, 2024

fmease left a comment

fmease Apr 12, 2024

gurry Apr 16, 2024

fmease Apr 12, 2024 •

edited

Loading

gurry commented Apr 13, 2024

gurry commented Apr 19, 2024

gurry commented Apr 21, 2024

fmease commented Apr 21, 2024

gurry commented Apr 22, 2024 •

edited

Loading

fmease commented Apr 23, 2024

bors commented Apr 23, 2024

Suggest using type args directly instead of equality constraint #122591

Suggest using type args directly instead of equality constraint #122591

Conversation

gurry commented Mar 16, 2024 • edited Loading

rustbot commented Mar 16, 2024

bors commented Mar 21, 2024

gurry commented Mar 22, 2024

lcnr commented Mar 22, 2024

This comment has been minimized.

bors commented Mar 22, 2024

rustbot commented Mar 22, 2024

This comment has been minimized.

gurry commented Mar 23, 2024

gurry commented Apr 1, 2024 • edited Loading

gurry commented Apr 3, 2024

fmease left a comment

Choose a reason for hiding this comment

fmease Apr 12, 2024

Choose a reason for hiding this comment

gurry Apr 16, 2024

Choose a reason for hiding this comment

fmease Apr 12, 2024 • edited Loading

Choose a reason for hiding this comment

gurry commented Apr 13, 2024

gurry commented Apr 19, 2024

gurry commented Apr 21, 2024

fmease commented Apr 21, 2024

gurry commented Apr 22, 2024 • edited Loading

fmease commented Apr 23, 2024

bors commented Apr 23, 2024

gurry commented Mar 16, 2024 •

edited

Loading

gurry commented Apr 1, 2024 •

edited

Loading

fmease Apr 12, 2024 •

edited

Loading

gurry commented Apr 22, 2024 •

edited

Loading