Skip to content

Recover from C++ style enum struct - #99786

Merged
bors merged 2 commits into
rust-lang:masterfrom
obeis:issue-99625
Aug 4, 2022
Merged

Recover from C++ style enum struct#99786
bors merged 2 commits into
rust-lang:masterfrom
obeis:issue-99625

Conversation

@obeis

@obeisobeis commented Jul 26, 2022

Copy link
Copy Markdown
Contributor

Closes#99625

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

rust-highfive commented Jul 26, 2022

Copy link
Copy Markdown
Contributor

r? @oli-obk

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2022
@obeisobeis changed the title Reconver from C++ style enum structRecover from C++ style enum structJul 26, 2022
compiler-errors
compiler-errors reviewed Jul 27, 2022
View reviewed changes
Comment threadcompiler/rustc_parse/src/parser/diagnostics.rs Outdated
@oli-obk

oli-obk commented Jul 27, 2022

Copy link
Copy Markdown
Contributor

r? @compiler-errors

compiler-errors
compiler-errors reviewed Jul 27, 2022
View reviewed changes
Comment threadcompiler/rustc_parse/src/parser/item.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/item.rs Outdated
Comment threadsrc/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.rs Outdated
@compiler-errorscompiler-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

obeis commented Jul 28, 2022

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot 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 reviewed Jul 28, 2022
View reviewed changes
Comment threadcompiler/rustc_parse/src/parser/item.rs Outdated
compiler-errors
compiler-errors reviewed Jul 28, 2022
View reviewed changes
Comment threadsrc/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.fixed Outdated
compiler-errors
compiler-errors approved these changes Jul 29, 2022
View reviewed changes

@compiler-errorscompiler-errors left a comment

Copy link
Copy Markdown
Contributor

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.

Comment threadcompiler/rustc_parse/src/parser/item.rs Outdated
Comment threadcompiler/rustc_parse/src/parser/item.rs Outdated
lygstate
lygstate reviewed Jul 29, 2022
View reviewed changes
Comment threadsrc/test/ui/parser/issue-99625-enum-struct-mutually-exclusive.stderr Outdated
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 forrust-lang#99625
0ad06f1
@compiler-errors

compiler-errors commented Aug 3, 2022

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 3, 2022

Copy link
Copy Markdown
Collaborator

📌 Commit 0ad06f1 has been approved by compiler-errors

It is now in the queue for this repository.

@borsbors 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
@matthiaskrgrmatthiaskrgr 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 ofrust-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:masterAug 4, 2022
@rustbotrustbot added this to the 1.64.0 milestone Aug 4, 2022
@obeis
obeis deleted the issue-99625 branch May 13, 2023 12:31
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@compiler-errorscompiler-errorsAwaiting requested review from compiler-errors
1 more reviewer
@lygstatelygstatelygstate left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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