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

Redo hir::Stmt #57689

Merged
merged 2 commits into from
Jan 19, 2019
Merged

Redo hir::Stmt #57689

merged 2 commits into from
Jan 19, 2019

Conversation

nnethercote
Copy link
Contributor

A couple of changes that make things simpler and more consistent.

This should probably wait until after 1.32 lands to land, to avoid late breakage for tools.

@nnethercote
Make hir::Stmt a separate struct.
b2ce5a9 
Benefits:

- It lets us move the `NodeId` field out of every `hir::StmtKind`
  variant `NodeId` to a more sensible spot.

- It eliminates sadness in `Stmt::fmt`.

- It makes `hir::Stmt` match `ast::Stmt`.
@nnethercote
Remove hir::StmtKind::Decl.
afbd004 
It's a level of indirection that hurts far more than it helps. The code
is simpler without it. (This commit cuts more than 120 lines of code.)

In particular, this commit removes some unnecessary `Span`s within
`DeclKind` that were always identical to those in the enclosing `Stmt`,
and some unnecessary allocations via `P`.
@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(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 Jan 17, 2019
@petrochenkov petrochenkov self-assigned this Jan 17, 2019
@petrochenkov petrochenkov removed their assignment Jan 17, 2019
@nnethercote
Copy link
Contributor Author

1.32 has been released.

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jan 17, 2019

📌 Commit afbd004 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 Jan 17, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 19, 2019
@Centril
Rollup merge of rust-lang#57689 - nnethercote:redo-hir-Stmt, r=petroc…
3bc61cd 
…henkov

Redo `hir::Stmt`

A couple of changes that make things simpler and more consistent.

This should probably wait until after 1.32 lands to land, to avoid late breakage for tools.
@Centril Centril mentioned this pull request Jan 19, 2019
Merged
bors added a commit that referenced this pull request Jan 19, 2019
@bors
Auto merge of #57761 - Centril:rollup, r=Centril
0c0c585 
Rollup of 4 pull requests

Successful merges:

 - #57452 (Improve docs for Formatter)
 - #57689 (Redo `hir::Stmt`)
 - #57723 (Point at cause for expectation in return type type error)
 - #57736 (Remove delay_span_bug from qualify_min_const_fn)

Failed merges:

r? @ghost
@bors bors merged commit afbd004 into rust-lang:master Jan 19, 2019
@ghost ghost mentioned this pull request Jan 20, 2019
Merged
@nnethercote nnethercote deleted the redo-hir-Stmt branch January 21, 2019 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@petrochenkov petrochenkov petrochenkov approved these changes

Assignees

@michaelwoerister michaelwoerister

Labels
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.

None yet
5 participants
@nnethercote @rust-highfive @bors @petrochenkov @michaelwoerister