]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #60946 - Xanewok:update-rls, r=oli-obk
authorbors <bors@rust-lang.org>
Sun, 19 May 2019 11:51:34 +0000 (11:51 +0000)
committerbors <bors@rust-lang.org>
Sun, 19 May 2019 11:51:34 +0000 (11:51 +0000)
Update RLS

Includes a fix (https://github.com/rust-lang/rls/pull/1462) for breakage due to Cargo update PR (https://github.com/rust-lang/rust/pull/60874)

r? @Manishearth @oli-obk @ehuss

src/ci/docker/x86_64-gnu-tools/checkregression.py
src/tools/rls

index 8aa90319d661520bbe1657a8cce2cec6b697b8b9..0cc0a6329e5bf779060a19762329296fd935c8dd 100755 (executable)
@@ -21,12 +21,7 @@ if __name__ == '__main__':
         state = cur[os_name]
         new_state = toolstate.get(tool, '')
         if verb == 'regressed':
-            if tool == 'rls':
-                # Temporary override until
-                # https://github.com/rust-lang/rust/issues/60848 is fixed.
-                updated = False
-            else:
-                updated = new_state < state
+            updated = new_state < state
         elif verb == 'changed':
             updated = new_state != state
         else:
index 5b8e99bb61958ca8abcb7c5eda70521726be1065..9692ca8fd82a8f96a4113dc4b88c1fb1d79c1c60 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5b8e99bb61958ca8abcb7c5eda70521726be1065
+Subproject commit 9692ca8fd82a8f96a4113dc4b88c1fb1d79c1c60