Merge #9770

9770: Downgrade notify and use `RecommendedWatcher` r=lnicola a=lnicola

Closes #9769

bors r+

Co-authored-by: Laurențiu Nicola <lnicola@dend.ro>

Author: bors[bot]

Cargo.lock

@@ -14,7 +14,7 @@ rustc-hash = "1.0"
 jod-thread = "0.1.0"
 walkdir = "2.3.1"
 crossbeam-channel = "0.5.0"
-notify = "=5.0.0-pre.11"
+notify = "=5.0.0-pre.10"    # check that it builds on NetBSD before upgrading
 
 vfs = { path = "../vfs", version = "0.0.0" }
 paths = { path = "../paths", version = "0.0.0" }

crates/vfs-notify/Cargo.toml

@@ -83,9 +83,10 @@ impl NotifyActor {
                         self.watcher = None;
                         if !config.watch.is_empty() {
                             let (watcher_sender, watcher_receiver) = unbounded();
-                            let watcher = log_notify_error(RecommendedWatcher::new(move |event| {
-                                watcher_sender.send(event).unwrap()
-                            }));
+                            let watcher =
+                                log_notify_error(RecommendedWatcher::new_immediate(move |event| {
+                                    watcher_sender.send(event).unwrap()
+                                }));
                             self.watcher = watcher.map(|it| (it, watcher_receiver));
                         }
 
@@ -214,7 +215,7 @@ impl NotifyActor {
 
     fn watch(&mut self, path: AbsPathBuf) {
         if let Some((watcher, _)) = &mut self.watcher {
-            log_notify_error(watcher.watch(path.as_ref(), RecursiveMode::NonRecursive));
+            log_notify_error(watcher.watch(&path, RecursiveMode::NonRecursive));
         }
     }
     fn send(&mut self, msg: loader::Message) {