Merge pull request #2173 from 0xpr03/master

upgrade to notify 6.1.1 and watcher-mini 4.1
rust-lang · Nov 24, 2023 · a016ac0 · a016ac0
2 parents ad55f53 + 079f52a
commit a016ac0
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,8 +37,8 @@ toml = "0.5.11" # Do not update, see https://github.com/rust-lang/mdBook/issues/
 topological-sort = "0.2.2"
 
 # Watch feature
-notify = { version = "6.0.1", optional = true }
-notify-debouncer-mini = { version = "0.3.0", optional = true }
+notify = { version = "6.1.1", optional = true }
+notify-debouncer-mini = { version = "0.4.1", optional = true }
 ignore = { version = "0.4.20", optional = true }
 
 # Serve feature

diff --git a/src/cmd/watch.rs b/src/cmd/watch.rs
@@ -108,8 +108,7 @@ where
     // Create a channel to receive the events.
     let (tx, rx) = channel();
 
-    let mut debouncer = match notify_debouncer_mini::new_debouncer(Duration::from_secs(1), None, tx)
-    {
+    let mut debouncer = match notify_debouncer_mini::new_debouncer(Duration::from_secs(1), tx) {
         Ok(d) => d,
         Err(e) => {
             error!("Error while trying to watch the files:\n\n\t{:?}", e);
@@ -157,10 +156,8 @@ where
         let paths: Vec<_> = all_events
             .filter_map(|event| match event {
                 Ok(events) => Some(events),
-                Err(errors) => {
-                    for error in errors {
-                        log::warn!("error while watching for changes: {error}");
-                    }
+                Err(error) => {
+                    log::warn!("error while watching for changes: {error}");
                     None
                 }
             })