aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_vfs/src/lib.rs2
-rw-r--r--crates/ra_vfs/src/watcher.rs3
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"),