diff options
| author | bors <bors@rust-lang.org> | 2020-11-12 13:10:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-12 13:10:07 +0000 |
| commit | 7f5a42b073dc2bee2aa625052eb066ee07072048 (patch) | |
| tree | aa2c47a52e7b3637d4602303b4e9b7890e324da3 /compiler | |
| parent | 12f0dba618e761c987142474435dff95ab177f3c (diff) | |
| parent | cac8ac61dd3918aa771bbc97d2cb9e82901d101d (diff) | |
| download | rust-7f5a42b073dc2bee2aa625052eb066ee07072048.tar.gz rust-7f5a42b073dc2bee2aa625052eb066ee07072048.zip | |
Auto merge of #78976 - GuillaumeGomez:rollup-endkih3, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #78916 (extend const generics test suite) - #78921 (Improve the page title switch handling between search and doc) - #78933 (Don't print thread ids and names in `tracing` logs) - #78960 (Test default values for const parameters.) - #78971 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/rustc_driver/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_driver/src/lib.rs b/compiler/rustc_driver/src/lib.rs index f434673c39e..a192c2eb94e 100644 --- a/compiler/rustc_driver/src/lib.rs +++ b/compiler/rustc_driver/src/lib.rs @@ -1288,12 +1288,12 @@ pub fn init_env_logger(env: &str) { .with_indent_lines(true) .with_ansi(true) .with_targets(true) - .with_thread_ids(true) - .with_thread_names(true) .with_wraparound(10) .with_verbose_exit(true) .with_verbose_entry(true) .with_indent_amount(2); + #[cfg(parallel_compiler)] + let layer = layer.with_thread_ids(true).with_thread_names(true); use tracing_subscriber::layer::SubscriberExt; let subscriber = tracing_subscriber::Registry::default().with(filter).with(layer); |
