diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 16:11:45 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-28 16:11:45 +0000 |
commit | 9d6740a9c9ad2ca47c4885bd994f849e90bbef86 (patch) | |
tree | b620995eb82282fef1f35b54fc3c9abce7c37b12 | |
parent | 161054a616835ff5eebbc6692c8795c049b8b0d7 (diff) | |
parent | 13631a2955cd8fbd400b3a4b7fbf884ee3fbdc47 (diff) |
Merge #351
351: :arrow_up: salsa r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | Cargo.toml | 7 | ||||
-rw-r--r-- | crates/ra_analysis/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_db/Cargo.toml | 2 | ||||
-rw-r--r-- | 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/*" ] | |||
4 | [profile.release] | 4 | [profile.release] |
5 | incremental = true | 5 | incremental = true |
6 | debug = true | 6 | debug = 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 | ||
13 | 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" | |||
9 | relative-path = "0.4.0" | 9 | relative-path = "0.4.0" |
10 | rayon = "1.0.2" | 10 | rayon = "1.0.2" |
11 | fst = "0.3.1" | 11 | fst = "0.3.1" |
12 | salsa = "0.8.0" | 12 | salsa = "0.9.0" |
13 | rustc-hash = "1.0" | 13 | rustc-hash = "1.0" |
14 | parking_lot = "0.7.0" | 14 | parking_lot = "0.7.0" |
15 | ra_syntax = { path = "../ra_syntax" } | 15 | 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 <[email protected]>"] | |||
7 | [dependencies] | 7 | [dependencies] |
8 | backtrace = "0.3.1" | 8 | backtrace = "0.3.1" |
9 | relative-path = "0.4.0" | 9 | relative-path = "0.4.0" |
10 | salsa = "0.8.0" | 10 | salsa = "0.9.0" |
11 | rustc-hash = "1.0" | 11 | rustc-hash = "1.0" |
12 | parking_lot = "0.7.0" | 12 | parking_lot = "0.7.0" |
13 | ra_syntax = { path = "../ra_syntax" } | 13 | 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 <[email protected]>"] | |||
8 | arrayvec = "0.4.10" | 8 | arrayvec = "0.4.10" |
9 | log = "0.4.5" | 9 | log = "0.4.5" |
10 | relative-path = "0.4.0" | 10 | relative-path = "0.4.0" |
11 | salsa = "0.8.0" | 11 | salsa = "0.9.0" |
12 | rustc-hash = "1.0" | 12 | rustc-hash = "1.0" |
13 | parking_lot = "0.7.0" | 13 | parking_lot = "0.7.0" |
14 | id-arena = "2.0" | 14 | id-arena = "2.0" |