Merge commit 'ed87e0a20a9d196a5ea659ea46ae9574be666d4f' into sync-from-ra
This commit is contained in:
parent
c48062fe2a
commit
bbd695589e
1
Cargo.lock
generated
1
Cargo.lock
generated
@ -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",
|
||||
|
@ -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"]
|
||||
|
Loading…
Reference in New Issue
Block a user