diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-01-17 07:05:44 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-01-17 07:05:44 +0000 |
commit | f5f011ba714589d65b7dae398938242abcbc3fee (patch) | |
tree | 1f5b475eea0854d50899bf3a74fc71f9370a9f87 /Cargo.lock | |
parent | 0976a1ec8ad72df333f746439e26b139ea5ae3e2 (diff) | |
parent | 709034d123c78c607a60b098c6f576414d4df451 (diff) |
Merge #7304
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 <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index 0c6e9ff61..76d64cb14 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -552,7 +552,7 @@ dependencies = [ | |||
552 | "hir_expand", | 552 | "hir_expand", |
553 | "indexmap", | 553 | "indexmap", |
554 | "itertools 0.10.0", | 554 | "itertools 0.10.0", |
555 | "la-arena 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 555 | "la-arena", |
556 | "log", | 556 | "log", |
557 | "mbe", | 557 | "mbe", |
558 | "once_cell", | 558 | "once_cell", |
@@ -571,7 +571,7 @@ version = "0.0.0" | |||
571 | dependencies = [ | 571 | dependencies = [ |
572 | "base_db", | 572 | "base_db", |
573 | "either", | 573 | "either", |
574 | "la-arena 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 574 | "la-arena", |
575 | "log", | 575 | "log", |
576 | "mbe", | 576 | "mbe", |
577 | "parser", | 577 | "parser", |
@@ -596,7 +596,7 @@ dependencies = [ | |||
596 | "hir_def", | 596 | "hir_def", |
597 | "hir_expand", | 597 | "hir_expand", |
598 | "itertools 0.10.0", | 598 | "itertools 0.10.0", |
599 | "la-arena 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 599 | "la-arena", |
600 | "log", | 600 | "log", |
601 | "once_cell", | 601 | "once_cell", |
602 | "profile", | 602 | "profile", |
@@ -772,12 +772,6 @@ name = "la-arena" | |||
772 | version = "0.1.1" | 772 | version = "0.1.1" |
773 | 773 | ||
774 | [[package]] | 774 | [[package]] |
775 | name = "la-arena" | ||
776 | version = "0.1.1" | ||
777 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
778 | checksum = "383ed2a74426d1051751f6483a7160b98f36068224857cd4c953b34719476fc3" | ||
779 | |||
780 | [[package]] | ||
781 | name = "lazy_static" | 775 | name = "lazy_static" |
782 | version = "1.4.0" | 776 | version = "1.4.0" |
783 | source = "registry+https://github.com/rust-lang/crates.io-index" | 777 | source = "registry+https://github.com/rust-lang/crates.io-index" |
@@ -1212,7 +1206,7 @@ name = "profile" | |||
1212 | version = "0.0.0" | 1206 | version = "0.0.0" |
1213 | dependencies = [ | 1207 | dependencies = [ |
1214 | "cfg-if 1.0.0", | 1208 | "cfg-if 1.0.0", |
1215 | "la-arena 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1209 | "la-arena", |
1216 | "libc", | 1210 | "libc", |
1217 | "once_cell", | 1211 | "once_cell", |
1218 | "perf-event", | 1212 | "perf-event", |
@@ -1227,7 +1221,7 @@ dependencies = [ | |||
1227 | "cargo_metadata", | 1221 | "cargo_metadata", |
1228 | "cfg", | 1222 | "cfg", |
1229 | "itertools 0.10.0", | 1223 | "itertools 0.10.0", |
1230 | "la-arena 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1224 | "la-arena", |
1231 | "log", | 1225 | "log", |
1232 | "paths", | 1226 | "paths", |
1233 | "proc_macro_api", | 1227 | "proc_macro_api", |