diff options
| author | Bernardo <[email protected]> | 2019-01-15 16:45:56 +0000 |
|---|---|---|
| committer | Aleksey Kladov <[email protected]> | 2019-01-26 08:46:27 +0000 |
| commit | b0f7e72c49141df0ad95e3fcb561ee6a4d86b537 (patch) | |
| tree | ae4c4aee243d59046dd9cadb072fef8f48ea7167 /crates/ra_vfs/src | |
| parent | 5f31d495bdc8639a826f60c6f42d12bb89be9f1a (diff) | |
use notify with fix
Diffstat (limited to 'crates/ra_vfs/src')
| -rw-r--r-- | crates/ra_vfs/src/watcher.rs | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/crates/ra_vfs/src/watcher.rs b/crates/ra_vfs/src/watcher.rs index 190a9f924..3bd0e7da2 100644 --- a/crates/ra_vfs/src/watcher.rs +++ b/crates/ra_vfs/src/watcher.rs | |||
| @@ -86,14 +86,11 @@ impl Watcher { | |||
| 86 | pub fn shutdown(mut self) -> thread::Result<()> { | 86 | pub fn shutdown(mut self) -> thread::Result<()> { |
| 87 | self.bomb.defuse(); | 87 | self.bomb.defuse(); |
| 88 | drop(self.watcher); | 88 | drop(self.watcher); |
| 89 | // TODO this doesn't terminate because of a buf in `notify` | 89 | let res = self.thread.join(); |
| 90 | // uncomment when https://github.com/passcod/notify/pull/170 is released | 90 | match &res { |
| 91 | // let res = self.thread.join(); | 91 | Ok(()) => log::info!("... Watcher terminated with ok"), |
| 92 | // match &res { | 92 | Err(_) => log::error!("... Watcher terminated with err"), |
| 93 | // Ok(()) => log::info!("... Watcher terminated with ok"), | 93 | } |
| 94 | // Err(_) => log::error!("... Watcher terminated with err"), | 94 | res |
| 95 | // } | ||
| 96 | // res | ||
| 97 | Ok(()) | ||
| 98 | } | 95 | } |
| 99 | } | 96 | } |