Skip to content

Fix ast pretty printing for anonymous types#85515

Merged
bors merged 2 commits intorust-lang:masterfrom
jedel1043:fix-85480
May 24, 2021
Merged

Fix ast pretty printing for anonymous types#85515
bors merged 2 commits intorust-lang:masterfrom
jedel1043:fix-85480

Conversation

@jedel1043
Copy link
Contributor

@jedel1043 jedel1043 commented May 20, 2021

Fixes #85480.

@rust-highfive
Copy link
Contributor

rust-highfive commented May 20, 2021

r? @petrochenkov

(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 May 20, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented May 20, 2021

This needs a test in src\test\pretty, a // pp-exact one would probably be enough, you can use other tests in that directory as examples.

@petrochenkov petrochenkov 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 May 20, 2021
@jedel1043 jedel1043 changed the title Fix ast expanded printing for anonymous types Fix ast pretty printing for anonymous types May 20, 2021
@jedel1043
Copy link
Contributor Author

jedel1043 commented May 21, 2021

@rustbot label -S-waiting-on-author +S-waiting-on-review

@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 May 21, 2021
petrochenkov
petrochenkov reviewed May 21, 2021
View reviewed changes
@petrochenkov petrochenkov 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 May 21, 2021
petrochenkov
petrochenkov reviewed May 21, 2021
View reviewed changes
@jedel1043
Copy link
Contributor Author

jedel1043 commented May 21, 2021

@rustbot label -S-waiting-on-author +S-waiting-on-review

@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 May 21, 2021
petrochenkov
petrochenkov reviewed May 22, 2021
View reviewed changes
@petrochenkov petrochenkov 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 May 22, 2021
@jedel1043
Copy link
Contributor Author

jedel1043 commented May 22, 2021

@rustbot label -S-waiting-on-author +S-waiting-on-review

@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 May 22, 2021
@petrochenkov petrochenkov 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 May 23, 2021
@jedel1043
Copy link
Contributor Author

jedel1043 commented May 24, 2021

@rustbot label -S-waiting-on-author +S-waiting-on-review

@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 May 24, 2021
@petrochenkov
Copy link
Contributor

petrochenkov commented May 24, 2021

Thanks!
@bors r+

@bors
Copy link
Collaborator

bors commented May 24, 2021

📌 Commit d59b1f1 has been approved by petrochenkov

@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 May 24, 2021
@bors
Copy link
Collaborator

bors commented May 24, 2021

⌛ Testing commit d59b1f1 with merge 68424e2...

@bors
Copy link
Collaborator

bors commented May 24, 2021

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 68424e2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 24, 2021
@bors bors merged commit 68424e2 into rust-lang:master May 24, 2021
@rustbot rustbot added this to the 1.54.0 milestone May 24, 2021
@jedel1043 jedel1043 deleted the fix-85480 branch May 24, 2021 12:13
@pnkfelix pnkfelix mentioned this pull request Sep 9, 2021
Merged
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.
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 12, 2021
@Manishearth
Rollup merge of rust-lang#88775 - pnkfelix:revert-anon-union-parsing,…
c09e12b 
… 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 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 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 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 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 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,…
fb2d7df 
… 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.
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.
@carbotaniuman carbotaniuman mentioned this pull request Jul 26, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.54.0

Development

Successfully merging this pull request may close these issues.

ICE: feature-gate-unnamed_fields.rs: unwrap of None with -Zunpretty=expanded,hygiene

5 participants

@jedel1043 @rust-highfive @petrochenkov @bors @rustbot