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

Jump to bottom

Add DiscriminantKind builtin trait #633

Merged
merged 4 commits into from
Dec 10, 2020
Merged

Add DiscriminantKind builtin trait #633

merged 4 commits into from
Dec 10, 2020

Conversation

basil-cow
Copy link
Contributor

No description provided.

jackh726
jackh726 requested changes Oct 23, 2020
View reviewed changes
Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

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

I think this looks good overall. Book will need updating, and I had a couple comments on the tests.

Unfortunately, since I don't know a ton about this, I'd like a second set of eyes. @nikomatsakis?

tests/test/wf_lowering.rs Outdated Show resolved Hide resolved
tests/test/discriminant_kind.rs Show resolved Hide resolved
@basil-cow
Copy link
Contributor Author

cc #363

@bors
Copy link
Contributor

bors commented Nov 8, 2020

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

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@jackh726
Copy link
Member

jackh726 commented Dec 9, 2020

Review comment has been addressed so this should be good to review

@nikomatsakis
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Dec 10, 2020

📌 Commit fc05789 has been approved by nikomatsakis

@bors
Copy link
Contributor

bors commented Dec 10, 2020

⌛ Testing commit fc05789 with merge 8122127...

@bors
Copy link
Contributor

bors commented Dec 10, 2020

☀️ Test successful - checks-actions
Approved by: nikomatsakis
Pushing 8122127 to master...

@bors bors merged commit 8122127 into rust-lang:master Dec 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackh726 jackh726 jackh726 requested changes

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@basil-cow @bors @jackh726 @nikomatsakis