Skip to content

Commit

Permalink
Auto merge of #43485 - nrc:rls-env-fix, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history 
Update RLS

This pulls in rust-lang/rls@79d659e It should fix #43453. It increases the timeout for test runs and forces builds in RLS tests to happen sequentially, this prevents interference between env vars passed to Cargo or rustc.

r? @Mark-Simulacrum
  • Loading branch information
@bors
bors committed Jul 26, 2017
2 parents bad58f2 + b23c83e commit 2fc3aec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions src/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated from 7799d0 to 79d659

0 comments on commit 2fc3aec

Please sign in to comment.