Skip to content

Conversation

@euclio
Copy link
Contributor

@euclio euclio commented May 22, 2019

Adds notes pointing at the non-nullary variants, and uses "custom
discriminant" language to be consistent with the Reference.

Fixes #61039.

r? @estebank

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 22, 2019
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@estebank Feels like we should have a general framework for these sorts of things...? trait Article?

@euclio euclio force-pushed the custom-discriminant-error branch from 8d02ca6 to 214a9af Compare May 23, 2019 15:07
Adds notes pointing at the non-nullary variants, and uses "custom discriminant" language to be consistent with the Reference.
@euclio euclio force-pushed the custom-discriminant-error branch from 214a9af to 3cbf586 Compare May 23, 2019 15:14
@euclio
Copy link
Contributor Author

euclio commented May 23, 2019

@estebank Comments addressed.

@estebank
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented May 23, 2019

📌 Commit 3cbf586 has been approved by estebank

@bors 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 May 23, 2019
Centril added a commit to Centril/rust that referenced this pull request May 23, 2019
…=estebank tweak discriminant on non-nullary enum diagnostic Adds notes pointing at the non-nullary variants, and uses "custom discriminant" language to be consistent with the Reference. Fixes rust-lang#61039. r? @estebank
bors added a commit that referenced this pull request May 24, 2019
Rollup of 6 pull requests Successful merges: - #59545 (Use arenas to avoid Lrc in queries #2) - #61054 (Suggest dereferencing on assignment to mutable borrow) - #61056 (tweak discriminant on non-nullary enum diagnostic) - #61082 (fix dangling reference in Vec::append) - #61086 (Box::into_unique: do the reborrow-to-raw *after* destroying the Box) - #61098 (Fix overflowing literal lint in loops) Failed merges: r? @ghost
@bors bors merged commit 3cbf586 into rust-lang:master May 24, 2019
@euclio euclio deleted the custom-discriminant-error branch May 24, 2019 14:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

5 participants