From 0c75a0ef96fead9a011aac3bd34279ee3f955a95 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 17 May 2022 10:59:26 -0400
Subject: [PATCH] Bump rls

---
 Cargo.lock    | 50 ++++++++++++++++++++++----------------------------
 Cargo.toml    |  2 ++
 src/tools/rls |  2 +-
 3 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index afe1814de6720..2f143b097b7f4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -364,7 +364,7 @@ dependencies = [
  "tar",
  "tempfile",
  "termcolor",
- "toml_edit 0.14.3",
+ "toml_edit",
  "unicode-width",
  "unicode-xid",
  "url 2.2.2",
@@ -451,7 +451,7 @@ dependencies = [
  "snapbox",
  "tar",
  "termcolor",
- "toml_edit 0.14.3",
+ "toml_edit",
  "url 2.2.2",
 ]
 
@@ -2041,15 +2041,6 @@ dependencies = [
  "unicase",
 ]
 
-[[package]]
-name = "kstring"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "kstring"
 version = "2.0.0"
@@ -3003,8 +2994,6 @@ dependencies = [
 [[package]]
 name = "racer"
 version = "2.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64954e44fc0d1dcc64e0b9f2b155249ad62849eba25354b76ae1598d1e8f0fa0"
 dependencies = [
  "bitflags",
  "clap 2.34.0",
@@ -3012,10 +3001,28 @@ dependencies = [
  "env_logger 0.7.1",
  "humantime 2.0.1",
  "lazy_static",
+ "lazycell",
  "log",
+ "racer-cargo-metadata",
  "rls-span",
 ]
 
+[[package]]
+name = "racer-cargo-metadata"
+version = "0.1.2"
+dependencies = [
+ "racer-interner",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "racer-interner"
+version = "0.1.0"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "rand"
 version = "0.7.3"
@@ -3246,7 +3253,7 @@ dependencies = [
  "tokio-stream",
  "tokio-util",
  "toml",
- "toml_edit 0.13.4",
+ "toml_edit",
  "url 2.2.2",
  "walkdir",
 ]
@@ -5320,19 +5327,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.13.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "744e9ed5b352340aa47ce033716991b5589e23781acb97cad37d4ea70560f55b"
-dependencies = [
- "combine",
- "indexmap",
- "itertools",
- "kstring 1.0.6",
- "serde",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.14.3"
@@ -5342,7 +5336,7 @@ dependencies = [
  "combine",
  "indexmap",
  "itertools",
- "kstring 2.0.0",
+ "kstring",
  "serde",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 4e78399606445..a82389492bbd8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,6 +28,8 @@ members = [
   "src/tools/cargo/crates/credential/cargo-credential-wincred",
   "src/tools/rustdoc",
   "src/tools/rls",
+  "src/tools/rls/racer/metadata",
+  "src/tools/rls/racer/interner",
   "src/tools/rustfmt",
   "src/tools/miri",
   "src/tools/miri/cargo-miri",
diff --git a/src/tools/rls b/src/tools/rls
index e6f71c9cadf9b..294e0696b8d5a 160000
--- a/src/tools/rls
+++ b/src/tools/rls
@@ -1 +1 @@
-Subproject commit e6f71c9cadf9bbd2eff21334d1d51016c7f5e19d
+Subproject commit 294e0696b8d5a06afb7cb6fd1c2c4638bbb1f148