diff options
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop.rs')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 41f70f263..eab82ee85 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
@@ -10,6 +10,7 @@ use gen_lsp_server::{ | |||
10 | use languageserver_types::NumberOrString; | 10 | use languageserver_types::NumberOrString; |
11 | use ra_analysis::{Canceled, FileId, LibraryData}; | 11 | use ra_analysis::{Canceled, FileId, LibraryData}; |
12 | use rayon; | 12 | use rayon; |
13 | use thread_worker::Worker; | ||
13 | use threadpool::ThreadPool; | 14 | use threadpool::ThreadPool; |
14 | use rustc_hash::FxHashSet; | 15 | use rustc_hash::FxHashSet; |
15 | use serde::{de::DeserializeOwned, Serialize}; | 16 | use serde::{de::DeserializeOwned, Serialize}; |
@@ -21,7 +22,6 @@ use crate::{ | |||
21 | project_model::{workspace_loader, CargoWorkspace}, | 22 | project_model::{workspace_loader, CargoWorkspace}, |
22 | req, | 23 | req, |
23 | server_world::{ServerWorld, ServerWorldState}, | 24 | server_world::{ServerWorld, ServerWorldState}, |
24 | thread_watcher::Worker, | ||
25 | vfs::{self, FileEvent}, | 25 | vfs::{self, FileEvent}, |
26 | Result, | 26 | Result, |
27 | }; | 27 | }; |
@@ -92,8 +92,8 @@ pub fn main_loop( | |||
92 | let ws_res = ws_watcher.stop(); | 92 | let ws_res = ws_watcher.stop(); |
93 | 93 | ||
94 | main_res?; | 94 | main_res?; |
95 | fs_res?; | 95 | fs_res.map_err(|_| format_err!("fs watcher died"))?; |
96 | ws_res?; | 96 | ws_res.map_err(|_| format_err!("ws watcher died"))?; |
97 | 97 | ||
98 | Ok(()) | 98 | Ok(()) |
99 | } | 99 | } |