Skip to content

Commit

Permalink
Auto merge of #79064 - ehuss:rustbook-logs, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Nov 15, 2020
2 parents 5fab31e + 5b9e9d0 commit 603ab5b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3023,6 +3023,7 @@ name = "rustbook"
version = "0.1.0"
dependencies = [
"clap",
"env_logger 0.7.1",
"mdbook",
]

Expand Down
1 change: 1 addition & 0 deletions src/tools/rustbook/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ edition = "2018"

[dependencies]
clap = "2.25.0"
env_logger = "0.7.1"

[dependencies.mdbook]
version = "0.4.3"
Expand Down
1 change: 1 addition & 0 deletions src/tools/rustbook/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 603ab5b

Please sign in to comment.