X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=config.toml.example;h=c311c933e7edcc5eac249ff5732cf0f535122921;hb=954361a3d4f8b87a9311b5c976b7e301f6bae1bb;hp=dd322c75932ca223a3329383b91982f4c824e01d;hpb=d983873cff7467e457bb5b3904ae7c238ffc2d38;p=rust.git

diff --git a/config.toml.example b/config.toml.example
index dd322c75932..c311c933e7e 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -45,7 +45,7 @@
 # this flag will indicate that this version check should not be done.
 #version-check = true
 
-# Link libstdc++ statically into the librustc_llvm instead of relying on a
+# Link libstdc++ statically into the rustc_llvm instead of relying on a
 # dynamic version to be available.
 #static-libstdcpp = false
 
@@ -310,9 +310,8 @@
 # means "the number of cores on this machine", and 1+ is passed through to the
 # compiler.
 #
-# Defaults: the Cargo defaults, 256 with incremental and 16 without
-# https://doc.rust-lang.org/cargo/reference/profiles.html#codegen-units
-#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.
@@ -395,7 +394,7 @@
 # desired in distributions, for example.
 #rpath = true
 
-# Emits extra output from the tests to debug issues in the test harness itself.
+# 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).
@@ -432,7 +431,7 @@
 # supported platforms. The LLD from the bootstrap distribution will be used
 # and not the LLD compiled during the bootstrap.
 #
-# LLD will not be used if we're cross linking or running tests.
+# LLD will not be used if we're cross linking.
 #
 # Explicitly setting the linker for a target will override this option when targeting MSVC.
 #use-lld = false