Skip to content

Fix formatting issues with cargo fmt #5261

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 1 commit into from
Mar 29, 2018
Merged

Fix formatting issues with cargo fmt #5261

merged 1 commit into from
Mar 29, 2018

Conversation

djc
Copy link
Contributor

@djc djc commented Mar 29, 2018

Noticed these unrelated formatting problems while working on #5258.

@matklad
Copy link
Member

matklad commented Mar 29, 2018

Hm, we run cargo fmt on CI, so I think this is how this is supposed to be formatted?

@djc how do you get rustfmt to use this other style? Perhaps you version of rustfmt differes?

@djc
Copy link
Contributor Author

djc commented Mar 29, 2018

@matklad if you look at the failures in https://travis-ci.org/rust-lang/cargo/jobs/359754442, you see that they require these changes.

@matklad
Copy link
Member

matklad commented Mar 29, 2018

@bors r+

Figured out! We've released 1.25 today, which updated rustfmt as well.

@bors
Copy link
Contributor

bors commented Mar 29, 2018

📌 Commit 5c7979c has been approved by matklad

@bors
Copy link
Contributor

bors commented Mar 29, 2018

⌛ Testing commit 5c7979c with merge 78165a2e168f6105a0bb15b592e7525713090b4b...

@matklad
Copy link
Member

matklad commented Mar 29, 2018

Thanks @djc !

@djc djc closed this Mar 29, 2018
@djc djc deleted the reformat branch March 29, 2018 18:20
@djc djc restored the reformat branch March 29, 2018 18:36
@djc djc reopened this Mar 29, 2018
@djc
Copy link
Contributor Author

djc commented Mar 29, 2018

Sorry for deleting this branch while the merge was still in progress. Does it need to be approved/triggered again to move forward?

@Eh2406
Copy link
Contributor

Eh2406 commented Mar 29, 2018

Bors failed to merge as the branch had bin deleted. @matklad can you r+ again

@matklad
Copy link
Member

matklad commented Mar 29, 2018

No worries!

@bors r+

@bors
Copy link
Contributor

bors commented Mar 29, 2018

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.

@bors
Copy link
Contributor

bors commented Mar 29, 2018

📌 Commit 5c7979c has been approved by matklad

bors added a commit that referenced this pull request Mar 29, 2018
Fix formatting issues with cargo fmt

Noticed these unrelated formatting problems while working on #5258.
@bors
Copy link
Contributor

bors commented Mar 29, 2018

⌛ Testing commit 5c7979c with merge 434c702...

@bors
Copy link
Contributor

bors commented Mar 29, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: matklad
Pushing 434c702 to master...

@bors bors merged commit 5c7979c into rust-lang:master Mar 29, 2018
@bors
Copy link
Contributor

bors commented Mar 29, 2018

💥 Test timed out

@djc djc deleted the reformat branch March 30, 2018 11:36
@ehuss ehuss added this to the 1.27.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants