diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-06 18:17:09 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2018-12-06 18:17:09 +0000 |
commit | 8e60e751cbcfa47c7bed788dfe2ab5cebfcb78b3 (patch) | |
tree | 58f01a945f7c27d6baaecf38e84617ca46782073 /crates/ra_lsp_server/src/thread_watcher.rs | |
parent | 5ad84f0ca5fe9bb250cd4026e5dcb5478d932666 (diff) | |
parent | 28ddecf6c99ef23bc96b9eb7bc8ee049f1732e76 (diff) |
Merge #260
260: Modernize r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/thread_watcher.rs')
-rw-r--r-- | crates/ra_lsp_server/src/thread_watcher.rs | 7 |
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 | ||
3 | use crossbeam_channel::{bounded, unbounded, Receiver, Sender}; | 3 | use crossbeam_channel::{bounded, unbounded, Receiver, Sender}; |
4 | use drop_bomb::DropBomb; | 4 | use drop_bomb::DropBomb; |
5 | use failure::format_err; | ||
5 | 6 | ||
6 | use crate::Result; | 7 | use 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 | } |