diff options
| author | bors <bors@rust-lang.org> | 2017-12-05 09:00:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-05 09:00:35 +0000 |
| commit | a2899408dd162bfe349e7ff8bceaee60b34e77cc (patch) | |
| tree | b25a7a857a62abf04e9846d663d49a007fabc3d1 /src | |
| parent | 892153528926c9d6e81d0610006d9c0e2a4f96b0 (diff) | |
| parent | f6d3900642e53ec914b85684dd1ddc2643c09c7f (diff) | |
| download | rust-a2899408dd162bfe349e7ff8bceaee60b34e77cc.tar.gz rust-a2899408dd162bfe349e7ff8bceaee60b34e77cc.zip | |
Auto merge of #46503 - Aaron1011:librustdoc_log, r=Mark-Simulacrum
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Cargo.lock | 1 | ||||
| -rw-r--r-- | src/librustdoc/Cargo.toml | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock index dc15486fe7c..9313d264c1b 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -2012,7 +2012,6 @@ dependencies = [ "build_helper 0.1.0", "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)", - "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)", "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index fd8a6e0b593..1e574964b12 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -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" |