diff options
| author | Laurențiu Nicola <lnicola@dend.ro> | 2023-06-05 15:10:05 +0300 |
|---|---|---|
| committer | Laurențiu Nicola <lnicola@dend.ro> | 2023-06-05 15:10:05 +0300 |
| commit | 6c1f108453a1ad34d2395bcdc2a76f554712e985 (patch) | |
| tree | 6bf4957efac38cfacfdd01b57a7256d7cb6c1ca1 | |
| parent | b8a7d439db0cfd765ed4bfedd2bbaeeee58b05a5 (diff) | |
| parent | ed87e0a20a9d196a5ea659ea46ae9574be666d4f (diff) | |
| download | rust-6c1f108453a1ad34d2395bcdc2a76f554712e985.tar.gz rust-6c1f108453a1ad34d2395bcdc2a76f554712e985.zip | |
Merge commit 'ed87e0a20a9d196a5ea659ea46ae9574be666d4f' into sync-from-ra
| -rw-r--r-- | src/tools/rust-analyzer/Cargo.lock | 1 | ||||
| -rw-r--r-- | src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/tools/rust-analyzer/Cargo.lock b/src/tools/rust-analyzer/Cargo.lock index 322a67383b0..e36aef6a6aa 100644 --- 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 index 97bd9209206..77f02a83101 100644 --- 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"] |