Skip to content

Emit specific error for struct literal in conditions #59981

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
Merged
merged 4 commits into from
Apr 19, 2019
Merged

Emit specific error for struct literal in conditions #59981

merged 4 commits into from
Apr 19, 2019

Conversation

estebank
Copy link
Contributor

@estebank estebank commented Apr 15, 2019 •
edited
Loading

Fix #59962, fix #51311.

@rust-highfive
Copy link
Contributor

r? @petrochenkov

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive

This comment has been minimized.

# to view
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 15, 2019
@estebank estebank force-pushed the recover-struct-lit branch from aa2f15b to 1a191c9 Compare April 15, 2019 00:09
@rust-highfive

This comment has been minimized.

# to view
estebank
estebank commented Apr 15, 2019
View reviewed changes
estebank
estebank commented Apr 15, 2019
View reviewed changes
petrochenkov
petrochenkov reviewed Apr 18, 2019
View reviewed changes
petrochenkov
petrochenkov reviewed Apr 18, 2019
View reviewed changes
petrochenkov
petrochenkov reviewed Apr 18, 2019
View reviewed changes
petrochenkov
petrochenkov reviewed Apr 18, 2019
View reviewed changes
petrochenkov
petrochenkov reviewed Apr 18, 2019
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 Apr 18, 2019
@bors

This comment has been minimized.

# to view
@estebank estebank force-pushed the recover-struct-lit branch from c9c441c to e374041 Compare April 18, 2019 18:35
@estebank estebank 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 Apr 18, 2019
@petrochenkov
Copy link
Contributor

Added one commit fixing the case with boolean literals and also improving a e s t h e t i c s.

@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Apr 18, 2019

📌 Commit 9c42ec3 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 Apr 18, 2019
@estebank
Copy link
Contributor Author

@petrochenkov neat

Centril added a commit to Centril/rust that referenced this pull request Apr 18, 2019
@Centril
Rollup merge of rust-lang#59981 - estebank:recover-struct-lit, r=petr…
a0af655 
…ochenkov

Emit specific error for struct literal in conditions

Fix rust-lang#59962, fix rust-lang#51311.
This was referenced Apr 18, 2019
Closed
Closed
@bors

This comment has been minimized.

# to view
@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Apr 19, 2019
@estebank estebank force-pushed the recover-struct-lit branch 2 times, most recently from 7005f9c to 88e0c6a Compare April 19, 2019 01:00
@estebank

This comment has been minimized.

# to view
estebank
estebank commented Apr 19, 2019
View reviewed changes
Copy link
Contributor Author

@estebank estebank left a comment

Choose a reason for hiding this comment

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

@petrochenkov I am aware of the hackiness of the approach 😬

@rust-highfive

This comment has been minimized.

# to view
@bors

This comment has been minimized.

# to view
@estebank
Copy link
Contributor Author

Removing the changes after the review was made, rebasing to fix merge conflicts and posting follow up PR for easier review.

@estebank estebank force-pushed the recover-struct-lit branch from 99e7c97 to aa393b0 Compare April 19, 2019 17:33
@estebank
Copy link
Contributor Author

@bors r=petrochenkov rebased

@bors
Copy link
Collaborator

bors commented Apr 19, 2019

📌 Commit aa393b0 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 19, 2019
@estebank estebank mentioned this pull request Apr 19, 2019
Closed
@bors
Copy link
Collaborator

bors commented Apr 19, 2019

⌛ Testing commit aa393b0 with merge 8aaae42...

bors added a commit that referenced this pull request Apr 19, 2019
@bors
Auto merge of #59981 - estebank:recover-struct-lit, r=petrochenkov
8aaae42 
Emit specific error for struct literal in conditions

Fix #59962, fix #51311.
@bors
Copy link
Collaborator

bors commented Apr 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: petrochenkov
Pushing 8aaae42 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 19, 2019
@bors bors merged commit aa393b0 into rust-lang:master Apr 19, 2019
@estebank estebank mentioned this pull request Apr 20, 2019
Closed
@ehuss ehuss mentioned this pull request Apr 21, 2019
Closed
@ehuss ehuss mentioned this pull request Jun 28, 2019
Open
# for free to join this conversation on GitHub. Already have an account? # 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
No milestone
Development

Successfully merging this pull request may close these issues.

Struct-style enum constructor gets misparsed as type ascription without suggestion Misleading error message in case of ambiguous if blocks
4 participants
@estebank @rust-highfive @bors @petrochenkov