bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Bump RLS

Browse source
This commit is contained in:
Igor Matuszewski 2020-08-18 12:45:20 +02:00
parent 4717cf2fcb
commit e23f68a3d0
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Cargo.toml
View file

@ -77,12 +77,13 @@ object.debug = 0
[patch."https://github.com/rust-lang/cargo"] [patch."https://github.com/rust-lang/cargo"]
cargo = { path = "src/tools/cargo" } cargo = { path = "src/tools/cargo" }
[patch.crates-io] [patch."https://github.com/rust-lang/rustfmt"]
# Similar to Cargo above we want the RLS to use a vendored version of `rustfmt` # Similar to Cargo above we want the RLS to use a vendored version of `rustfmt`
# that we're shipping as well (to ensure that the rustfmt in RLS and the # that we're shipping as well (to ensure that the rustfmt in RLS and the
# `rustfmt` executable are the same exact version). # `rustfmt` executable are the same exact version).
rustfmt-nightly = { path = "src/tools/rustfmt" } rustfmt-nightly = { path = "src/tools/rustfmt" }
[patch.crates-io]
# See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on
# here # here
rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' }

2
src/tools/rls

@ -1 +1 @@
Subproject commit 942aa2b5d729a63f8b81592ab7b2720b63a884e9 Subproject commit 48ef96dd00b90d950a122ca180923aba77efaf74