Skip to content

use vendored rustfmt-nightly (src/tools/rustfmt) #52419

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
Jul 16, 2018

Conversation

semarie
Copy link
Contributor

@semarie semarie commented Jul 16, 2018

Fixes: #52029

@semarie
Copy link
Contributor Author

semarie commented Jul 16, 2018

The PR is against beta directly: nightly head has been corrected by 68620b1.

I edited Cargo.toml to change [patch.crates-io] to [patch."https://github.com/rust-lang-nursery/rustfmt"]
And run: cargo update -p rustfmt-nightly

@semarie
Copy link
Contributor Author

semarie commented Jul 16, 2018

@semarie
Copy link
Contributor Author

semarie commented Jul 16, 2018

I updated Cargo.toml comment to match the change on nightly.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 16, 2018

📌 Commit 69ee44d has been approved by Mark-Simulacrum

@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 Jul 16, 2018
@bors
Copy link
Collaborator

bors commented Jul 16, 2018

⌛ Testing commit 69ee44d with merge a7e85eb...

bors added a commit that referenced this pull request Jul 16, 2018
use vendored rustfmt-nightly (src/tools/rustfmt)

Fixes: #52029
@bors
Copy link
Collaborator

bors commented Jul 16, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: Mark-Simulacrum
Pushing a7e85eb to beta...

@bors bors merged commit 69ee44d into rust-lang:beta Jul 16, 2018
@semarie semarie deleted the beta-rustfmt branch July 16, 2018 14:19
@bugabinga
Copy link

@semarie

And run: cargo update -p rustfmt-nightly

what version of cargo was used at this point?
when I tried this myself locally, I got an error saying that the -p flag is not supported on the version I was using (which was stable 1.27.0).

@semarie
Copy link
Contributor Author

semarie commented Jul 16, 2018

it was stable too (1.27.0).

@bugabinga
Copy link

bugabinga commented Jul 16, 2018 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants