aboutsummaryrefslogtreecommitdiff
path: root/Cargo.lock
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-12-22 13:47:27 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-12-22 13:47:27 +0000
commit8fed875c90796b2390f5b966c3f1eca536661af1 (patch)
tree0f88728c1f25445000dd666a633e7d0235d4075e /Cargo.lock
parent5a5402d4d4ab033f0035622df880c82ea064d2c5 (diff)
parent724862a1a4da8bbb04728bd9264938c0102151c5 (diff)
Merge #323
323: workaround salsa/parking-log bug r=matklad a=matklad https://github.com/salsa-rs/salsa/issues/99 https://github.com/Amanieu/parking_lot/issues/101 Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
-rw-r--r--Cargo.lock10
1 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 1e5f00de0..5bf946b34 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -648,7 +648,7 @@ dependencies = [
648 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", 648 "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
649 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 649 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
650 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 650 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
651 "salsa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 651 "salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)",
652 "test_utils 0.1.0", 652 "test_utils 0.1.0",
653] 653]
654 654
@@ -673,7 +673,7 @@ dependencies = [
673 "ra_syntax 0.1.0", 673 "ra_syntax 0.1.0",
674 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 674 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
675 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 675 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
676 "salsa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 676 "salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)",
677 "test_utils 0.1.0", 677 "test_utils 0.1.0",
678] 678]
679 679
@@ -703,7 +703,7 @@ dependencies = [
703 "ra_syntax 0.1.0", 703 "ra_syntax 0.1.0",
704 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 704 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
705 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 705 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
706 "salsa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 706 "salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)",
707 "test_utils 0.1.0", 707 "test_utils 0.1.0",
708] 708]
709 709
@@ -995,7 +995,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
995[[package]] 995[[package]]
996name = "salsa" 996name = "salsa"
997version = "0.8.0" 997version = "0.8.0"
998source = "registry+https://github.com/rust-lang/crates.io-index" 998source = "git+https://github.com/matklad/salsa?branch=no-upgrade#1a7ae719af1601fda81186fb48bd100edd9cfb7f"
999dependencies = [ 999dependencies = [
1000 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1000 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1001 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1001 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1552,7 +1552,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1552"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 1552"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
1553"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7" 1553"checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
1554"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" 1554"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
1555"checksum salsa 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e56b13ce9b2bfaa1c89863d76880838c0734de85beeaef437fd70d4fa7e253d3" 1555"checksum salsa 0.8.0 (git+https://github.com/matklad/salsa?branch=no-upgrade)" = "<none>"
1556"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 1556"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
1557"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 1557"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
1558"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" 1558"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 03:19:54 +0000