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

Update chalk to 0.19.0 #74700

Closed
wants to merge 5 commits into from
Closed

Update chalk to 0.19.0 #74700

wants to merge 5 commits into from

Conversation

vandenheuvel
Copy link
Contributor

@vandenheuvel vandenheuvel commented Jul 23, 2020 •
edited
Loading

Because enums can now be handled by chalk, this exception for enums is not needed any more.

r? @jackh726

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @eddyb (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.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2020
@jackh726
Copy link
Member

Let's r? @nikomatsakis for official review here.

But I'll work with @vandenheuvel on the Chalk upgrade and getting this basically ready.

@rust-highfive rust-highfive assigned nikomatsakis and unassigned eddyb Jul 23, 2020
@jyn514 jyn514 added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label Jul 27, 2020
@nikomatsakis
Copy link
Contributor

@bors delegate=jackh726

This looks good to me, but I can't tell if @jackh726 is suggesting that it should not land yet.

@bors
Copy link
Contributor

bors commented Jul 27, 2020

✌️ @jackh726 can now approve this pull request

@jackh726
Copy link
Member

Indeed, we discussed on Zulip. This needs to be accompanied by a Chalk upgrade for this to be correct.

@vandenheuvel vandenheuvel changed the title Collect fields from structs, unions and enums in the same way Update chalk to 0.19.0 Jul 28, 2020
@bors
Copy link
Contributor

bors commented Aug 1, 2020

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

@bors
Copy link
Contributor

bors commented Aug 8, 2020

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

@vandenheuvel
Copy link
Contributor Author

In favor of #75173.

@vandenheuvel vandenheuvel deleted the unify_field_collection branch August 13, 2020 14:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nikomatsakis nikomatsakis nikomatsakis approved these changes

Assignees

@nikomatsakis nikomatsakis

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@vandenheuvel @rust-highfive @jackh726 @nikomatsakis @bors @eddyb @jyn514