diff options
author | Bernardo <[email protected]> | 2019-01-12 19:32:24 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-01-26 08:46:16 +0000 |
commit | 5f31d495bdc8639a826f60c6f42d12bb89be9f1a (patch) | |
tree | bb5d17ad818a93a3d1666c3bf5e11ae0732a11d9 | |
parent | 76bf7498aa88c4de4517f4eb1218807fdfc7071b (diff) |
reference `notify` issue
-rw-r--r-- | crates/ra_vfs/src/lib.rs | 2 | ||||
-rw-r--r-- | crates/ra_vfs/src/watcher.rs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/crates/ra_vfs/src/lib.rs b/crates/ra_vfs/src/lib.rs index 2930f6b80..3eeec8b1c 100644 --- a/crates/ra_vfs/src/lib.rs +++ b/crates/ra_vfs/src/lib.rs | |||
@@ -225,7 +225,7 @@ impl Vfs { | |||
225 | } | 225 | } |
226 | } | 226 | } |
227 | watcher::WatcherChange::Rescan => { | 227 | watcher::WatcherChange::Rescan => { |
228 | // TODO send Task::AddRoot? | 228 | // TODO we should reload all files |
229 | } | 229 | } |
230 | }, | 230 | }, |
231 | io::TaskResult::LoadChange(None) => {} | 231 | io::TaskResult::LoadChange(None) => {} |
diff --git a/crates/ra_vfs/src/watcher.rs b/crates/ra_vfs/src/watcher.rs index a5401869c..190a9f924 100644 --- a/crates/ra_vfs/src/watcher.rs +++ b/crates/ra_vfs/src/watcher.rs | |||
@@ -86,7 +86,8 @@ 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 for some reason | 89 | // TODO this doesn't terminate because of a buf in `notify` |
90 | // uncomment when https://github.com/passcod/notify/pull/170 is released | ||
90 | // let res = self.thread.join(); | 91 | // let res = self.thread.join(); |
91 | // match &res { | 92 | // match &res { |
92 | // Ok(()) => log::info!("... Watcher terminated with ok"), | 93 | // Ok(()) => log::info!("... Watcher terminated with ok"), |