diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-22 13:47:27 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-22 13:47:27 +0000 |
| commit | 8fed875c90796b2390f5b966c3f1eca536661af1 (patch) | |
| tree | 0f88728c1f25445000dd666a633e7d0235d4075e /Cargo.toml | |
| parent | 5a5402d4d4ab033f0035622df880c82ea064d2c5 (diff) | |
| parent | 724862a1a4da8bbb04728bd9264938c0102151c5 (diff) | |
Merge #323
323: workaround salsa/parking-log bug r=matklad a=matklad
https://github.com/salsa-rs/salsa/issues/99
https://github.com/Amanieu/parking_lot/issues/101
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.toml')
| -rw-r--r-- | Cargo.toml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Cargo.toml b/Cargo.toml index 95830561d..cbb9a09d5 100644 --- a/Cargo.toml +++ b/Cargo.toml | |||
| @@ -4,3 +4,10 @@ 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 = "no-upgrade" } | ||