Skip to content

Commit

Permalink
Rollup merge of rust-lang#46386 - Aaron1011:fix_rustdoc_log, r=Mark-S…
Browse files Browse the repository at this point in the history
…imulacrum

Remove librustdoc dependency on env_logger

We want librustdoc to pickup the env_logger dependency from
the sysroot. This ensures that the same copy of env_logger is used
for both internal crates (e.g. librustc_driver, libsyntax) and
librustdoc

Closes rust-lang#46383
  • Loading branch information
kennytm authored Dec 1, 2017
2 parents 2341f6c + 21228a8 commit ae24366
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion src/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/librustdoc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ path = "lib.rs"
doctest = false

[dependencies]
env_logger = { version = "0.4", default-features = false }
log = "0.3"
pulldown-cmark = { version = "0.1.0", default-features = false }
html-diff = "0.0.5"
Expand Down

0 comments on commit ae24366

Please sign in to comment.