aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_vfs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_vfs')
-rw-r--r--crates/ra_vfs/Cargo.toml3
-rw-r--r--crates/ra_vfs/src/watcher.rs15
-rw-r--r--crates/ra_vfs/tests/vfs.rs4
3 files changed, 10 insertions, 12 deletions
diff --git a/crates/ra_vfs/Cargo.toml b/crates/ra_vfs/Cargo.toml
index b703cbd9f..1a21557bf 100644
--- a/crates/ra_vfs/Cargo.toml
+++ b/crates/ra_vfs/Cargo.toml
@@ -10,7 +10,8 @@ relative-path = "0.4.0"
10rustc-hash = "1.0" 10rustc-hash = "1.0"
11crossbeam-channel = "0.3.5" 11crossbeam-channel = "0.3.5"
12log = "0.4.6" 12log = "0.4.6"
13notify = "4" 13# until https://github.com/passcod/notify/issues/169 is fixed
14notify = { git = "https://github.com/vemoo/notify/", branch = "v4-legacy" }
14drop_bomb = "0.1.0" 15drop_bomb = "0.1.0"
15 16
16thread_worker = { path = "../thread_worker" } 17thread_worker = { path = "../thread_worker" }
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}
diff --git a/crates/ra_vfs/tests/vfs.rs b/crates/ra_vfs/tests/vfs.rs
index 9cde2bed7..87fb5a092 100644
--- a/crates/ra_vfs/tests/vfs.rs
+++ b/crates/ra_vfs/tests/vfs.rs
@@ -1,6 +1,6 @@
1use std::{collections::HashSet, fs}; 1use std::{collections::HashSet, fs};
2 2
3use flexi_logger::Logger; 3// use flexi_logger::Logger;
4use ra_vfs::{Vfs, VfsChange}; 4use ra_vfs::{Vfs, VfsChange};
5use tempfile::tempdir; 5use tempfile::tempdir;
6 6
@@ -13,7 +13,7 @@ fn process_tasks(vfs: &mut Vfs, num_tasks: u32) {
13 13
14#[test] 14#[test]
15fn test_vfs_works() -> std::io::Result<()> { 15fn test_vfs_works() -> std::io::Result<()> {
16 Logger::with_str("debug").start().unwrap(); 16 // Logger::with_str("debug").start().unwrap();
17 17
18 let files = [ 18 let files = [
19 ("a/foo.rs", "hello"), 19 ("a/foo.rs", "hello"),