diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 18:21:58 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-27 18:21:58 +0000 |
| commit | b26ab3603d8f73c8e57e9e90d44486a608bc9370 (patch) | |
| tree | c25374be95b3791a43ffb0ddbf0a03b2fb199f9d | |
| parent | 095843119e703a756047dfe25514fdcc93425341 (diff) | |
| parent | 532e68692d9a2e5fee895f37d50b9d3e3503017e (diff) | |
Merge #347
347: Try to fix salsa bug in cancellation r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | Cargo.toml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml index cbb9a09d5..f8228b988 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
| @@ -10,4 +10,4 @@ debug = true | |||
| 10 | # https://github.com/salsa-rs/salsa/pull/75 | 10 | # https://github.com/salsa-rs/salsa/pull/75 |
| 11 | # and | 11 | # and |
| 12 | # https://github.com/salsa-rs/salsa/issues/99 | 12 | # https://github.com/salsa-rs/salsa/issues/99 |
| 13 | salsa = { git = "https://github.com/matklad/salsa", branch = "no-upgrade" } | 13 | salsa = { git = "https://github.com/matklad/salsa", branch = "fix-cancelation-maybe" } |