aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_lsp_server/src/thread_watcher.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_lsp_server/src/thread_watcher.rs')
-rw-r--r--crates/ra_lsp_server/src/thread_watcher.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/crates/ra_lsp_server/src/thread_watcher.rs b/crates/ra_lsp_server/src/thread_watcher.rs
index 5143c77ae..99825d440 100644
--- a/crates/ra_lsp_server/src/thread_watcher.rs
+++ b/crates/ra_lsp_server/src/thread_watcher.rs
@@ -2,6 +2,7 @@ use std::thread;
2 2
3use crossbeam_channel::{bounded, unbounded, Receiver, Sender}; 3use crossbeam_channel::{bounded, unbounded, Receiver, Sender};
4use drop_bomb::DropBomb; 4use drop_bomb::DropBomb;
5use failure::format_err;
5 6
6use crate::Result; 7use crate::Result;
7 8
@@ -48,7 +49,7 @@ impl ThreadWatcher {
48 } 49 }
49 50
50 pub fn stop(mut self) -> Result<()> { 51 pub fn stop(mut self) -> Result<()> {
51 info!("waiting for {} to finish ...", self.name); 52 log::info!("waiting for {} to finish ...", self.name);
52 let name = self.name; 53 let name = self.name;
53 self.bomb.defuse(); 54 self.bomb.defuse();
54 let res = self 55 let res = self
@@ -56,8 +57,8 @@ impl ThreadWatcher {
56 .join() 57 .join()
57 .map_err(|_| format_err!("ThreadWatcher {} died", name)); 58 .map_err(|_| format_err!("ThreadWatcher {} died", name));
58 match &res { 59 match &res {
59 Ok(()) => info!("... {} terminated with ok", name), 60 Ok(()) => log::info!("... {} terminated with ok", name),
60 Err(_) => error!("... {} terminated with err", name), 61 Err(_) => log::error!("... {} terminated with err", name),
61 } 62 }
62 res 63 res
63 } 64 }