about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-11 18:58:17 +0000
committerbors <bors@rust-lang.org>2018-04-11 18:58:17 +0000
commitad610bed83f43158892222a71336bdcaa167909a (patch)
tree08229456a624575f47f8b10c3a4f2272ae66d069 /src
parent32428808b4c05c938c36ad6bd65bfbd658eb624f (diff)
parent3b04823dc12ab0a3c50e57b3ad813d7496a53774 (diff)
Auto merge of #49872 - oli-obk:clippy, r=Manishearth
Update clippy and rls

r? @Manishearth
Diffstat (limited to 'src')
-rw-r--r--src/Cargo.lock8
m---------src/tools/clippy28
m---------src/tools/rls0
3 files changed, 18 insertions, 18 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index e7896d247b4..a60679e417a 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -286,11 +286,11 @@ dependencies = [
 
 [[package]]
 name = "clippy"
-version = "0.0.191"
+version = "0.0.193"
 dependencies = [
  "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.191",
+ "clippy_lints 0.0.193",
  "compiletest_rs 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "derive-new 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -306,7 +306,7 @@ version = "0.2.0"
 
 [[package]]
 name = "clippy_lints"
-version = "0.0.191"
+version = "0.0.193"
 dependencies = [
  "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1579,7 +1579,7 @@ version = "0.126.0"
 dependencies = [
  "cargo 0.27.0",
  "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "clippy_lints 0.0.191",
+ "clippy_lints 0.0.193",
  "env_logger 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/clippy b/src/tools/clippy
-Subproject b45801ff192e6f1bd3504c05e612a1004f52a24
+Subproject 8ec61a613ad1278b18a4770332b6da128704fdd
diff --git a/src/tools/rls b/src/tools/rls
-Subproject b17d799d1302fd643a3dd19280f64c8ad162a4a
+Subproject faccf0d07cad4c84da20c5c0102a450fca9d0b6