Skip to content

Update chalk to 0.19.0 - #74700

Closed
vandenheuvel wants to merge 5 commits into
rust-lang:masterfrom
vandenheuvel:unify_field_collection
Closed

Update chalk to 0.19.0#74700
vandenheuvel wants to merge 5 commits into
rust-lang:masterfrom
vandenheuvel:unify_field_collection

Conversation

@vandenheuvel

@vandenheuvelvandenheuvel commented Jul 23, 2020•
edited
Loading

Copy link
Copy Markdown
Contributor

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

r? @jackh726

@rust-highfive

rust-highfive commented Jul 23, 2020

Copy link
Copy Markdown
Contributor

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-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 23, 2020
@jackh726

jackh726 commented Jul 23, 2020

Copy link
Copy Markdown
Member

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

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

@jyn514jyn514 added the C-cleanup Category: PRs that clean code up or issues documenting cleanup. label Jul 27, 2020
@nikomatsakis

nikomatsakis commented Jul 27, 2020

Copy link
Copy Markdown
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

bors commented Jul 27, 2020

Copy link
Copy Markdown
Collaborator

✌️ @jackh726 can now approve this pull request

@jackh726

jackh726 commented Jul 27, 2020

Copy link
Copy Markdown
Member

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

@vandenheuvel
vandenheuvelforce-pushed the unify_field_collection branch from 2015fc8 to 56a03afCompareJuly 28, 2020 22:14
@vandenheuvelvandenheuvel changed the title Collect fields from structs, unions and enums in the same wayUpdate chalk to 0.19.0Jul 28, 2020
@bors

bors commented Aug 1, 2020

Copy link
Copy Markdown
Collaborator

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

@vandenheuvel
vandenheuvelforce-pushed the unify_field_collection branch from e5550b9 to e6e42bcCompareAugust 4, 2020 17:37
@bors

bors commented Aug 8, 2020

Copy link
Copy Markdown
Collaborator

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

@vandenheuvel
vandenheuvelforce-pushed the unify_field_collection branch from e6e42bc to b919403CompareAugust 13, 2020 11:14
@vandenheuvel

vandenheuvel commented Aug 13, 2020

Copy link
Copy Markdown
ContributorAuthor

In favor of #75173.

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

Reviewers

@nikomatsakisnikomatsakisnikomatsakis approved these changes

Assignees

@nikomatsakisnikomatsakis

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-reviewStatus: 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