Skip to content

allow rustfmt key in [build] section#67636

Merged
bors merged 2 commits intorust-lang:masterfrom
semarie:bootstrap-rustfmt
Jan 3, 2020
Merged

allow rustfmt key in [build] section#67636
bors merged 2 commits intorust-lang:masterfrom
semarie:bootstrap-rustfmt

Conversation

@semarie
Copy link
Contributor

@semarie semarie commented Dec 26, 2019

Permit using rustfmt in config.toml. It will allow to not download rustfmt binary, which is not possible for at least some tiers-3 platforms.

Fixes: #67624

r? @Mark-Simulacrum

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 26, 2019
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Dec 26, 2019

Hm, it looks like the commit just adds a field to the config struct which I would expect to not actually fix this; maybe you missed something when pushing?

@semarie
Copy link
Contributor Author

semarie commented Dec 26, 2019 •
edited
Loading

in bootstrap.py, the rustfmt() method is based on self.program_config('rustfmt'). So python code already read config.toml to get the path, and pass it in RUSTFMT env.

but rustbuild checks config.toml too, and if the option in the file is unknown, an error occurs.

by just adding the rustfmt option in struct Build, it makes rustbuild to be fine with the config.toml file.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Dec 26, 2019

Could you add a comment to that effect to the rust code? We should also document this in config.toml.example (similar to rustc/cargo bits today). Once those are done I think we can merge. Thanks!

@semarie
Copy link
Contributor Author

semarie commented Jan 2, 2020

@Mark-Simulacrum any comments on my last changes ? else I will just workaround the problem locally. currently my buildbot on OpenBSD is off due to this problem.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Jan 2, 2020

Sorry, missed the force-push I think (not sure if GH notifies on this -- I think it does sometimes, but maybe not always).

@bors r+

@bors
Copy link
Collaborator

bors commented Jan 2, 2020

📌 Commit 98d8326 has been approved by Mark-Simulacrum

@bors bors 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 Jan 2, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 2, 2020
@Dylan-DPC
Rollup merge of rust-lang#67636 - semarie:bootstrap-rustfmt, r=Mark-S…
0a06c7c 
…imulacrum

allow rustfmt key in [build] section

Permit using `rustfmt` in `config.toml`. It will allow to not download `rustfmt` binary, which is not possible for at least some tiers-3 platforms.

Fixes: rust-lang#67624

r? @Mark-Simulacrum
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jan 2, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jan 2, 2020
@Dylan-DPC
Rollup merge of rust-lang#67636 - semarie:bootstrap-rustfmt, r=Mark-S…
d6fa933 
…imulacrum

allow rustfmt key in [build] section

Permit using `rustfmt` in `config.toml`. It will allow to not download `rustfmt` binary, which is not possible for at least some tiers-3 platforms.

Fixes: rust-lang#67624

r? @Mark-Simulacrum
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jan 2, 2020
Closed
bors added a commit that referenced this pull request Jan 2, 2020
@bors
Auto merge of #67815 - Dylan-DPC:rollup-4seh8mx, r=Dylan-DPC
3636376 
Rollup of 5 pull requests

Successful merges:

 - #67636 (allow rustfmt key in [build] section)
 - #67736 (Less-than is asymmetric, not antisymmetric)
 - #67762 (Add missing links for insecure_time)
 - #67777 (Use self profile infrastructure for -Z time and -Z time-passes)
 - #67807 (Use drop instead of the toilet closure `|_| ()`)

Failed merges:

r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jan 3, 2020
@JohnTitor
Rollup merge of rust-lang#67636 - semarie:bootstrap-rustfmt, r=Mark-S…
9dd2c9e 
…imulacrum

allow rustfmt key in [build] section

Permit using `rustfmt` in `config.toml`. It will allow to not download `rustfmt` binary, which is not possible for at least some tiers-3 platforms.

Fixes: rust-lang#67624

r? @Mark-Simulacrum
@JohnTitor JohnTitor mentioned this pull request Jan 3, 2020
Merged
bors added a commit that referenced this pull request Jan 3, 2020
@bors
Auto merge of #67828 - JohnTitor:rollup-qmswkkl, r=JohnTitor
30ddb5a 
Rollup of 10 pull requests

Successful merges:

 - #67450 (Allow for setting a ThinLTO import limit during bootstrap)
 - #67595 (Suggest adding a lifetime constraint for opaque type)
 - #67636 (allow rustfmt key in [build] section)
 - #67736 (Less-than is asymmetric, not antisymmetric)
 - #67762 (Add missing links for insecure_time)
 - #67783 (Warn for bindings named same as variants when matching against a borrow)
 - #67796 (Ensure that we process projections during MIR inlining)
 - #67807 (Use drop instead of the toilet closure `|_| ()`)
 - #67816 (Clean up err codes)
 - #67825 (Minor: change take() docs grammar to match other docs)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jan 3, 2020

☔ The latest upstream changes (presumably #67828) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 3, 2020
@bors bors merged commit 98d8326 into rust-lang:master Jan 3, 2020
@semarie semarie deleted the bootstrap-rustfmt branch January 3, 2020 12:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

unable to build rust on tiers-3 platform

4 participants

@semarie @Mark-Simulacrum @bors @rust-highfive