user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #7304

Browse source 
7304: Depend on local copy of la-arena instead of crates.io’s r=lnicola a=arzg

This addresses [this comment](https://github.com/rust-analyzer/rust-analyzer/pull/7276#issuecomment-760909936). #7275 and #7276 should start compiling if this is merged.

Co-authored-by: Aramis Razzaghipour <aramisnoah@gmail.com>
This commit is contained in:
bors[bot] 2021-01-17 07:05:44 +00:00 • committed by GitHub
commit f5f011ba71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/hir_def/Cargo.toml
View file

@ -20,7 +20,7 @@ fst = { version = "0.4", default-features = false }
itertools = "0.10.0"
indexmap = "1.4.0"
smallvec = "1.4.0"
la-arena = "0.1.0"
la-arena = { version = "0.1.0", path = "../../lib/arena" }
stdx = { path = "../stdx", version = "0.0.0" }
base_db = { path = "../base_db", version = "0.0.0" }

2
crates/hir_expand/Cargo.toml
View file

@ -13,7 +13,7 @@ doctest = false
log = "0.4.8"
either = "1.5.3"
rustc-hash = "1.0.0"
la-arena = "0.1.0"
la-arena = { version = "0.1.0", path = "../../lib/arena" }
base_db = { path = "../base_db", version = "0.0.0" }
syntax = { path = "../syntax", version = "0.0.0" }

2
crates/hir_ty/Cargo.toml
View file

@ -20,7 +20,7 @@ scoped-tls = "1"
chalk-solve = { version = "0.47", default-features = false }
chalk-ir = "0.47"
chalk-recursive = "0.47"
la-arena = "0.1.0"
la-arena = { version = "0.1.0", path = "../../lib/arena" }
stdx = { path = "../stdx", version = "0.0.0" }
hir_def = { path = "../hir_def", version = "0.0.0" }

2
crates/profile/Cargo.toml
View file

@ -13,7 +13,7 @@ doctest = false
once_cell = "1.3.1"
cfg-if = "1"
libc = "0.2.73"
la-arena = "0.1.0"
la-arena = { version = "0.1.0", path = "../../lib/arena" }
[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "0.4"

2
crates/project_model/Cargo.toml
View file

@ -17,7 +17,7 @@ serde = { version = "1.0.106", features = ["derive"] }
serde_json = "1.0.48"
anyhow = "1.0.26"
itertools = "0.10.0"
la-arena = "0.1.0"
la-arena = { version = "0.1.0", path = "../../lib/arena" }
cfg = { path = "../cfg", version = "0.0.0" }
base_db = { path = "../base_db", version = "0.0.0" }