From c7eb25575e1d2d06b24572c475bdcc26b3aed9ca Mon Sep 17 00:00:00 2001
From: Greg Soltis <greg.soltis@vercel.com>
Date: Wed, 6 Sep 2023 12:17:54 -0700
Subject: [PATCH] Fix clippy warnings / errors in filewatching code (#5891)

---
 crates/turborepo-filewatch/src/cookie_jar.rs | 4 ++--
 crates/turborepo-filewatch/src/fsevent.rs    | 3 +++
 crates/turborepo-filewatch/src/lib.rs        | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/crates/turborepo-filewatch/src/cookie_jar.rs b/crates/turborepo-filewatch/src/cookie_jar.rs
index 47db6c62258e8..fe46a7b5dd4fc 100644
--- a/crates/turborepo-filewatch/src/cookie_jar.rs
+++ b/crates/turborepo-filewatch/src/cookie_jar.rs
@@ -130,7 +130,7 @@ async fn watch_cookies(
                                     .expect("Non-absolute path from filewatching");
                                 if root.relation_to_path(abs_path) == PathRelation::Parent {
                                     if let Some(responder) = watches.cookies.remove(&path) {
-                                        if let Err(_) = responder.send(Ok(())) {
+                                        if responder.send(Ok(())).is_err() {
                                             // Note that cookie waiters will time out if they don't get a
                                             // response, so we don't necessarily
                                             // need to panic here, although we could decide to do that in the
@@ -151,7 +151,7 @@ async fn watch_cookies(
                         let resp = if is_closing { WatchError::Closed } else { e };
                         let mut watches = watches.lock().expect("mutex poisoned");
                         for (_, sender) in watches.cookies.drain() {
-                            if let Err(_) = sender.send(Err(resp.clone())) {
+                            if sender.send(Err(resp.clone())).is_err() {
                                 // Note that cookie waiters will time out if they don't get a response, so
                                 // we don't necessarily need to panic here, although
                                 // we could decide to do that in the future.
diff --git a/crates/turborepo-filewatch/src/fsevent.rs b/crates/turborepo-filewatch/src/fsevent.rs
index 986be39b021bc..4bca8d6263f55 100644
--- a/crates/turborepo-filewatch/src/fsevent.rs
+++ b/crates/turborepo-filewatch/src/fsevent.rs
@@ -14,6 +14,9 @@
 //! [ref]: https://developer.apple.com/library/mac/documentation/Darwin/Reference/FSEvents_Ref/
 
 #![allow(non_upper_case_globals, dead_code)]
+// bitflags! with a 0 value defined triggers this clippy error,
+// but we want to be able to define a value for fs::kFSEventStreamEventFlagNone
+#![allow(clippy::bad_bit_mask)]
 
 use std::{
     collections::HashMap,
diff --git a/crates/turborepo-filewatch/src/lib.rs b/crates/turborepo-filewatch/src/lib.rs
index 122603d19cc76..f8a54653225d3 100644
--- a/crates/turborepo-filewatch/src/lib.rs
+++ b/crates/turborepo-filewatch/src/lib.rs
@@ -90,7 +90,7 @@ impl FileSystemWatcher {
         let watcher = run_watcher(&watch_root, send_file_events).unwrap();
         let (exit_ch, exit_signal) = tokio::sync::oneshot::channel();
         // Ensure we are ready to receive new events, not events for existing state
-        futures::executor::block_on(wait_for_cookie(&root, &mut recv_file_events))?;
+        futures::executor::block_on(wait_for_cookie(root, &mut recv_file_events))?;
         tokio::task::spawn(watch_events(
             watcher,
             watch_root,
@@ -233,7 +233,7 @@ fn watch_parents(root: &AbsoluteSystemPath, watcher: &mut Backend) -> Result<(),
 
 #[cfg(not(feature = "manual_recursive_watch"))]
 fn watch_recursively(root: &AbsoluteSystemPath, watcher: &mut Backend) -> Result<(), WatchError> {
-    watcher.watch(&root.as_std_path(), RecursiveMode::Recursive)?;
+    watcher.watch(root.as_std_path(), RecursiveMode::Recursive)?;
     Ok(())
 }