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

Revert to only calling plain rustfmt #1204

Merged
merged 1 commit into from
Jan 1, 2018
Merged

Revert to only calling plain rustfmt #1204

merged 1 commit into from
Jan 1, 2018

Conversation

Kobata
Copy link
Contributor

@Kobata Kobata commented Jan 1, 2018

rust-lang/rustup#1294 added a proxy executable for rustfmt that will act on the correct bundled rustfmt for the default release channel set by rustup.

And, assuming I'm reading the expected release notes correctly, it seems like rust 1.23, due out fairly shortly, will add the bundled version of rustfmt to stable.

This fixes #1184

Copy link
Contributor

@emilio emilio left a comment

Choose a reason for hiding this comment

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

Looks good, thanks!

@emilio
Copy link
Contributor

emilio commented Jan 1, 2018

@bors-servo r+

@bors-servo
Copy link

📌 Commit 6e1e19e has been approved by emilio

@bors-servo
Copy link

⌛ Testing commit 6e1e19e with merge e8d5230...

bors-servo pushed a commit that referenced this pull request Jan 1, 2018
Revert to only calling plain rustfmt

rust-lang/rustup#1294 added a proxy executable for rustfmt that will act on the correct bundled rustfmt for the default release channel set by rustup.

And, assuming I'm reading the expected release notes correctly, it seems like rust 1.23, due out fairly shortly, will add the bundled version of rustfmt to stable.

This fixes #1184
@bors-servo
Copy link

☀️ Test successful - status-travis
Approved by: emilio
Pushing e8d5230 to master...

@bors-servo bors-servo merged commit 6e1e19e into rust-lang:master Jan 1, 2018
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.

Rustfmt is not run if rustup exists, but nightly toonchain/rustfmt-nightly is not installed
4 participants