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.

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

Migrate tidy to rust 2018 edition #60521

Merged
merged 2 commits into from
May 4, 2019
Merged

Conversation

rasendubi
Copy link
Contributor

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(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 3, 2019
@Centril
Copy link
Contributor

Centril commented May 3, 2019

r? @Centril

@rust-highfive rust-highfive assigned Centril and unassigned alexcrichton May 3, 2019
@Centril
Copy link
Contributor

Centril commented May 3, 2019

Can you extract let mut part = || { out of the block as well in version.rs?

@rasendubi
Copy link
Contributor Author

Done

Copy link
Contributor

@Centril Centril left a comment

Choose a reason for hiding this comment

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

r=me rollup with green travis

@rasendubi
Copy link
Contributor Author

@Centril green ping

@Centril
Copy link
Contributor

Centril commented May 3, 2019

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 3, 2019

📌 Commit bacf792 has been approved by Centril

@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 3, 2019
Centril added a commit to Centril/rust that referenced this pull request May 4, 2019
bors added a commit that referenced this pull request May 4, 2019
Rollup of 9 pull requests

Successful merges:

 - #60429 (Account for paths in incorrect pub qualifier help)
 - #60449 (Constrain all regions in the concrete type for an opaque type)
 - #60486 (Place related refactors)
 - #60513 (Remove -Z borrowck=compare flag)
 - #60516 (Remove TypeckMir)
 - #60517 (Reword casting message)
 - #60520 (Add rustfmt toml)
 - #60521 (Migrate tidy to rust 2018 edition)
 - #60527 (Fix async fn lowering ICE with APIT.)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented May 4, 2019

☔ The latest upstream changes (presumably #60537) made this pull request unmergeable. Please resolve the merge conflicts.

@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 May 4, 2019
@bors bors merged commit bacf792 into rust-lang:master May 4, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants