Switch from a private extension to the newly release 0.9.0

Cargo.toml

@@ -108,7 +108,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
 ] }
 unicode-width = "0.1.13"
 version_check = "0.9.4"
-watchman_client = { version = "0.8.0" }
+watchman_client = { version = "0.9.0" }
 whoami = "1.5.1"
 winreg = "0.52"
 zstd = "0.12.4"

lib/src/fsmonitor.rs

@@ -91,11 +91,7 @@ pub mod watchman {
     use tracing::{info, instrument};
     use watchman_client::expr;
     use watchman_client::prelude::{
-        Clock as InnerClock, ClockSpec, NameOnly, QueryRequestCommon, QueryResult,
-    };
-
-    use crate::fsmonitor_watchman_extensions::{
-        list_triggers, register_trigger, remove_trigger, TriggerRequest,
+        Clock as InnerClock, ClockSpec, NameOnly, QueryRequestCommon, QueryResult, TriggerRequest,
     };
 
     /// Represents an instance in time from the perspective of the filesystem
@@ -266,7 +262,9 @@ pub mod watchman {
         #[instrument(skip(self))]
         async fn is_trigger_registered(&self) -> Result<bool, Error> {
             info!("Checking for an existing Watchman trigger...");
-            Ok(list_triggers(&self.client, &self.resolved_root)
+            Ok(self
+                .client
+                .list_triggers(&self.resolved_root)
                 .await
                 .map_err(Error::WatchmanTriggerError)?
                 .triggers
@@ -278,31 +276,32 @@ pub mod watchman {
         #[instrument(skip(self))]
         async fn register_trigger(&self) -> Result<(), Error> {
             info!("Registering Watchman trigger...");
-            register_trigger(
-                &self.client,
-                &self.resolved_root,
-                TriggerRequest {
-                    name: "jj-background-monitor".to_string(),
-                    command: vec![
-                        "jj".to_string(),
-                        "files".to_string(),
-                        "-r".to_string(),
-                        "root()".to_string(),
-                    ],
-                    expression: Some(self.build_exclude_expr()),
-                    ..Default::default()
-                },
-            )
-            .await
-            .map_err(Error::WatchmanTriggerError)?;
+            self.client
+                .register_trigger(
+                    &self.resolved_root,
+                    TriggerRequest {
+                        name: "jj-background-monitor".to_string(),
+                        command: vec![
+                            "jj".to_string(),
+                            "files".to_string(),
+                            "-r".to_string(),
+                            "root()".to_string(),
+                        ],
+                        expression: Some(self.build_exclude_expr()),
+                        ..Default::default()
+                    },
+                )
+                .await
+                .map_err(Error::WatchmanTriggerError)?;
             Ok(())
         }
 
         /// Register trigger for changed files.
         #[instrument(skip(self))]
         async fn unregister_trigger(&self) -> Result<(), Error> {
             info!("Unregistering Watchman trigger...");
-            remove_trigger(&self.client, &self.resolved_root, "jj-background-monitor")
+            self.client
+                .remove_trigger(&self.resolved_root, "jj-background-monitor")
                 .await
                 .map_err(Error::WatchmanTriggerError)?;
             Ok(())