about summary refs log tree commit diff
path: root/config.toml.example
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-09-13 07:21:31 +0000
committerbors <bors@rust-lang.org>2020-09-13 07:21:31 +0000
commit4e48010b95ed1021677420a9c74d8fed2ce424d4 (patch)
tree19772ae7c0cc277d07927927b4e806159f361470 /config.toml.example
parentdd33766e4a9a918058c3447d42491e874e21f7cc (diff)
parent0be66d7f30ba31638e14c00bd2303dd0327964f4 (diff)
Auto merge of #76588 - guswynn:debug_logging, r=jyn514,Mark-Simulacrum
Add a dedicated debug-logging option to config.toml

`@Mark-Simulacrum` and I were talking in zulip and we found that turning on debug/trace logging in rustc is fairly confusing, as it effectively depends on debug-assertions and is not documented as such. `@Mark-Simulacrum` mentioned that we should probably have a separate option for logging anyways.

this diff adds that, having the option follow debug-assertions (so everyone's existing config.toml should be fine) and if the option is false

to test I ran ./x.py test <something> twice, once with `debug-logging = false` and once with `debug-logging = true` and made sure i only saw trace's when it was true
Diffstat (limited to 'config.toml.example')
-rw-r--r--config.toml.example10
1 files changed, 8 insertions, 2 deletions
diff --git a/config.toml.example b/config.toml.example
index b50406a9579..39c94d41e3a 100644
--- a/config.toml.example
+++ b/config.toml.example
@@ -337,13 +337,19 @@
 # binary, otherwise they are omitted.
 #
 # Defaults to rust.debug value
-#debug-assertions = false
+#debug-assertions = debug
 
 # Whether or not debug assertions are enabled for the standard library.
 # Overrides the `debug-assertions` option, if defined.
 #
 # Defaults to rust.debug-assertions value
-#debug-assertions-std = false
+#debug-assertions-std = debug-assertions
+
+# Whether or not to leave debug! and trace! calls in the rust binary.
+# Overrides the `debug-assertions` option, if defined.
+# 
+# Defaults to rust.debug-assertions value
+#debug-logging = debug-assertions
 
 # Debuginfo level for most of Rust code, corresponds to the `-C debuginfo=N` option of `rustc`.
 # `0` - no debug info