From e23f68a3d0fafbf8cdeb9fbc64f7376f6358d859 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Tue, 18 Aug 2020 12:45:20 +0200 Subject: [PATCH] Bump RLS --- Cargo.toml | 3 ++- src/tools/rls | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 87e958a1baf..d8d9cc399c8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -77,12 +77,13 @@ object.debug = 0 [patch."https://github.com/rust-lang/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` # that we're shipping as well (to ensure that the rustfmt in RLS and the # `rustfmt` executable are the same exact version). rustfmt-nightly = { path = "src/tools/rustfmt" } +[patch.crates-io] # See comments in `src/tools/rustc-workspace-hack/README.md` for what's going on # here rustc-workspace-hack = { path = 'src/tools/rustc-workspace-hack' } diff --git a/src/tools/rls b/src/tools/rls index 942aa2b5d72..48ef96dd00b 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit 942aa2b5d729a63f8b81592ab7b2720b63a884e9 +Subproject commit 48ef96dd00b90d950a122ca180923aba77efaf74