mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'ed87e0a20a9d196a5ea659ea46ae9574be666d4f' into sync-from-ra

Browse Source
This commit is contained in:
Laurențiu Nicola 2023-06-05 15:10:05 +03:00
commit 6c1f108453
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/tools/rust-analyzer/Cargo.lock
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
src/tools/rust-analyzer/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"]