:arrow_up: salsa

diff --git a/Cargo.toml b/Cargo.toml
index f8228b98865749e2435b4d02f7abe93aa5548eae..95830561d291d8e5f8df1568f021415e2279ffef 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,10 +4,3 @@ members = [ "crates/*" ]
 [profile.release]
 incremental = true
 debug = true
-
-
-[patch.'crates-io']
-# https://github.com/salsa-rs/salsa/pull/75
-# and
-# https://github.com/salsa-rs/salsa/issues/99
-salsa = { 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 4db784538216fb40b6706ac5ad3eb337056477f1..a5d4f65ab88dfe1e8ea62efcbd7a57cbc3351eea 100644 (file)
--- a/crates/ra_analysis/Cargo.toml
+++ b/crates/ra_analysis/Cargo.toml
@@ -9,7 +9,7 @@ log = "0.4.5"
 relative-path = "0.4.0"
 rayon = "1.0.2"
 fst = "0.3.1"
-salsa = "0.8.0"
+salsa = "0.9.0"
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
 ra_syntax = { path = "../ra_syntax" }

diff --git a/crates/ra_db/Cargo.toml b/crates/ra_db/Cargo.toml
index 1fefd8025965fc38020f1e3cca2fd6f59038bc08..75bcf2b393e6571fe725f98328acd404fa402558 100644 (file)
--- a/crates/ra_db/Cargo.toml
+++ b/crates/ra_db/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
 [dependencies]
 backtrace = "0.3.1"
 relative-path = "0.4.0"
-salsa = "0.8.0"
+salsa = "0.9.0"
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
 ra_syntax = { path = "../ra_syntax" }

diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index d719d69a38739330b41a778d4c181ff796da26b2..4ec890c7301c1ffb39c75f328edb3cdbefb7d27e 100644 (file)
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Aleksey Kladov <aleksey.kladov@gmail.com>"]
 arrayvec = "0.4.10"
 log = "0.4.5"
 relative-path = "0.4.0"
-salsa = "0.8.0"
+salsa = "0.9.0"
 rustc-hash = "1.0"
 parking_lot = "0.7.0"
 id-arena = "2.0"