Fixed #85845: Added a note in E0369 if the missing trait is PartialEq #85929

ccgauche · 2021-06-02T10:22:14Z

This PR fixes #85845.
A new note has been added if the missing trait is PartialEq:

add `#[derive(PartialEq)]` or manually implement `PartialEq` for `MyStruct`

I'm not sure the ends_with is the best way but I want this change to affect core, std or custom libs. So using a full strict path isn't possible.

This is my first contribution so tell me if some guidelines aren't respected.

…rive. This is my first contribution so tell me if some guidelines aren't respected.

rust-highfive · 2021-06-02T10:22:17Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @davidtwco (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

fee1-dead · 2021-06-04T01:45:14Z

You should add a UI test for this, see this

compiler/rustc_typeck/src/check/op.rs

fee1-dead · 2021-06-04T01:52:29Z

compiler/rustc_typeck/src/check/op.rs

@@ -959,6 +959,13 @@ fn suggest_impl_missing(err: &mut DiagnosticBuilder<'_>, ty: Ty<'_>, missing_tra
                "an implementation of `{}` might be missing for `{}`",
                missing_trait, ty
            ));
+            // This checks if the missing trait is PartialEq to suggest adding a derive
+            if missing_trait.ends_with("PartialEq") {
+                err.note(&format!(


Use span_suggestion, as this is a suggestion. You should move this to somewhere else, so you can look up the span of the original definition for the type.

I'm not sure that a span suggestion is better. A note at the end is clearer. Why do you want a span_suggestion?

Because you want to suggest adding a derive to the type being compared here. So you use the span of the original definition and add a #[derive(PartialEq)] on top of it, or add PartialEq to the existing derive.

davidtwco

Apologies for how long its taken me to get to this review, this is a good improvement, and I've made a suggestion on how the condition you've added could be more robust.

compiler/rustc_typeck/src/check/op.rs

crlf0710 · 2021-07-04T04:41:38Z

@ccgauche Ping from triage, would you mind addressing the review comments above? Thanks!

ccgauche · 2021-07-05T11:56:08Z

I'm in vacations currently. I'll address that next week. Le dim. 4 juil. 2021 à 06:41, Charles Lew ***@***.***> a écrit :

…

@ccgauche <https://github.com/ccgauche> Ping from triage, would you mind addressing the review comments above? Thanks! — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#85929 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AD63CQ4435SG3QBSFMPIKZDTV7RA3ANCNFSM456NU7AQ> .

crlf0710 · 2021-07-24T07:15:11Z

@ccgauche Ping from triage, any updates here?

ccgauche · 2021-07-31T04:30:43Z

Yep sorry it is a little more complicated on my side than expected. I'll see what I can do in the next few days.

- Made the check stricter. **Note: I've checked and there is no other trait that can be possibly passed than std ones. (BinOps) so there is no need for a `can_derive` or something similar. Furthermore, this mean we can't pass another thing than a str.**

ccgauche · 2021-08-01T22:25:12Z

I also fixed the issue for PartialOrd

fee1-dead · 2021-08-05T11:04:59Z

@ccgauche Do you still want to work on this, or is it fine if I take this on myself?

ccgauche · 2021-08-05T11:06:39Z

You can work on it if you want! I'm currently in vacations.

davidtwco

I'd still like to see the changes suggested in #85929 (comment) be made, I'd rather we didn't add string comparions if it can be avoided.

fee1-dead · 2021-08-12T13:12:28Z

Yeah, I'm sorry I don't have time to implement this. Maybe someone else can try?

…ll work properly

ccgauche · 2021-08-17T21:05:45Z

@davidtwco Can you check my changes and confirm that's what you want?

This fix replaces all strings with an enum that has defined states so we are sure we don't encounter problems with string checks.
This also makes the code easier to read and more generic for the rest of the op.rs file

davidtwco

Looks good now, left a few small nits but r=me after that.

davidtwco · 2021-08-23T13:50:50Z

compiler/rustc_hir/src/hir.rs

@@ -1124,6 +1167,13 @@ impl UnOp {
            Self::Neg => "-",
        }
    }


Suggested change

}

}

nit: newline

davidtwco · 2021-08-23T13:51:21Z

compiler/rustc_typeck/src/check/op.rs

@@ -951,14 +938,56 @@ fn is_builtin_binop<'tcx>(lhs: Ty<'tcx>, rhs: Ty<'tcx>, op: hir::BinOp) -> bool
    }
 }

+enum STDImplementationMissing {
+    Unop(hir::UnOp),


Suggested change

Unop(hir::UnOp),

UnOp(hir::UnOp),

nit: consistency

davidtwco · 2021-08-23T13:52:26Z

compiler/rustc_typeck/src/check/op.rs

@@ -951,14 +938,56 @@ fn is_builtin_binop<'tcx>(lhs: Ty<'tcx>, rhs: Ty<'tcx>, op: hir::BinOp) -> bool
    }
 }

+enum STDImplementationMissing {


Suggested change

enum STDImplementationMissing {

enum StdImplementationMissing {

nit: capitalisation

bors · 2021-08-27T01:24:17Z

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

JohnCSimon · 2021-09-12T07:37:46Z

Ping from triage:

@ccgauche can you please resolve the merge conflict?

JohnCSimon · 2021-10-03T06:00:16Z

Ping again from triage:

@ccgauche can you please resolve the merge conflict?

jackh726 · 2021-10-23T01:55:32Z

I'm going to go ahead and close this. Looks like this suggestion was implemented in #86943. Sorry @ccgauche, but your work is appreciated nonetheless!

Added a note in E0369 if the missing trait is PartialEq to use the de…

518f643

…rive. This is my first contribution so tell me if some guidelines aren't respected.

rust-highfive assigned davidtwco Jun 2, 2021

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 2, 2021

fee1-dead requested changes Jun 4, 2021

View reviewed changes

davidtwco requested changes Jun 16, 2021

View reviewed changes

compiler/rustc_typeck/src/check/op.rs Outdated Show resolved Hide resolved

davidtwco 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 Jun 16, 2021

ccgauche added 2 commits August 1, 2021 23:57

Removed unused contains

a1d18be

This comment has been minimized.

Sign in to view

Fixed error unit test + Added correction for PartialOrd

96c4539

ccgauche requested a review from davidtwco August 1, 2021 22:25

This comment has been minimized.

Sign in to view

Fixed CI 2

bcb49dc

This comment has been minimized.

Sign in to view

Fixed derives-span-PartialEq-enum tests

afcef43

davidtwco requested changes Aug 12, 2021

View reviewed changes

Replaced String checks with enums so we can ensure that everything wi…

38830d2

…ll work properly

ccgauche requested a review from davidtwco August 17, 2021 21:05

This comment has been minimized.

Sign in to view

ccgauche added 2 commits August 17, 2021 23:22

Fixed CI errors

b58393b

Fixed borrow issue

207f9b1

davidtwco requested changes Aug 23, 2021

View reviewed changes

apiraino added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 14, 2021

jackh726 closed this Oct 23, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed #85845: Added a note in E0369 if the missing trait is PartialEq #85929

Fixed #85845: Added a note in E0369 if the missing trait is PartialEq #85929

ccgauche commented Jun 2, 2021

rust-highfive commented Jun 2, 2021

fee1-dead commented Jun 4, 2021

fee1-dead Jun 4, 2021

ccgauche Aug 1, 2021

fee1-dead Aug 2, 2021

davidtwco left a comment

crlf0710 commented Jul 4, 2021

ccgauche commented Jul 5, 2021 via email

crlf0710 commented Jul 24, 2021

ccgauche commented Jul 31, 2021

This comment has been minimized.

ccgauche commented Aug 1, 2021

This comment has been minimized.

This comment has been minimized.

fee1-dead commented Aug 5, 2021

ccgauche commented Aug 5, 2021

davidtwco left a comment

fee1-dead commented Aug 12, 2021

ccgauche commented Aug 17, 2021

This comment has been minimized.

davidtwco left a comment

davidtwco Aug 23, 2021

davidtwco Aug 23, 2021

davidtwco Aug 23, 2021

bors commented Aug 27, 2021

JohnCSimon commented Sep 12, 2021

JohnCSimon commented Oct 3, 2021

jackh726 commented Oct 23, 2021

	enum STDImplementationMissing {
	enum StdImplementationMissing {

Fixed #85845: Added a note in E0369 if the missing trait is PartialEq #85929

Fixed #85845: Added a note in E0369 if the missing trait is PartialEq #85929

Conversation

ccgauche commented Jun 2, 2021

rust-highfive commented Jun 2, 2021

fee1-dead commented Jun 4, 2021

fee1-dead Jun 4, 2021

Choose a reason for hiding this comment

ccgauche Aug 1, 2021

Choose a reason for hiding this comment

fee1-dead Aug 2, 2021

Choose a reason for hiding this comment

davidtwco left a comment

Choose a reason for hiding this comment

crlf0710 commented Jul 4, 2021

ccgauche commented Jul 5, 2021 via email

crlf0710 commented Jul 24, 2021

ccgauche commented Jul 31, 2021

This comment has been minimized.

ccgauche commented Aug 1, 2021

This comment has been minimized.

This comment has been minimized.

fee1-dead commented Aug 5, 2021

ccgauche commented Aug 5, 2021

davidtwco left a comment

Choose a reason for hiding this comment

fee1-dead commented Aug 12, 2021

ccgauche commented Aug 17, 2021

This comment has been minimized.

davidtwco left a comment

Choose a reason for hiding this comment

davidtwco Aug 23, 2021

Choose a reason for hiding this comment

davidtwco Aug 23, 2021

Choose a reason for hiding this comment

davidtwco Aug 23, 2021

Choose a reason for hiding this comment

bors commented Aug 27, 2021

JohnCSimon commented Sep 12, 2021

JohnCSimon commented Oct 3, 2021

jackh726 commented Oct 23, 2021