Auto merge of #77412 - Mark-Simulacrum:rls-fix, r=Xanewok · rust-lang-ci/rust@66936de

Commit

Auto merge of rust-lang#77412 - Mark-Simulacrum:rls-fix, r=Xanewok

Update rls

Includes rust-lang/rls#1700, just fixing compilation and test failures.

Fixes rust-lang#77311.

bors committed Oct 1, 2020

2 parents 8fe73e8 + 9a3b9b4 commit 66936de

+5 −3		rls-rustc/src/lib.rs
+1 −0		rls/src/build/rustc.rs
+1 −6		tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json
+1 −6		tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json