about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-09-09 22:17:42 +0000
committerbors <bors@rust-lang.org>2020-09-09 22:17:42 +0000
commit97eb606e4b2becd17d46a67d87169f52b210e67c (patch)
tree7a8f83e2ca64a5f2225f4476ef4a61de8e4e8a2d /config.toml.example
parente2be5f568d1f60365b825530f5b5cb722460591b (diff)
parent32714eb6bc3cbfe48774e85472ad8431fba3c7c8 (diff)
Auto merge of #76540 - tmandry:rollup-5ogt8x0, r=tmandry
Rollup of 14 pull requests

Successful merges:

 - #75094 (Add `-Z combine_cgu` flag)
 - #75984 (Improve unresolved use error message)
 - #76141 (Address review comments about config.toml from rustc-dev-guide PR)
 - #76313 (Improved the MIR spanview output)
 - #76430 (Add align to rustc-attrs unstable book)
 - #76465 (Add a script to automatically update Rust/Clang versions in documentation)
 - #76473 (Add missed spaces to GCC-WARNING.txt)
 - #76481 (Convert repetitive target_pointer_width checks to const solution.)
 - #76493 (Remove a stray ignore-tidy-undocumented-unsafe)
 - #76504 (Capitalize safety comments)
 - #76515 (SessionDiagnostic: Fix non-determinism in generated format string.)
 - #76516 (Enable GitHub Releases synchronization)
 - #76522 (remove redundant clones)
 - #76523 (Remove unused PlaceContext::NonUse(NonUseContext::Coverage))

Failed merges:

r? `@ghost`
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example6
1 files changed, 4 insertions, 2 deletions
diff --git a/config.toml.example b/config.toml.example
index 9abb8add785..be23efae529 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -309,7 +309,9 @@
 # Number of codegen units to use for each compiler invocation. A value of 0
 # means "the number of cores on this machine", and 1+ is passed through to the
 # compiler.
-#codegen-units = 1
+#
+# Uses the rustc defaults: https://doc.rust-lang.org/rustc/codegen-options/index.html#codegen-units
+#codegen-units = if incremental { 256 } else { 16 }
 
 # Sets the number of codegen units to build the standard library with,
 # regardless of what the codegen-unit setting for the rest of the compiler is.
@@ -392,7 +394,7 @@
 # desired in distributions, for example.
 #rpath = true
 
-# Emits extra output from tests so test failures are debuggable just from logfiles.
+# Prints each test name as it is executed, to help debug issues in the test harness itself.
 #verbose-tests = false
 
 # Flag indicating whether tests are compiled with optimizations (the -O flag).