diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-25 16:04:48 +0100 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-25 16:04:48 +0100 |
commit | 5932bd0bb5fcd066a9d16abcd1597b7097978085 (patch) | |
tree | 7b6ea86855fe34c3d45d14262c8cf94e315566e8 /Cargo.lock | |
parent | 2cb2074c4b7219b32993abdcc7084637c0123d49 (diff) | |
parent | 363adf07b7763cfe7e13fac0ee148361d51834e4 (diff) |
Merge #162
162: Db everywhere r=matklad a=matklad
This PR continues our switch to salsa.
Now *all* state is handled by a single salsa database.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Cargo.lock b/Cargo.lock index d1a294c30..ea4275e63 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -602,12 +602,13 @@ name = "ra_analysis" | |||
602 | version = "0.1.0" | 602 | version = "0.1.0" |
603 | dependencies = [ | 603 | dependencies = [ |
604 | "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", | 604 | "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", |
605 | "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", | ||
605 | "ra_editor 0.1.0", | 606 | "ra_editor 0.1.0", |
606 | "ra_syntax 0.1.0", | 607 | "ra_syntax 0.1.0", |
607 | "rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 608 | "rayon 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
608 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 609 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
609 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 610 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
610 | "salsa 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", | 611 | "salsa 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", |
611 | "test_utils 0.1.0", | 612 | "test_utils 0.1.0", |
612 | ] | 613 | ] |
613 | 614 | ||
@@ -833,11 +834,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
833 | 834 | ||
834 | [[package]] | 835 | [[package]] |
835 | name = "salsa" | 836 | name = "salsa" |
836 | version = "0.6.0" | 837 | version = "0.6.2" |
837 | source = "registry+https://github.com/rust-lang/crates.io-index" | 838 | source = "registry+https://github.com/rust-lang/crates.io-index" |
838 | dependencies = [ | 839 | dependencies = [ |
839 | "derive-new 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", | 840 | "derive-new 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", |
840 | "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", | 841 | "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", |
842 | "lock_api 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", | ||
841 | "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", | 843 | "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", |
842 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", | 844 | "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", |
843 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 845 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1348,7 +1350,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1348 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" | 1350 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" |
1349 | "checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7" | 1351 | "checksum ryu 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7153dd96dade874ab973e098cb62fcdbb89a03682e46b144fd09550998d4a4a7" |
1350 | "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" | 1352 | "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" |
1351 | "checksum salsa 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6c8f8b59428c040fbac0f6a2e698ae892e33d23d7519713ba8b243edb3082dad" | 1353 | "checksum salsa 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ba7fe802c02c7b0074b0b4794442d73e3c7d071967300a98bb0f5dfc25e9f1ef" |
1352 | "checksum same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f7794e2fda7f594866840e95f5c5962e886e228e68b6505885811a94dd728c" | 1354 | "checksum same-file 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "10f7794e2fda7f594866840e95f5c5962e886e228e68b6505885811a94dd728c" |
1353 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" | 1355 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" |
1354 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" | 1356 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" |