Merge commit 'ed87e0a20a9d196a5ea659ea46ae9574be666d4f' into sync-fro…

…m-ra
rust-lang · Jun 5, 2023 · 6c1f108 · 6c1f108
2 parents b8a7d43 + ed87e0a
commit 6c1f108
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/tools/rust-analyzer/Cargo.lock b/src/tools/rust-analyzer/Cargo.lock
@@ -1505,6 +1505,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "parking_lot_core 0.9.6",
  "proc-macro-api",
+ "proc-macro-srv-cli",
  "profile",
  "project-model",
  "rayon",

diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -68,6 +68,7 @@ ide-db.workspace = true
 ide-ssr.workspace = true
 ide.workspace = true
 proc-macro-api.workspace = true
+proc-macro-srv-cli.workspace = true
 profile.workspace = true
 project-model.workspace = true
 stdx.workspace = true
@@ -94,4 +95,5 @@ mbe.workspace = true
 [features]
 jemalloc = ["jemallocator", "profile/jemalloc"]
 force-always-assert = ["always-assert/force"]
-in-rust-tree = ["ide/in-rust-tree", "syntax/in-rust-tree"]
+sysroot-abi = ["proc-macro-srv-cli/sysroot-abi"]
+in-rust-tree = ["sysroot-abi", "ide/in-rust-tree", "syntax/in-rust-tree"]