Skip to content

Rollup of 4 pull requests #57761

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.

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

Merged
merged 15 commits into from
Jan 19, 2019
Merged

Rollup of 4 pull requests #57761

merged 15 commits into from
Jan 19, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jan 19, 2019

Successful merges:

Failed merges:

r? @ghost

steveklabnik and others added 15 commits January 9, 2019 14:46
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`.
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`.
This is causing issues with a new Clippy lint that will be able to
detect possible const functions.

As per rust-lang/rust-clippy#3648 (comment)
…, r=frewsxcv

Improve docs for Formatter

Some improvements to `std::fmt::Formatter` to make it a bit more consistent with other documentation, as well as calling out that you don't ever instantiate one yourself.
…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.
Point at cause for expectation in return type type error

Various improvements and fixes for type errors in return expressions.

Fix rust-lang#57664.
Remove delay_span_bug from qualify_min_const_fn

This is causing issues with a new Clippy lint that will be able to
detect possible const functions.

As per rust-lang/rust-clippy#3648 (comment)

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Jan 19, 2019

@bors r+ p=4

@bors
Copy link
Collaborator

bors commented Jan 19, 2019

📌 Commit d27224e has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 19, 2019
@bors
Copy link
Collaborator

bors commented Jan 19, 2019

⌛ Testing commit d27224e with merge 0c0c585...

bors added a commit that referenced this pull request Jan 19, 2019
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
Copy link
Collaborator

bors commented Jan 19, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: Centril
Pushing 0c0c585 to master...

@bors bors merged commit d27224e into rust-lang:master Jan 19, 2019
@Centril Centril deleted the rollup branch January 19, 2019 23:58
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants