aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2020-07-03 15:42:33 +0100
committerGitHub <[email protected]>2020-07-03 15:42:33 +0100
commitf5a4a4b46e706697abe4bd136503ecc09aa23b61 (patch)
tree835b871eba904d6c22c38a7297239b61bb353562
parent88a602f3057a54b924f06df263ee2830510415fa (diff)
parentb6ac5952cf1cf6af8242a7b06b8ecc6ac7739b6c (diff)
Merge #5207
5207: :arrow_up: salsa r=matklad a=matklad bors r+ 🤖 Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock21
1 files changed, 4 insertions, 17 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 61ae8157a..ce88b7403 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -208,20 +208,6 @@ dependencies = [
208] 208]
209 209
210[[package]] 210[[package]]
211name = "crossbeam"
212version = "0.7.3"
213source = "registry+https://github.com/rust-lang/crates.io-index"
214checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e"
215dependencies = [
216 "cfg-if",
217 "crossbeam-channel",
218 "crossbeam-deque",
219 "crossbeam-epoch",
220 "crossbeam-queue",
221 "crossbeam-utils",
222]
223
224[[package]]
225name = "crossbeam-channel" 211name = "crossbeam-channel"
226version = "0.4.2" 212version = "0.4.2"
227source = "registry+https://github.com/rust-lang/crates.io-index" 213source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1504,12 +1490,13 @@ checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
1504 1490
1505[[package]] 1491[[package]]
1506name = "salsa" 1492name = "salsa"
1507version = "0.14.2" 1493version = "0.14.3"
1508source = "registry+https://github.com/rust-lang/crates.io-index" 1494source = "registry+https://github.com/rust-lang/crates.io-index"
1509checksum = "6a976dce155e392af3f1aa540ca23a6fc7303a7fef425cb431c464deb263eb54" 1495checksum = "4cd4f099cf7f1d6147aeb313d3fb093d2be1bf71a9fac0122d171c7593206af3"
1510dependencies = [ 1496dependencies = [
1511 "crossbeam", 1497 "crossbeam-utils",
1512 "indexmap", 1498 "indexmap",
1499 "lock_api",
1513 "log", 1500 "log",
1514 "parking_lot", 1501 "parking_lot",
1515 "rand", 1502 "rand",