nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-04-29 03:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #46503 - Aaron1011:librustdoc_log, r=Mark-Simulacrum

Browse Source 
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.
This commit is contained in:
bors 2017-12-05 09:00:35 +00:00
commit a2899408dd
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Cargo.lock generated
View File

@ -2012,7 +2012,6 @@ dependencies = [
"build_helper 0.1.0", "build_helper 0.1.0",
"cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
"html-diff 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "html-diff 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "pulldown-cmark 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
] ]

1
src/librustdoc/Cargo.toml
View File

@ -11,7 +11,6 @@ path = "lib.rs"
doctest = false doctest = false
[dependencies] [dependencies]
log = "0.3"
pulldown-cmark = { version = "0.1.0", default-features = false } pulldown-cmark = { version = "0.1.0", default-features = false }
html-diff = "0.0.5" html-diff = "0.0.5"
tempdir = "0.3" tempdir = "0.3"