From 009996b55467f835162005501526472e23343039 Mon Sep 17 00:00:00 2001
From: Chip Senkbeil <chip@senkbeil.org>
Date: Sun, 4 Jun 2023 03:30:06 -0500
Subject: [PATCH] Remove crossbeam-channel feature from notify dependency
 (https://github.com/notify-rs/notify/issues/380)

---
 CHANGELOG.md             | 5 +++++
 Cargo.lock               | 2 --
 distant-local/Cargo.toml | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 897d6d9..8970811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- `crossbeam-channel` dependency removed from notify by disabling its feature
+  in order to avoid a `tokio::spawn` issue (https://github.com/notify-rs/notify/issues/380)
+
 ## [0.20.0-alpha.7]
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index 25684fb..fd4b8d4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1965,14 +1965,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4d9ba6c734de18ca27c8cef5cd7058aa4ac9f63596131e4c7e41e579319032a2"
 dependencies = [
  "bitflags 1.3.2",
- "crossbeam-channel",
  "filetime",
  "fsevent-sys",
  "inotify",
  "kqueue",
  "libc",
  "mio",
- "serde",
  "walkdir",
  "windows-sys 0.45.0",
 ]
diff --git a/distant-local/Cargo.toml b/distant-local/Cargo.toml
index 4efdff1..ed25d35 100644
--- a/distant-local/Cargo.toml
+++ b/distant-local/Cargo.toml
@@ -16,7 +16,7 @@ distant-core = { version = "=0.20.0-alpha.7", path = "../distant-core" }
 grep = "0.2.12"
 ignore = "0.4.20"
 log = "0.4.18"
-notify = { version = "6.0.0", features = ["serde"] }
+notify = { version = "6.0.0", default-features = false, features = ["macos_fsevent"] }
 num_cpus = "1.15.0"
 portable-pty = "0.8.1"
 rand = { version = "0.8.5", features = ["getrandom"] }