Skip to content

Commit

Permalink
Auto merge of #60946 - Xanewok:update-rls, r=oli-obk
Browse files Browse the repository at this point in the history
Update RLS

Includes a fix (rust-lang/rls#1462) for breakage due to Cargo update PR (#60874)

r? @Manishearth @oli-obk @ehuss
  • Loading branch information
bors committed May 19, 2019
2 parents ce41e48 + 8d41958 commit e7591c1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
7 changes: 1 addition & 6 deletions src/ci/docker/x86_64-gnu-tools/checkregression.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 5b8e99 to 9692ca

0 comments on commit e7591c1

Please sign in to comment.