From 13631a2955cd8fbd400b3a4b7fbf884ee3fbdc47 Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Fri, 28 Dec 2018 19:10:31 +0300 Subject: :arrow_up: salsa --- Cargo.toml | 7 ------- crates/ra_analysis/Cargo.toml | 2 +- crates/ra_db/Cargo.toml | 2 +- crates/ra_hir/Cargo.toml | 2 +- 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/*" ] [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 4db784538..a5d4f65ab 100644 --- 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 1fefd8025..75bcf2b39 100644 --- a/crates/ra_db/Cargo.toml +++ b/crates/ra_db/Cargo.toml @@ -7,7 +7,7 @@ authors = ["Aleksey Kladov "] [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 d719d69a3..4ec890c73 100644 --- a/crates/ra_hir/Cargo.toml +++ b/crates/ra_hir/Cargo.toml @@ -8,7 +8,7 @@ authors = ["Aleksey Kladov "] 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" -- cgit v1.2.3