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

Revert anon union parsing #88775

Merged
merged 8 commits into from
Sep 16, 2021
Merged

Revert anon union parsing #88775

merged 8 commits into from
Sep 16, 2021

Conversation

pnkfelix
Copy link
Member

@pnkfelix pnkfelix commented Sep 9, 2021

Revert PR #84571 and #85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the union keyword and thus broke stable Rust code.

Fix #88583.

@pnkfelix
Revert "Allow formatting Anonymous{Struct, Union} declarations"
2691a39 
This reverts commit 64acb7d.
@pnkfelix
Revert "Add test for pretty printing anonymous types"
2041fb1 
This reverts commit d59b1f1.
@pnkfelix
Revert "Fix ast expanded printing for anonymous types"
5560f6d 
This reverts commit 5b4bc05.
@pnkfelix
Revert "Add test for restriction of anonymous types on validation"
f38ec9c 
This reverts commit 8a1dd69.
@pnkfelix
Manually crafted revert of d4ad050 .
b6aa7e3
@pnkfelix
Revert "Implement Anonymous{Struct, Union} in the AST"
91feb76 
This reverts commit 059b68d.

Note that this was manually adjusted to retain some of the refactoring
introduced by commit 059b68d, so that it could
likewise retain the correction introduced in commit
5b4bc05
@pnkfelix
Re-add 71a7f8f post-revert.
f26f1ed
@pnkfelix
regression test for issue rust-lang#88583.
35370a7
@rust-highfive
Copy link
Collaborator

Some changes occurred in src/tools/rustfmt.

cc @calebcartwright

@rust-highfive
Copy link
Collaborator

r? @davidtwco

(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 Sep 9, 2021
@pnkfelix pnkfelix added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Sep 9, 2021
@pnkfelix pnkfelix mentioned this pull request Sep 9, 2021
Closed
davidtwco
davidtwco approved these changes Sep 9, 2021
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

LGTM, only checked the manual reverts/commits looked reasonable, r=me when you're ready and CI is passing.

@estebank
Copy link
Contributor

I opened #88815 as an alternative to reverting. If we still revert, it can be used once we reintroduce the feature.

@pnkfelix
Copy link
Member Author

@bors r=davidtwco

@bors
Copy link
Contributor

bors commented Sep 10, 2021

📌 Commit 35370a7 has been approved by davidtwco

@bors
Copy link
Contributor

bors commented Sep 10, 2021

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Sep 10, 2021
@pnkfelix pnkfelix added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 10, 2021
@pnkfelix
Copy link
Member Author

beta nominating: We want this fix for #88583 to end up in the 1.56 release, if possible, in order to coincide with the 2021 edition.

@estebank
Copy link
Contributor

Closing #88815. It's changes need to be included when relanding this on master.

@estebank estebank mentioned this pull request Sep 10, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 12, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
b385de7 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 12, 2021
Closed
@workingjubilee workingjubilee mentioned this pull request Sep 12, 2021
Closed
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Sep 12, 2021
@workingjubilee
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
a5f470b 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 14, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
ca0c556 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 14, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 14, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
8417ac5 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 14, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 14, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
a8a4504 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 14, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 14, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
75fae88 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 14, 2021
Closed
Manishearth added a commit to Manishearth/rust that referenced this pull request Sep 15, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
95306c6 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
@Manishearth Manishearth mentioned this pull request Sep 15, 2021
Closed
@Manishearth Manishearth mentioned this pull request Sep 15, 2021
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 16, 2021
@bors
Auto merge of rust-lang#88992 - Manishearth:rollup-k9hijii, r=Manishe…
34327f6 
…arth

Rollup of 8 pull requests

Successful merges:

 - rust-lang#87320 (Introduce -Z remap-cwd-prefix switch)
 - rust-lang#88690 (Accept `m!{ .. }.method()` and `m!{ .. }?` statements. )
 - rust-lang#88775 (Revert anon union parsing)
 - rust-lang#88841 (feat(rustc_typeck): suggest removing bad parens in `(recv.method)()`)
 - rust-lang#88907 (Highlight the `const fn` if error happened because of a bound on the impl block)
 - rust-lang#88915 (`Wrapping<T>` has the same layout and ABI as `T`)
 - rust-lang#88933 (Remove implementation of `min_align_of` intrinsic)
 - rust-lang#88951 (Update books)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fb2d7df into rust-lang:master Sep 16, 2021
@rustbot rustbot added this to the 1.57.0 milestone Sep 16, 2021
@estebank estebank added the relnotes Marks issues that should be documented in the release notes of the next release. label Sep 16, 2021
@pnkfelix
Copy link
Member Author

beta backport approved

@apiraino apiraino added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 16, 2021
@apiraino
Copy link
Contributor

Relevant discussion on Zulip

@cuviper cuviper mentioned this pull request Sep 16, 2021
Merged
@cuviper cuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 16, 2021
@cuviper cuviper modified the milestones: 1.57.0, 1.56.0 Sep 16, 2021
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 17, 2021
@bors
Auto merge of rust-lang#88946 - cuviper:beta-next, r=Mark-Simulacrum
deef866 
[beta] backports

- rustdoc: Fix ICE with `doc(hidden)` on tuple variant fields rust-lang#88639
- Fix 2021 `dyn` suggestion that used code as label rust-lang#88657
- Workaround blink/chromium grid layout limitation of 1000 rows rust-lang#88776
- Change scope of temporaries in match guards rust-lang#88678
- Add a regression test for rust-lang#88649 rust-lang#88691
- Revert anon union parsing rust-lang#88775
- Disable validate_maintainers. rust-lang#88977

Also drop stage0 rustfmt, because that's only supposed to be used on master.

r? `@Mark-Simulacrum`
@dtolnay dtolnay mentioned this pull request Sep 23, 2021
Merged
calebcartwright pushed a commit to calebcartwright/rust that referenced this pull request Oct 20, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
52e1a52 
… r=davidtwco

Revert anon union parsing

Revert PR rust-lang#84571 and rust-lang#85515, which implemented anonymous union parsing in a manner that broke the context-sensitivity for the `union` keyword and thus broke stable Rust code.

Fix rust-lang#88583.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. relnotes Marks issues that should be documented in the release notes of the next release. 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.56.0
Development

Successfully merging this pull request may close these issues.

Type called union wreaks havoc since 1.54
8 participants
@pnkfelix @rust-highfive @estebank @bors @apiraino @davidtwco @cuviper @rustbot