Skip to content

Commit ed87e0a

Browse files
committed
Auto merge of #14984 - lnicola:rm-test-gate, r=Veykril
Bring back sysroot-abi feature rust-lang/rust#112305
2 parents aa9bc86 + 768a6c5 commit ed87e0a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/rust-analyzer/Cargo.toml

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ ide-db.workspace = true
6868
ide-ssr.workspace = true
6969
ide.workspace = true
7070
proc-macro-api.workspace = true
71+
proc-macro-srv-cli.workspace = true
7172
profile.workspace = true
7273
project-model.workspace = true
7374
stdx.workspace = true
@@ -94,4 +95,5 @@ mbe.workspace = true
9495
[features]
9596
jemalloc = ["jemallocator", "profile/jemalloc"]
9697
force-always-assert = ["always-assert/force"]
97-
in-rust-tree = ["ide/in-rust-tree", "syntax/in-rust-tree"]
98+
sysroot-abi = ["proc-macro-srv-cli/sysroot-abi"]
99+
in-rust-tree = ["sysroot-abi", "ide/in-rust-tree", "syntax/in-rust-tree"]

0 commit comments

Comments
 (0)