about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-08-07 13:02:57 +0000
committerbors <bors@rust-lang.org>2017-08-07 13:02:57 +0000
commite8f558543bf2c8e9c056443c144ca9c3ff98f0f3 (patch)
treebf8ea6d471acd141415807bbe70ac6ec9397642b
parent95936375a0f04cd2553885c7dcba5e60f491b2bf (diff)
parent17d5f6a0861a44c6aeebf0f7c1d007fdd94c79aa (diff)
downloadrust-e8f558543bf2c8e9c056443c144ca9c3ff98f0f3.tar.gz
rust-e8f558543bf2c8e9c056443c144ca9c3ff98f0f3.zip
Auto merge of #43706 - nrc:update-rls, r=sfackler
update rls
-rw-r--r--src/Cargo.lock6
m---------src/tools/rls0
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Cargo.lock b/src/Cargo.lock
index 38ce7850453..398b23061ea 100644
--- a/src/Cargo.lock
+++ b/src/Cargo.lock
@@ -1140,7 +1140,7 @@ dependencies = [
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "racer 2.0.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "rls-analysis 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rls-analysis 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1155,7 +1155,7 @@ dependencies = [
 
 [[package]]
 name = "rls-analysis"
-version = "0.6.0"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "derive-new 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2229,7 +2229,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
 "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
 "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
-"checksum rls-analysis 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca5b4d890953b9cc60c8c97f196921d02edf75798ccab930604aa3b4f890616d"
+"checksum rls-analysis 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d2cb40c0371765897ae428b5706bb17135705ad4f6d1b8b6afbaabcf8c9b5cff"
 "checksum rls-data 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "11d339f1888e33e74d8032de0f83c40b2bdaaaf04a8cfc03b32186c3481fb534"
 "checksum rls-span 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d7c7046dc6a92f2ae02ed302746db4382e75131b9ce20ce967259f6b5867a6a"
 "checksum rls-vfs 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ffd34691a510938bb67fe0444fb363103c73ffb31c121d1e16bc92d8945ea8ff"
diff --git a/src/tools/rls b/src/tools/rls
-Subproject cb8a5900fd3b5907b2bac07ca9832f91fed2975
+Subproject 5d4bbd9052fe2af849a7d017b85df98ad002c20