diff options
| author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-14 18:22:19 +0000 |
|---|---|---|
| committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-02-14 18:22:19 +0000 |
| commit | c530f04df51459d6d5f70c475e93127217f6e27f (patch) | |
| tree | 2e9abadb6e64fed7738b5b3fbc2eb13787efdaca /crates/ra_lsp_server/src/project_model.rs | |
| parent | 10bf61b83b2600ed3cb7e7825f1cd0ee83e9b7e7 (diff) | |
| parent | e0b8942c56378b7966af39058f27b11a0d02890f (diff) | |
Merge #833
833: automatically wait for worker threads r=matklad a=matklad
closes #817
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/project_model.rs')
| -rw-r--r-- | crates/ra_lsp_server/src/project_model.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/project_model.rs b/crates/ra_lsp_server/src/project_model.rs index 6800eb138..7d6440fad 100644 --- a/crates/ra_lsp_server/src/project_model.rs +++ b/crates/ra_lsp_server/src/project_model.rs | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | use std::path::PathBuf; | 1 | use std::path::PathBuf; |
| 2 | 2 | ||
| 3 | use thread_worker::{WorkerHandle, Worker}; | 3 | use thread_worker::Worker; |
| 4 | 4 | ||
| 5 | use crate::Result; | 5 | use crate::Result; |
| 6 | 6 | ||
| @@ -8,8 +8,8 @@ pub use ra_project_model::{ | |||
| 8 | ProjectWorkspace, CargoWorkspace, Package, Target, TargetKind, Sysroot, | 8 | ProjectWorkspace, CargoWorkspace, Package, Target, TargetKind, Sysroot, |
| 9 | }; | 9 | }; |
| 10 | 10 | ||
| 11 | pub fn workspace_loader() -> (Worker<PathBuf, Result<ProjectWorkspace>>, WorkerHandle) { | 11 | pub fn workspace_loader() -> Worker<PathBuf, Result<ProjectWorkspace>> { |
| 12 | thread_worker::spawn::<PathBuf, Result<ProjectWorkspace>, _>( | 12 | Worker::<PathBuf, Result<ProjectWorkspace>>::spawn( |
| 13 | "workspace loader", | 13 | "workspace loader", |
| 14 | 1, | 14 | 1, |
| 15 | |input_receiver, output_sender| { | 15 | |input_receiver, output_sender| { |