about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-07-02 10:36:07 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-07-02 10:36:07 +0200
commit6d114399f8671d2554d006fadeb668afa6536a29 (patch)
tree93c487d465d59c7a392bdf7eaa9dbf36c312ffbe
parent0ccebdff6db5b55699fb8e7707d7bb2323cefa78 (diff)
downloadrust-6d114399f8671d2554d006fadeb668afa6536a29.tar.gz
rust-6d114399f8671d2554d006fadeb668afa6536a29.zip
Make sure clippy does not duplicate depenencies
-rw-r--r--src/Cargo.lock3
m---------src/tools/clippy10
2 files changed, 8 insertions, 5 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index dd4b09fa20d..7b5b86d39fc 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -310,17 +310,20 @@ name = "clippy"
 version = "0.0.211"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "backtrace 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "clippy-mini-macro-test 0.2.0",
  "clippy_lints 0.0.211",
  "compiletest_rs 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "num-traits 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject 63041d070b72b37c07fe3c0764f82ae3c360602
+Subproject 41972f89dcb99819191ffbf2381430e63e9d916