user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #62805 - Xanewok:update-rls, r=Xanewok

Browse source 
Update RLS and Rustfmt

Supersedes https://github.com/rust-lang/rust/pull/62537.
Closes #62803.

Fixes fallout after https://github.com/rust-lang/rust/pull/62679.

r? @ghost
This commit is contained in:
bors 2019-07-30 16:59:09 +00:00
commit dddb7fca09
4 changed files with 69 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/tools/rls

@ -1 +1 @@
Subproject commit 124483dd2f10fe3ba32f7f5b75f32224c77f9010
Subproject commit 70347b5d4dfe78eeb9e6f6db85f773c8d43cd22b

1
src/tools/rustc-workspace-hack/Cargo.toml
View file

@ -64,6 +64,7 @@ features = [
[dependencies]
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.6.5", features = ["nightly"] }
parking_lot = { version = "0.7", features = ['nightly'] }
rand = { version = "0.6.1", features = ["i128_support"] }
serde = { version = "1.0.82", features = ['derive'] }

2
src/tools/rustfmt

@ -1 +1 @@
Subproject commit 66c27c9161b2aa70c2902807be12952bd4a0a62b
Subproject commit 9e960e7d6a0c6b7c46c195acbd6f92ade6eec3ba