about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-09-10 08:31:53 +0000
committerbors <bors@rust-lang.org>2019-09-10 08:31:53 +0000
commit403c0def905c58f08e5a1ce48a430522df01abf1 (patch)
tree6c6c1bc068a657618d45c68c544d51ee46ce4743 /src
parent61dced18277a8cd55c963502db5a4cdf837858f3 (diff)
parent007a58d4ce01f945426f240d387f69dfe3198a6b (diff)
downloadrust-403c0def905c58f08e5a1ce48a430522df01abf1.tar.gz
rust-403c0def905c58f08e5a1ce48a430522df01abf1.zip
Auto merge of #64329 - Mark-Simulacrum:rustdoc-log, r=GuillaumeGomez
Switch rustdoc logging to RUSTDOC_LOG

This better aligns with Cargo (CARGO_LOG) and rustc (RUSTC_LOG).

Fixes https://github.com/rust-lang/rust/issues/64309

r? @GuillaumeGomez
Diffstat (limited to 'src')
-rw-r--r--src/librustdoc/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 25ee8b4273d..2f6f63dcc8d 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -90,7 +90,7 @@ pub fn main() {
         32_000_000 // 32MB on other platforms
     };
     rustc_driver::set_sigpipe_handler();
-    env_logger::init();
+    env_logger::init_from_env("RUSTDOC_LOG");
     let res = std::thread::Builder::new().stack_size(thread_stack_size).spawn(move || {
         get_args().map(|args| main_args(&args)).unwrap_or(1)
     }).unwrap().join().unwrap_or(rustc_driver::EXIT_FAILURE);