diff options
| author | kennytm <kennytm@gmail.com> | 2017-12-02 01:38:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-02 01:38:57 +0800 |
| commit | ae243662511cf35b4d3e0053ba2515483ce8ccaa (patch) | |
| tree | d2721b449228293ef54657178c2e041e1d2116b4 | |
| parent | 2341f6c4e5b62b465c4f19831e3b34d7544df896 (diff) | |
| parent | 21228a82b05a759456a6f121a0b6ef85e39ab19f (diff) | |
| download | rust-ae243662511cf35b4d3e0053ba2515483ce8ccaa.tar.gz rust-ae243662511cf35b4d3e0053ba2515483ce8ccaa.zip | |
Rollup merge of #46386 - Aaron1011:fix_rustdoc_log, r=Mark-Simulacrum
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 #46383
| -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 e877aedd170..9987850e683 100644 --- a/src/Cargo.lock +++ b/src/Cargo.lock @@ -2014,7 +2014,6 @@ version = "0.0.0" dependencies = [ "build_helper 0.1.0", "cc 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "env_logger 0.4.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)", diff --git a/src/librustdoc/Cargo.toml b/src/librustdoc/Cargo.toml index 55d2df5f28b..eca3ebe9130 100644 --- a/src/librustdoc/Cargo.toml +++ b/src/librustdoc/Cargo.toml @@ -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" |