Merge #351

351: ⬆️ salsa r=matklad a=matklad



Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>

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" }

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" }

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" }

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"