about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-05-15 00:35:47 +0000
committerbors <bors@rust-lang.org>2018-05-15 00:35:47 +0000
commit308b7b05c3acfbbf5e00f16bc9cf9481ae08f4f0 (patch)
treedb84b0b30db2f26e282848fb5ea0269744c25c6f
parentac5c0848d329663f06c56f732e4414adbec978cf (diff)
parent3a5b13ad36d5cb4081c727c78e7d6fd6711108b9 (diff)
downloadrust-308b7b05c3acfbbf5e00f16bc9cf9481ae08f4f0.tar.gz
rust-308b7b05c3acfbbf5e00f16bc9cf9481ae08f4f0.zip
Auto merge of #50705 - oli-obk:clippy, r=kennytm
Update clippy

r? @Manishearth

@bors p=1
-rw-r--r--src/Cargo.lock6
m---------src/tools/clippy35
2 files changed, 22 insertions, 19 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 70a230cb7f7..2f52c889558 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -288,12 +288,12 @@ dependencies = [
 
 [[package]]
 name = "clippy"
-version = "0.0.198"
+version = "0.0.200"
 dependencies = [
  "ansi_term 0.11.0 (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.198",
+ "clippy_lints 0.0.200",
  "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)",
@@ -331,7 +331,7 @@ dependencies = [
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.198"
+version = "0.0.200"
 dependencies = [
  "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject 7a4c00c669b3bf0ffb24c7aa89a776cd48f1e2d
+Subproject c658fc8cbcd1f199edd445a49cb43139ebdc5f0