Skip to content

Commit

Permalink
Auto merge of #46503 - Aaron1011:librustdoc_log, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Remove librustdoc dependency on log

This change should have been included in PR #46386.

Since librustdoc doesn't explicitly depend on internal crates
(such as librustc_driver) through its Cargo.toml, it ends up using the
sysroot to resolve them. By removing the dependency on 'log',
we ensure that the syroot is used to resolve `log` as well. This ensures
that only one version of log is in use, so that `env_logger::init()`
enables all uses of `log!` macros.
  • Loading branch information
bors committed Dec 5, 2017
2 parents 8921535 + f6d3900 commit a289940
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]
log = "0.3"
pulldown-cmark = { version = "0.1.0", default-features = false }
html-diff = "0.0.5"
tempdir = "0.3"
Expand Down

0 comments on commit a289940

Please sign in to comment.