aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-06-04 11:30:55 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-06-04 11:30:55 +0100
commitfcf30d8fa5ef965c7b741c66eb9d25a6781834cb (patch)
treeec444b67d055b2daddbc9d52976f1711bc7845f1
parentd1b9fa446a3dbfb216fcc0b07d8a2990c632df9c (diff)
parentb3b096234ae5850df8783ebc034d2e2dfbaa517a (diff)
Merge #1375
1375: switch to panic-safe salsa r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--Cargo.lock12
-rw-r--r--Cargo.toml1
2 files changed, 7 insertions, 6 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 4dbe5679d..39d7c630a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1058,7 +1058,7 @@ dependencies = [
1058 "ra_syntax 0.1.0", 1058 "ra_syntax 0.1.0",
1059 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", 1059 "relative-path 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
1060 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1060 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1061 "salsa 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", 1061 "salsa 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)",
1062 "test_utils 0.1.0", 1062 "test_utils 0.1.0",
1063] 1063]
1064 1064
@@ -1469,7 +1469,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
1469[[package]] 1469[[package]]
1470name = "salsa" 1470name = "salsa"
1471version = "0.12.1" 1471version = "0.12.1"
1472source = "registry+https://github.com/rust-lang/crates.io-index" 1472source = "git+https://github.com/matklad/salsa?branch=strong-panic-safety#fcc7058e9cbdec838a3d9e6721a0da2892fe4ce1"
1473dependencies = [ 1473dependencies = [
1474 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", 1474 "derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
1475 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", 1475 "indexmap 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1477,14 +1477,14 @@ dependencies = [
1477 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", 1477 "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1478 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", 1478 "parking_lot 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
1479 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", 1479 "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1480 "salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", 1480 "salsa-macros 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)",
1481 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)", 1481 "smallvec 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)",
1482] 1482]
1483 1483
1484[[package]] 1484[[package]]
1485name = "salsa-macros" 1485name = "salsa-macros"
1486version = "0.12.1" 1486version = "0.12.1"
1487source = "registry+https://github.com/rust-lang/crates.io-index" 1487source = "git+https://github.com/matklad/salsa?branch=strong-panic-safety#fcc7058e9cbdec838a3d9e6721a0da2892fe4ce1"
1488dependencies = [ 1488dependencies = [
1489 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", 1489 "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
1490 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", 1490 "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2126,8 +2126,8 @@ dependencies = [
2126"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" 2126"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8"
2127"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" 2127"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
2128"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" 2128"checksum ryu 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f"
2129"checksum salsa 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6ccd6297ee190727cea6f8c81771b73a79bbfc6e320496775083c44dbff67263" 2129"checksum salsa 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)" = "<none>"
2130"checksum salsa-macros 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b7f1e25ca2b995bdf032946174929d62156ffd57abd7ff88dc6f9bdeb5ac0c59" 2130"checksum salsa-macros 0.12.1 (git+https://github.com/matklad/salsa?branch=strong-panic-safety)" = "<none>"
2131"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267" 2131"checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
2132"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" 2132"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
2133"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" 2133"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d"
diff --git a/Cargo.toml b/Cargo.toml
index c5155e899..5106ea91d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,3 +6,4 @@ incremental = true
6debug = true 6debug = true
7 7
8[patch.'crates-io'] 8[patch.'crates-io']
9salsa = { git = "https://github.com/matklad/salsa", branch = "strong-panic-safety" } \ No newline at end of file