about summary refs log tree commit diff
diff options
context:
space:
mode:
authorIgor Matuszewski <xanewok@gmail.com>2020-08-18 12:45:20 +0200
committerIgor Matuszewski <xanewok@gmail.com>2020-08-18 13:02:03 +0200
commite23f68a3d0fafbf8cdeb9fbc64f7376f6358d859 (patch)
tree9957aaf43fb5dc4102b8bd8c4e82cbd4b5d6d1d6
parent4717cf2fcbde585d81c47417b1fb921572a3c537 (diff)
downloadrust-e23f68a3d0fafbf8cdeb9fbc64f7376f6358d859.tar.gz
rust-e23f68a3d0fafbf8cdeb9fbc64f7376f6358d859.zip
Bump RLS
-rw-r--r--Cargo.toml3
m---------src/tools/rls0
2 files changed, 2 insertions, 1 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
-Subproject 942aa2b5d729a63f8b81592ab7b2720b63a884e
+Subproject 48ef96dd00b90d950a122ca180923aba77efaf7