about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-10-04 14:08:12 +0000
committerbors <bors@rust-lang.org>2018-10-04 14:08:12 +0000
commit5de52817c43fcb767ab3c7ecf051872cad6d0df2 (patch)
treeb17d9c616e71b3b02cb3808f0c30e6fc8777fcc2
parent5472b0718f286266ab89acdf234c3552de7e973c (diff)
parentb0643add6daefa678b75ebdb0753772612fdd350 (diff)
downloadrust-5de52817c43fcb767ab3c7ecf051872cad6d0df2.tar.gz
rust-5de52817c43fcb767ab3c7ecf051872cad6d0df2.zip
Auto merge of #54784 - Manishearth:clippyup, r=oli-obk
Update clippy

None
-rw-r--r--src/Cargo.lock2
m---------src/tools/clippy28
-rw-r--r--src/tools/rustc-workspace-hack/Cargo.toml8
3 files changed, 24 insertions, 14 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 926016e5f02..5d9f8465047 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -2074,6 +2074,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "rustc-workspace-hack"
 version = "1.0.0"
 dependencies = [
+ "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 0.14.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject e69fe2fb19b7b2f3b07fe1178c536810dabf896
+Subproject c47b9489ab4f2124e2e93a3b1ec8a2eeafe54cf
diff --git a/src/tools/rustc-workspace-hack/Cargo.toml b/src/tools/rustc-workspace-hack/Cargo.toml
index 755b172dd1b..77ffe41d7f6 100644
--- a/src/tools/rustc-workspace-hack/Cargo.toml
+++ b/src/tools/rustc-workspace-hack/Cargo.toml
@@ -47,3 +47,11 @@ features = [
   "wincon",
   "wincrypt",
 ]
+
+[dependencies.serde_json]
+version = "1.0.31"
+features = ["raw_value"]
+
+[dependencies.rand]
+version = "0.5.5"
+features = ["i128_support"]