diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 12:34:10 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-25 12:34:10 +0000 |
commit | 021e691997efc35c983808ee3470a060a3ec3e96 (patch) | |
tree | a3f49352542d3c6803e318cd2f155cc4543062c5 /Cargo.lock | |
parent | 04ce89313369a1606b057b3be1368d72b8a5cd63 (diff) | |
parent | 08c12e424d5d3fb4e11f081a07b9c265dc7a96b6 (diff) |
Merge #639
639: Update salsa r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r-- | Cargo.lock | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock index 55ac3e7de..bfa0bf2ed 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
@@ -726,7 +726,7 @@ dependencies = [ | |||
726 | "ra_syntax 0.1.0", | 726 | "ra_syntax 0.1.0", |
727 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 727 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
728 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 728 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
729 | "salsa 0.10.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", | 729 | "salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", |
730 | "test_utils 0.1.0", | 730 | "test_utils 0.1.0", |
731 | ] | 731 | ] |
732 | 732 | ||
@@ -746,6 +746,7 @@ dependencies = [ | |||
746 | "ra_syntax 0.1.0", | 746 | "ra_syntax 0.1.0", |
747 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 747 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
748 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 748 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
749 | "salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
749 | "test_utils 0.1.0", | 750 | "test_utils 0.1.0", |
750 | ] | 751 | ] |
751 | 752 | ||
@@ -766,6 +767,7 @@ dependencies = [ | |||
766 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", | 767 | "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", |
767 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", | 768 | "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", |
768 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 769 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
770 | "salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", | ||
769 | "test_utils 0.1.0", | 771 | "test_utils 0.1.0", |
770 | "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 772 | "unicase 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
771 | ] | 773 | ] |
@@ -1088,7 +1090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" | |||
1088 | 1090 | ||
1089 | [[package]] | 1091 | [[package]] |
1090 | name = "salsa" | 1092 | name = "salsa" |
1091 | version = "0.10.0-alpha1" | 1093 | version = "0.10.0-alpha3" |
1092 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1094 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1093 | dependencies = [ | 1095 | dependencies = [ |
1094 | "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1096 | "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1097,13 +1099,13 @@ dependencies = [ | |||
1097 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", | 1099 | "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", |
1098 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1100 | "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1099 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1101 | "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", |
1100 | "salsa-macros 0.10.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)", | 1102 | "salsa-macros 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)", |
1101 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", | 1103 | "smallvec 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", |
1102 | ] | 1104 | ] |
1103 | 1105 | ||
1104 | [[package]] | 1106 | [[package]] |
1105 | name = "salsa-macros" | 1107 | name = "salsa-macros" |
1106 | version = "0.10.0-alpha1" | 1108 | version = "0.10.0-alpha3" |
1107 | source = "registry+https://github.com/rust-lang/crates.io-index" | 1109 | source = "registry+https://github.com/rust-lang/crates.io-index" |
1108 | dependencies = [ | 1110 | dependencies = [ |
1109 | "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", | 1111 | "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", |
@@ -1694,8 +1696,8 @@ dependencies = [ | |||
1694 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" | 1696 | "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" |
1695 | "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" | 1697 | "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c" |
1696 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" | 1698 | "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" |
1697 | "checksum salsa 0.10.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)" = "4cc048429df53bf0720b93cfa5fa8c3fc3dc7dd65ab41b3f754a8870e7b5c834" | 1699 | "checksum salsa 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)" = "135c0977b23f8a9dc16744dd5495989110e3763ba5ea41e386741c7f8901e285" |
1698 | "checksum salsa-macros 0.10.0-alpha1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d5a1aeb618da4b1a00d2885d045154ac30deb04109f3ce73c1fd789caba4fb1" | 1700 | "checksum salsa-macros 0.10.0-alpha3 (registry+https://github.com/rust-lang/crates.io-index)" = "c9c93b5efed7281334c4bed8470b278076d1ccd6a60da59a15cd0d57792afff8" |
1699 | "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" | 1701 | "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" |
1700 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" | 1702 | "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" |
1701 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" | 1703 | "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" |