diff options
| author | bors <bors@rust-lang.org> | 2020-11-15 15:39:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-15 15:39:58 +0000 |
| commit | 603ab5bd6e0ffefafa7411cd8bd23a6ca82bcff0 (patch) | |
| tree | 0fc6b65c189af9ce2d674b4d86cf01f3a20f0c91 /src | |
| parent | 5fab31e5ddf5f2613bf57a0a7286dc6f5887e1cb (diff) | |
| parent | 5b9e9d018f6edf55cb2f9b4f20547b57b468e61b (diff) | |
| download | rust-603ab5bd6e0ffefafa7411cd8bd23a6ca82bcff0.tar.gz rust-603ab5bd6e0ffefafa7411cd8bd23a6ca82bcff0.zip | |
Auto merge of #79064 - ehuss:rustbook-logs, r=Mark-Simulacrum
Fix displaying errors when rustbook tests fail. This ensures that output from mdbook is displayed when running the rustbook wrapper. I believe this was a regression as a result of #69115 where it was changed from running `rustdoc` directly to using rustbook.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/rustbook/Cargo.toml | 1 | ||||
| -rw-r--r-- | src/tools/rustbook/src/main.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/rustbook/Cargo.toml b/src/tools/rustbook/Cargo.toml index f5e5c0867b4..99310157a64 100644 --- a/src/tools/rustbook/Cargo.toml +++ b/src/tools/rustbook/Cargo.toml @@ -7,6 +7,7 @@ edition = "2018" [dependencies] clap = "2.25.0" +env_logger = "0.7.1" [dependencies.mdbook] version = "0.4.3" diff --git a/src/tools/rustbook/src/main.rs b/src/tools/rustbook/src/main.rs index c87c64540ad..63d84ae9732 100644 --- a/src/tools/rustbook/src/main.rs +++ b/src/tools/rustbook/src/main.rs @@ -9,6 +9,7 @@ use mdbook::errors::Result as Result3; use mdbook::MDBook; fn main() { + env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("warn")).init(); let d_message = "-d, --dest-dir=[dest-dir] 'The output directory for your book{n}(Defaults to ./book when omitted)'"; let dir_message = "[dir] |