about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAaron Hill <aa1ronham@gmail.com>2017-11-29 18:10:42 -0500
committerAaron Hill <aa1ronham@gmail.com>2017-11-29 18:10:42 -0500
commit21228a82b05a759456a6f121a0b6ef85e39ab19f (patch)
treef93886dd4cd68ea8bd88676a916bd4c0235861d9
parent0a2e9ade83ff253bb489c63a95b1f499c5e0916f (diff)
downloadrust-21228a82b05a759456a6f121a0b6ef85e39ab19f.tar.gz
rust-21228a82b05a759456a6f121a0b6ef85e39ab19f.zip
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.lock1
-rw-r--r--src/librustdoc/Cargo.toml1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index e5e9775a924..a809721cf90 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1966,7 +1966,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"