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.

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

accept union keyword inside enum when not followed by identifier #66970

Closed
wants to merge 2 commits into from
Closed

accept union keyword inside enum when not followed by identifier #66970

wants to merge 2 commits into from

Conversation

kamleshbhalui
Copy link
Contributor

Fixes #66943

@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 @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.

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

This comment has been minimized.

src/librustc_parse/parser/item.rs Outdated Show resolved Hide resolved
src/test/ui/enum/union-in-enum.rs Outdated Show resolved Hide resolved
src/test/ui/enum/union-in-enum.rs Outdated Show resolved Hide resolved
src/test/ui/enum/union-in-enum.rs Outdated Show resolved Hide resolved
@Centril
Copy link
Contributor

Centril commented Dec 2, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned davidtwco Dec 2, 2019
@kamleshbhalui
Copy link
Contributor Author

Thank you @Centril for your suggestion.
I have incorporated them.

@Centril
Copy link
Contributor

Centril commented Dec 3, 2019

Thanks; can you also squash the commits into one? Should be ready to go after that (r=me).

@Centril Centril 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 Dec 3, 2019
Rollup of 7 pull requests

Successful merges:

 - #66346 (Replace .unwrap() with ? in std::os::unix::net)
 - #66789 (rustc: move mir::SourceScopeLocalData to a field of SourceScopeData.)
 - #66850 (rustc: hide HirId's fmt::Debug output from -Z span_free_formats.)
 - #66905 (rustc_plugin: Remove some remaining plugin features)
 - #66907 (rustc: don't just show raw DefIndex's in BrNamed's fmt::Debug impl.)
 - #66918 (Add crc and crypto to target feature whitelist on arm)
 - #66926 (add reusable MachineStop variant to Miri engine error enum)

Failed merges:

r? @ghost
@Centril
Copy link
Contributor

Centril commented Dec 3, 2019

Not sure why you got a merge commit from bors as the first one, but please also squash that into the other commit. Please also avoid mentioning user names with @Centril and such in commit messages as that generates more emails and notifications when you rebase. :)

@kamleshbhalui
Copy link
Contributor Author

@Centril I have addressed your concern.

@Centril
Copy link
Contributor

Centril commented Dec 4, 2019

@kamleshbhalui Seems like #66970 (comment) is unresolved?

@kamleshbhalui
Copy link
Contributor Author

@Centril is it good now.

@Centril
Copy link
Contributor

Centril commented Dec 5, 2019

@kamalmarhubi Seems like you still have two commits rather than one (where the first is a merge commit)? Not sure how you are rebasing but something is going awry.

@kamleshbhalui
Copy link
Contributor Author

I will create different pull request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

union pseudo keyword is no longer accepted in enum variant position as of 2019-11-25
5 participants