Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 3636376

Browse files
committedJan 2, 2020
Auto merge of #67815 - Dylan-DPC:rollup-4seh8mx, r=Dylan-DPC
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
2 parents 0a58f58 + 061d200 commit 3636376

File tree

53 files changed

+516
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+516
-514
lines changed
 

‎config.toml.example

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@
138138
# specified, use this rustc binary instead as the stage0 snapshot compiler.
139139
#rustc = "/path/to/bin/rustc"
140140

141+
# Instead of download the src/stage0.txt version of rustfmt specified,
142+
# use this rustfmt binary instead as the stage0 snapshot rustfmt.
143+
#rustfmt = "/path/to/bin/rustfmt"
144+
141145
# Flag to specify whether any documentation is built. If false, rustdoc and
142146
# friends will still be compiled but they will not be used to generate any
143147
# documentation.

‎src/bootstrap/config.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ struct Build {
202202
target: Vec<String>,
203203
cargo: Option<String>,
204204
rustc: Option<String>,
205+
rustfmt: Option<String>, /* allow bootstrap.py to use rustfmt key */
205206
docs: Option<bool>,
206207
compiler_docs: Option<bool>,
207208
submodules: Option<bool>,

0 commit comments

Comments
 (0)
Please sign in to comment.