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

rustbuild: distribute cargo-fmt alongside rustfmt #46031

Merged
merged 4 commits into from
Nov 21, 2017

Conversation

Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Nov 16, 2017

Not sure whether we want that nor if it's the right way to do so, but it feels quite weird to have rustfmt without cargo-fmt. Or are there other plans wrt that?

What do you think @nrc ?

Signed-off-by: Marc-Antoine Perennou <[email protected]>
@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 16, 2017
@kennytm
Copy link
Member

kennytm commented Nov 18, 2017

r? @nrc

@nrc
Copy link
Member

nrc commented Nov 20, 2017

Thanks! Seems good to me, but r? @Mark-Simulacrum for the build system changes.

@rust-highfive rust-highfive assigned Mark-Simulacrum and unassigned nrc Nov 20, 2017
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum left a comment

Choose a reason for hiding this comment

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

Looks pretty good. I'm not too happy with the macro, but I think it's okay for now at least. We do similar things elsewhere, and until we come up with a better solution this should work.

Please fix the one comment and r=me afterwards.

let cargofmt = builder.ensure(tool::Cargofmt {
compiler: builder.compiler(stage, build.build),
target
}).expect("Rustfmt to build: toolstate is testing");
Copy link
Member

Choose a reason for hiding this comment

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

Please change the expect statement here to "cargofmt" or something like that.

@kennytm kennytm added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2017
Signed-off-by: Marc-Antoine Perennou <[email protected]>
@Keruspe
Copy link
Contributor Author

Keruspe commented Nov 20, 2017

@bors: r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Nov 20, 2017

@Keruspe: 🔑 Insufficient privileges: Not in reviewers

@Keruspe
Copy link
Contributor Author

Keruspe commented Nov 20, 2017

(I kind of expected that indeed, would have been surprised otherwise)

@Keruspe
Copy link
Contributor Author

Keruspe commented Nov 20, 2017

@kennytm not waiting on bors yet, fwiw (wrt tags)

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Nov 20, 2017

📌 Commit b29a61e has been approved by Mark-Simulacrum

@oli-obk
Copy link
Contributor

oli-obk commented Nov 20, 2017

cargo fmt could be implemented as a stable cargo installable tool, which would not require distributing it, since it would never break.

kennytm added a commit to kennytm/rust that referenced this pull request Nov 21, 2017
rustbuild: distribute cargo-fmt alongside rustfmt

Not sure whether we want that nor if it's the right way to do so, but it feels quite weird to have rustfmt without cargo-fmt. Or are there other plans wrt that?

What do you think @nrc ?
bors added a commit that referenced this pull request Nov 21, 2017
Rollup of 11 pull requests

- Successful merges: #45987, #46031, #46050, #46052, #46103, #46120, #46134, #46141, #46148, #46155, #46157
- Failed merges:
@bors bors merged commit b29a61e into rust-lang:master Nov 21, 2017
bors added a commit to rust-lang/rustup that referenced this pull request Dec 6, 2017
Add rustfmt to the tools list

r? @alexcrichton

We should probably add something for cargo-fmt too once rust-lang/rust#46031 lands, but I'm not sure if we can just add it to the list or not, seeing as it is not its own component.
bors added a commit to rust-lang/rustup that referenced this pull request Dec 6, 2017
Add rustfmt to the tools list

r? @alexcrichton

We should probably add something for cargo-fmt too once rust-lang/rust#46031 lands, but I'm not sure if we can just add it to the list or not, seeing as it is not its own component.
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.

6 participants