From e1cef25d7fdedc3622a7c3ddd91eccbadf6aa511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fe=CC=81lix=20Saparelli?= <felix@passcod.name>
Date: Sun, 21 Apr 2024 00:36:59 +1200
Subject: [PATCH] Fix watchexec-events tests

---
 .github/workflows/tests.yml |  8 ++++---
 Cargo.lock                  | 43 +++++++++----------------------------
 Cargo.toml                  |  1 -
 crates/events/Cargo.toml    |  1 -
 crates/events/tests/json.rs |  2 ++
 5 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e43d02d..31e7154 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -68,9 +68,11 @@ jobs:
         key: ${{ runner.os }}-target-stable-${{ hashFiles('**/Cargo.lock') }}
 
     - name: Run test suite
-      run: cargo test ${{ env.flags }}
+      run: cargo test
+    - name: Run watchexec-events integration tests
+      run: cargo test -p watchexec-events -F serde
     - name: Check that CLI runs
-      run: cargo run ${{ env.flags }} -p watchexec-cli -- -1 echo
+      run: cargo run -p watchexec-cli -- -1 echo
 
     - name: Install coreutils on mac
       if: ${{ matrix.platform == 'macos' }}
@@ -89,7 +91,7 @@ jobs:
       shell: bash
 
     - name: Generate manpage
-      run: cargo run ${{ env.flags }} -p watchexec-cli -- --manual > doc/watchexec.1
+      run: cargo run -p watchexec-cli -- --manual > doc/watchexec.1
     - name: Check that manpage is up to date
       run: git diff --exit-code -- doc/
 
diff --git a/Cargo.lock b/Cargo.lock
index 85d112f..1c903af 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4013,8 +4013,8 @@ dependencies = [
  "tokio",
  "tracing",
  "tracing-subscriber",
- "watchexec-events 3.0.0",
- "watchexec-signals 3.0.0",
+ "watchexec-events",
+ "watchexec-signals",
  "watchexec-supervisor",
 ]
 
@@ -4064,24 +4064,12 @@ dependencies = [
  "tracing-test",
  "uuid",
  "watchexec",
- "watchexec-events 3.0.0",
+ "watchexec-events",
  "watchexec-filterer-globset",
- "watchexec-signals 3.0.0",
+ "watchexec-signals",
  "which",
 ]
 
-[[package]]
-name = "watchexec-events"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fa905a7f327bfdda78b9c06831d3180a419b7b722bd1ef779ac13ff2ab69df0"
-dependencies = [
- "nix 0.27.1",
- "notify",
- "serde",
- "watchexec-signals 2.1.0",
-]
-
 [[package]]
 name = "watchexec-events"
 version = "3.0.0"
@@ -4091,8 +4079,7 @@ dependencies = [
  "serde",
  "serde_json",
  "snapbox",
- "watchexec-events 2.0.1",
- "watchexec-signals 3.0.0",
+ "watchexec-signals",
 ]
 
 [[package]]
@@ -4105,7 +4092,7 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "watchexec",
- "watchexec-events 3.0.0",
+ "watchexec-events",
  "watchexec-filterer-ignore",
 ]
 
@@ -4122,18 +4109,8 @@ dependencies = [
  "tracing",
  "tracing-subscriber",
  "watchexec",
- "watchexec-events 3.0.0",
- "watchexec-signals 3.0.0",
-]
-
-[[package]]
-name = "watchexec-signals"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af0a778522cf0fc2fa8a8f1380e32893208cb2e7fd33e64de8bd81a00a2a7838"
-dependencies = [
- "nix 0.27.1",
- "serde",
+ "watchexec-events",
+ "watchexec-signals",
 ]
 
 [[package]]
@@ -4156,8 +4133,8 @@ dependencies = [
  "process-wrap",
  "tokio",
  "tracing",
- "watchexec-events 3.0.0",
- "watchexec-signals 3.0.0",
+ "watchexec-events",
+ "watchexec-signals",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index f1a3cf9..9e4d097 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,6 @@ tempfile = "3.8.0"
 tracing-test = "0.2.4"
 rand = "0.8"
 uuid = "1.5.0"
-watchexec-events = "2.0.1"
 
 [profile.release]
 lto = true
diff --git a/crates/events/Cargo.toml b/crates/events/Cargo.toml
index 2f1435e..ec5be02 100644
--- a/crates/events/Cargo.toml
+++ b/crates/events/Cargo.toml
@@ -33,7 +33,6 @@ version = "0.28.0"
 features = ["signal"]
 
 [dev-dependencies]
-watchexec-events = { workspace = true, features = ["serde"] }
 snapbox = "0.5.9"
 serde_json = "1.0.107"
 
diff --git a/crates/events/tests/json.rs b/crates/events/tests/json.rs
index c98da58..7ea5c5d 100644
--- a/crates/events/tests/json.rs
+++ b/crates/events/tests/json.rs
@@ -1,3 +1,5 @@
+#![cfg(feature = "serde")]
+
 use std::num::{NonZeroI32, NonZeroI64};
 
 use snapbox::{assert_eq, file};