Distribute Rustfmt #45903
Merged
Distribute Rustfmt #45903
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Keruspe
reviewed
Nov 10, 2017
src/bootstrap/dist.rs
Outdated
| // Prepare the image directory | ||
| // We expect RLS to build, because we've exited this step above if tool | ||
| // state for RLS isn't testing. | ||
| let rustfmt = builder.ensure(tool::Rls { |
There was a problem hiding this comment.
Shouldn't that be tool::Rustfmt?
src/bootstrap/dist.rs
Outdated
| compiler: builder.compiler(stage, build.build), | ||
| target | ||
| }).expect("Rustfmt to build: toolstate is testing"); | ||
| install(&rustfmt, &image.join("bin"), 0o755); |
There was a problem hiding this comment.
If I understand correctly, this will only install the rustfmt binary (and not cargo-fmt, for example), is that intentional?
There was a problem hiding this comment.
cargo fmt should be implementable as a stable tool with rustfmt distributed with rustup.
kennytm
added
the
S-waiting-on-review
src/tools/build-manifest/src/main.rs
Outdated
|
|
||
| if rls_present { | ||
| manifest.renames.insert("rls".to_owned(), Rename { to: "rls-preview".to_owned() }); | ||
| } | ||
| if rustfmt_present { |
There was a problem hiding this comment.
I think we can omit this b/c we didn't have rustfmt as a package originally, right?
|
Looks great! |
|
@alexcrichton updated to address comments |
|
@bors: r+ |
|
📌 Commit 97d21e2 has been approved by |
kennytm
added
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Nov 13, 2017
Distribute Rustfmt r? @alexcrichton
|
☀️ Test successful - status-appveyor, status-travis |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @alexcrichton