From 1c939a3e5539a45b400b620e5d41a5c162b05c74 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Sat, 18 May 2019 22:54:33 +0200 Subject: [PATCH 1/2] Update RLS --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rls b/src/tools/rls index 5b8e99bb61958..9692ca8fd82a8 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 5b8e99bb61958ca8abcb7c5eda70521726be1065 +Subproject commit 9692ca8fd82a8f96a4113dc4b88c1fb1d79c1c60 From 8d419588f1ce626c37cc05780c8eb37322726fa4 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Sat, 18 May 2019 23:59:57 +0200 Subject: [PATCH 2/2] Reverse RLS toolstate check override As per https://github.com/rust-lang/rust/pull/60946#issuecomment-493707005 --- src/ci/docker/x86_64-gnu-tools/checkregression.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/ci/docker/x86_64-gnu-tools/checkregression.py b/src/ci/docker/x86_64-gnu-tools/checkregression.py index 8aa90319d6615..0cc0a6329e5bf 100755 --- a/src/ci/docker/x86_64-gnu-tools/checkregression.py +++ b/src/ci/docker/x86_64-gnu-tools/checkregression.py @@ -21,12 +21,7 @@ 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: