about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-06-10 18:24:43 +0000
committerbors <bors@rust-lang.org>2019-06-10 18:24:43 +0000
commit02564de47b40e953b5144dfd37450c16a84672f1 (patch)
treeb72b2a9fac8506730b4f23b2b7899515ad2e7f7c
parenta73ecb3d9c432f8f53117b1a6b6c209dc802dee7 (diff)
parenteb5aa7583dab0c8a78271fcc7ae41db4f27fba44 (diff)
downloadrust-02564de47b40e953b5144dfd37450c16a84672f1.tar.gz
rust-02564de47b40e953b5144dfd37450c16a84672f1.zip
Auto merge of #61694 - Xanewok:update-rls, r=kennytm
Update RLS

This includes https://github.com/rust-lang/rls/pull/1482 which should finally fix the spurious tests RLS in Rust CI (test-pass -> test-fail).

r? @oli-obk
cc @ehuss
-rw-r--r--Cargo.lock2
m---------src/tools/rls0
2 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 7f35b7344df..948074ce0fc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2263,7 +2263,7 @@ dependencies = [
 
 [[package]]
 name = "rls"
-version = "1.36.0"
+version = "1.37.0"
 dependencies = [
  "cargo 0.38.0",
  "cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/src/tools/rls b/src/tools/rls
-Subproject d1e20280dc188f542c083a738f8da3fef25af47
+Subproject 483dcbc73f9923e98c71ec9df11ee3d0d5cfb46