diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-01-24 15:37:11 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-01-24 15:37:11 +0000 |
| commit | c6dbf406a9bbf1d8df438753c9e1a7c97d0f00e1 (patch) | |
| tree | e12aaa95dd003a8803f8422a8444bcc1476dcc58 /crates/ra_lsp_server/src | |
| parent | 8a4c248c48ad7bb9ad556717ee013129c190dbfa (diff) | |
| parent | b90ea640e6484788f8728be6e48cc55d90e488ba (diff) | |
Merge #2901
2901: Cancel requests during shutdown r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src')
| -rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 746a8fbe9..83adf9711 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
| @@ -210,7 +210,7 @@ pub fn main_loop( | |||
| 210 | )?; | 210 | )?; |
| 211 | } | 211 | } |
| 212 | } | 212 | } |
| 213 | 213 | world_state.analysis_host.request_cancellation(); | |
| 214 | log::info!("waiting for tasks to finish..."); | 214 | log::info!("waiting for tasks to finish..."); |
| 215 | task_receiver.into_iter().for_each(|task| { | 215 | task_receiver.into_iter().for_each(|task| { |
| 216 | on_task(task, &connection.sender, &mut loop_state.pending_requests, &mut world_state) | 216 | on_task(task, &connection.sender, &mut loop_state.pending_requests, &mut world_state) |