Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Recover from C++ style enum struct #99786

Merged
merged 2 commits into from
Aug 4, 2022
Merged

Recover from C++ style enum struct #99786

merged 2 commits into from
Aug 4, 2022

Conversation

obeis
Copy link
Contributor

@obeis obeis commented Jul 26, 2022

Closes #99625

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 26, 2022
@rust-highfive
Copy link
Contributor

r? @oli-obk

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2022
@obeis obeis changed the title Reconver from C++ style enum struct Recover from C++ style enum struct Jul 26, 2022
@oli-obk
Copy link
Contributor

oli-obk commented Jul 27, 2022

r? @compiler-errors

@compiler-errors compiler-errors 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 Jul 27, 2022
@obeis
Copy link
Contributor Author

obeis commented Jul 28, 2022

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2022
compiler-errors
compiler-errors approved these changes Jul 29, 2022
View reviewed changes
Copy link
Member

@compiler-errors compiler-errors left a comment

Choose a reason for hiding this comment

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

Looks good. 2 more nits.

obeis added 2 commits July 29, 2022 13:56
@obeis
Recover from c++ style enum struct
254b89d 
new error message: `enum` and `struct` are mutually exclusive
new suggestion: replace `enum struct` with `enum`
@obeis
Add ui test for rust-lang#99625
0ad06f1
@obeis obeis requested a review from compiler-errors July 29, 2022 12:45
@compiler-errors
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 3, 2022

📌 Commit 0ad06f1 has been approved by compiler-errors

It is now in the queue for this repository.

@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 Aug 3, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 3, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 4, 2022
@bors
Auto merge of rust-lang#100120 - matthiaskrgr:rollup-g6ycykq, r=matth…
caee496 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#98771 (Add support for link-flavor rust-lld for iOS, tvOS and watchOS)
 - rust-lang#98835 (relate `closure_substs.parent_substs()` to parent fn in NLL)
 - rust-lang#99746 (Use `TraitEngine` in more places that don't specifically need `FulfillmentContext::new_in_snapshot`)
 - rust-lang#99786 (Recover from C++ style `enum struct`)
 - rust-lang#99795 (Delay a bug when failed to normalize trait ref during specialization)
 - rust-lang#100029 (Prevent ICE for `doc_alias` on match arm, statement, expression)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9c18fdc into rust-lang:master Aug 4, 2022
@rustbot rustbot added this to the 1.64.0 milestone Aug 4, 2022
@obeis obeis deleted the issue-99625 branch May 13, 2023 12:31
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@lygstate lygstate

@compiler-errors compiler-errors

Assignees

@compiler-errors compiler-errors

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

Recover from C++-style "pub enum struct X"
7 participants
@obeis @rust-highfive @oli-obk @compiler-errors @bors @lygstate @rustbot