diff options
| author | bors <bors@rust-lang.org> | 2023-06-05 11:54:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-05 11:54:45 +0000 |
| commit | ed87e0a20a9d196a5ea659ea46ae9574be666d4f (patch) | |
| tree | a6c28c8e54082313681fdae39fb80124501e2c29 | |
| parent | aa9bc8612514d216f84eec218dfd19ab83f3598a (diff) | |
| parent | 768a6c5931e4674a5a80185c130199dc86fa2970 (diff) | |
| download | rust-ed87e0a20a9d196a5ea659ea46ae9574be666d4f.tar.gz rust-ed87e0a20a9d196a5ea659ea46ae9574be666d4f.zip | |
Auto merge of #14984 - lnicola:rm-test-gate, r=Veykril
Bring back sysroot-abi feature https://github.com/rust-lang/rust/pull/112305
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | crates/rust-analyzer/Cargo.toml | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 322a67383b0..e36aef6a6aa 100644 --- a/Cargo.lock +++ b/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/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml index 97bd9209206..77f02a83101 100644 --- a/crates/rust-analyzer/Cargo.toml +++ b/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"] |