diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-20 21:04:06 +0100 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-10-20 21:04:06 +0100 |
| commit | fd336d1134d405d833b762101a25c00076bc7fd2 (patch) | |
| tree | 040ab6dc1286ab9fe5da0002d29ae4eb7a37850a /Cargo.lock | |
| parent | 73dd870da2dcc991b0fdcdde8bee91f05cb9e182 (diff) | |
| parent | 0102a01f76c855da447e25eb81191047a3ca79b8 (diff) | |
Merge #147
147: Cancelation r=matklad a=matklad
This series of commits switch cancellation strategy from `JobToken` (which are cancellation tokens, explicitly controlled by the called) to salsa built-in auto cancellation. "Auto" means that, as soon as we advance the revision, all pending queries are cancelled automatically, and this looks like a semantic we actually want.
"client-side" cancellation is a rare event, and it's ok to just punt on it. Automatic cancellation after the user types something in happens all the time.
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index bb0feec2e..f51914883 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
| @@ -609,7 +609,6 @@ dependencies = [ | |||
| 609 | name = "ra_analysis" | 609 | name = "ra_analysis" |
| 610 | version = "0.1.0" | 610 | version = "0.1.0" |
| 611 | dependencies = [ | 611 | dependencies = [ |
| 612 | "crossbeam-channel 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", | ||
| 613 | "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", | 612 | "fst 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", |
| 614 | "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", | 613 | "im 12.2.0 (registry+https://github.com/rust-lang/crates.io-index)", |
| 615 | "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", | 614 | "log 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", |