-
Notifications
You must be signed in to change notification settings - Fork 13.3k
rustbuild: Install rustfmt as part of extended build #45980
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
Conversation
cc @aturon @nrc - are we ready for this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This seems fine by me but we should be sure it works before it's added.
src/bootstrap/dist.rs
Outdated
@@ -1401,6 +1405,10 @@ impl Step for Extended { | |||
prepare("rls"); | |||
} | |||
|
|||
if rustfmt_installer.is_some() { | |||
prepare("rustfmt"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you tested this? I don't believe the combined installer is configured to have this work.
src/bootstrap/dist.rs
Outdated
@@ -1444,6 +1452,9 @@ impl Step for Extended { | |||
if rls_installer.is_some() { | |||
prepare("rls"); | |||
} | |||
if rustfmt_installer.is_some() { | |||
prepare("rustfmt"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Have you tested this? I don't think it will work as the combined installers aren't ready for this
(similar to other modifications below)
I'm not clear on the relationship between |
Wasn't sure if this was ready either but figured it was worth a shot as the dist part has been merged. It seems I indeed didn't test the combined installer (that's an oversight, as I tested it with I also have a patch to distribute cargo-fmt too, locally, if that's relevant @nrc . |
@bors: r+ |
📌 Commit cc3a9ba has been approved by |
☔ The latest upstream changes (presumably #46025) made this pull request unmergeable. Please resolve the merge conflicts. |
Signed-off-by: Marc-Antoine Perennou <[email protected]>
Rebased and squashed |
@bors: r+ |
📌 Commit 1930ee8 has been approved by |
rustbuild: Install rustfmt as part of extended build Now that we distribute it, this allows `./x.py install` to install it too
☀️ Test successful - status-appveyor, status-travis |
Now that we distribute it, this allows
./x.py install
to install it too