Bump rls

rust-lang · May 17, 2022 · 0c75a0e · 0c75a0e
1 parent bf7bea4
commit 0c75a0e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 29 deletions.
diff --git 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,19 +2994,35 @@ 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",
  "derive_more",
  "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
@@ -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
+129 −102		Cargo.lock
+5 −5		Cargo.toml
+49 −0		racer/.github/workflows/ci.yml
+9 −0		racer/.gitignore
+0 −0		racer/.rustfmt.toml
+235 −0		racer/CHANGELOG.md
+39 −0		racer/Cargo.toml
+25 −0		racer/LICENSE-MIT
+137 −0		racer/README.md
+1 −0		racer/fixtures/.cargo/config
+6 −0		racer/fixtures/arst/Cargo.toml
+6 −0		racer/fixtures/arst/src/lib.rs
+3 −0		racer/fixtures/arst/src/submodule/mod.rs
+12 −0		racer/interner/Cargo.toml
+100 −0		racer/interner/src/lib.rs
+21 −0		racer/metadata/Cargo.toml
+93 −0		racer/metadata/src/lib.rs
+139 −0		racer/metadata/src/mapping.rs
+77 −0		racer/metadata/src/metadata.rs
+3 −0		racer/rust-toolchain.toml
+1,372 −0		racer/src/racer/ast.rs
+1,068 −0		racer/src/racer/ast_types.rs
+63 −0		racer/src/racer/benches.rs
+460 −0		racer/src/racer/codecleaner.rs
+367 −0		racer/src/racer/codeiter.rs
+1,414 −0		racer/src/racer/core.rs
+106 −0		racer/src/racer/fileres.rs
+60 −0		racer/src/racer/lib.rs
+914 −0		racer/src/racer/matchers.rs
+125 −0		racer/src/racer/metadata.rs
+2,749 −0		racer/src/racer/nameres.rs
+231 −0		racer/src/racer/primitive.rs
+19 −0		racer/src/racer/project_model.rs
+903 −0		racer/src/racer/scopes.rs
+123 −0		racer/src/racer/snippets.rs
+21 −0		racer/src/racer/testutils.rs
+630 −0		racer/src/racer/typeinf.rs
+856 −0		racer/src/racer/util.rs
+2 −0		rls-ipc/src/rpc.rs
+1 −0		rls-rustc/src/lib.rs
+1 −0		rls/src/actions/requests.rs
+54 −17		rls/src/build/cargo.rs
+3 −5		rls/src/build/external.rs
+1 −0		rls/src/build/ipc.rs
+4 −3		rls/src/build/plan.rs
+1 −0		rls/src/build/rustc.rs
+1 −1		rust-toolchain