diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:17:13 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-15 12:17:13 +0000 |
| commit | c7f072372edc7a94544c993d03928aab2ac92dab (patch) | |
| tree | 13dc4378b272541f340c08d5be91146857059aaf /Cargo.toml | |
| parent | 2184f7f14250c888e37cc27475c085515ea63aa4 (diff) | |
| parent | dd45697e5396d4a6ac8e838e1f4f510c960b9c43 (diff) | |
Merge #547
547: update salsa r=matklad a=matklad
Notably, this includes unwinding-based cancelation.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Cargo.toml b/Cargo.toml index 59ce6b23d..c5155e899 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
| @@ -6,4 +6,3 @@ incremental = true | |||
| 6 | debug = true | 6 | debug = true |
| 7 | 7 | ||
| 8 | [patch.'crates-io'] | 8 | [patch.'crates-io'] |
| 9 | salsa = { git = "https://github.com/matklad/salsa", branch = "panic-hooks" } | ||