aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2018-12-28 16:10:31 +0000
committerAleksey Kladov <[email protected]>2018-12-28 16:10:31 +0000
commit13631a2955cd8fbd400b3a4b7fbf884ee3fbdc47 (patch)
treeb620995eb82282fef1f35b54fc3c9abce7c37b12
parent161054a616835ff5eebbc6692c8795c049b8b0d7 (diff)
:arrow_up: salsa
-rw-r--r--Cargo.toml7
-rw-r--r--crates/ra_analysis/Cargo.toml2
-rw-r--r--crates/ra_db/Cargo.toml2
-rw-r--r--crates/ra_hir/Cargo.toml2
4 files changed, 3 insertions, 10 deletions
diff --git a/Cargo.toml b/Cargo.toml
index f8228b988..95830561d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,10 +4,3 @@ members = [ "crates/*" ]
4[profile.release] 4[profile.release]
5incremental = true 5incremental = true
6debug = true 6debug = true
7
8
9[patch.'crates-io']
10# https://github.com/salsa-rs/salsa/pull/75
11# and
12# https://github.com/salsa-rs/salsa/issues/99
13salsa = { git = "https://github.com/matklad/salsa", branch = "fix-cancelation-maybe" }
diff --git a/crates/ra_analysis/Cargo.toml b/crates/ra_analysis/Cargo.toml
index 4db784538..a5d4f65ab 100644
--- a/crates/ra_analysis/Cargo.toml
+++ b/crates/ra_analysis/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.4.5"
9relative-path = "0.4.0" 9relative-path = "0.4.0"
10rayon = "1.0.2" 10rayon = "1.0.2"
11fst = "0.3.1" 11fst = "0.3.1"
12salsa = "0.8.0" 12salsa = "0.9.0"
13rustc-hash = "1.0" 13rustc-hash = "1.0"
14parking_lot = "0.7.0" 14parking_lot = "0.7.0"
15ra_syntax = { path = "../ra_syntax" } 15ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 1fefd8025..75bcf2b39 100644
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
7[dependencies] 7[dependencies]
8backtrace = "0.3.1" 8backtrace = "0.3.1"
9relative-path = "0.4.0" 9relative-path = "0.4.0"
10salsa = "0.8.0" 10salsa = "0.9.0"
11rustc-hash = "1.0" 11rustc-hash = "1.0"
12parking_lot = "0.7.0" 12parking_lot = "0.7.0"
13ra_syntax = { path = "../ra_syntax" } 13ra_syntax = { path = "../ra_syntax" }
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index d719d69a3..4ec890c73 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Aleksey Kladov <[email protected]>"]
8arrayvec = "0.4.10" 8arrayvec = "0.4.10"
9log = "0.4.5" 9log = "0.4.5"
10relative-path = "0.4.0" 10relative-path = "0.4.0"
11salsa = "0.8.0" 11salsa = "0.9.0"
12rustc-hash = "1.0" 12rustc-hash = "1.0"
13parking_lot = "0.7.0" 13parking_lot = "0.7.0"
14id-arena = "2.0" 14id-arena = "2.0"