bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #14984 - lnicola:rm-test-gate, r=Veykril

Browse source 
Bring back sysroot-abi feature

https://github.com/rust-lang/rust/pull/112305
This commit is contained in:
bors 2023-06-05 11:54:45 +00:00
commit ed87e0a20a
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1505,6 +1505,7 @@ dependencies = [
"parking_lot 0.12.1", "parking_lot 0.12.1",
"parking_lot_core 0.9.6", "parking_lot_core 0.9.6",
"proc-macro-api", "proc-macro-api",
"proc-macro-srv-cli",
"profile", "profile",
"project-model", "project-model",
"rayon", "rayon",

4
crates/rust-analyzer/Cargo.toml
View file

@ -68,6 +68,7 @@ ide-db.workspace = true
ide-ssr.workspace = true ide-ssr.workspace = true
ide.workspace = true ide.workspace = true
proc-macro-api.workspace = true proc-macro-api.workspace = true
proc-macro-srv-cli.workspace = true
profile.workspace = true profile.workspace = true
project-model.workspace = true project-model.workspace = true
stdx.workspace = true stdx.workspace = true
@ -94,4 +95,5 @@ mbe.workspace = true
[features] [features]
jemalloc = ["jemallocator", "profile/jemalloc"] jemalloc = ["jemallocator", "profile/jemalloc"]
force-always-assert = ["always-assert/force"] 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"]