Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Update notify to v9.0.0-rc.4 (#58944)
Ben Kunklef1ad1e7fd58a
diff --git a/Cargo.lock b/Cargo.lockindex ab2c986115f..04adbe20263 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -5236,7 +5236,7 @@ dependencies = ["libc","option-ext","redox_users 0.5.2",- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -6034,7 +6034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -6814,7 +6814,7 @@ dependencies = ["is_executable","libc","log",- "notify 8.2.0",+ "notify 9.0.0-rc.4","parking_lot","paths","proto",@@ -7242,7 +7242,7 @@ dependencies = ["gobject-sys","libc","system-deps",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -11090,7 +11090,7 @@ version = "0.6.1"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "536bfad37a309d62069485248eeaba1e8d9853aaf951caaeaed0585a95346f08"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -11469,19 +11469,22 @@ dependencies = [[[package]]name = "notify"-version = "8.2.0"-source = "git+https://github.com/zed-industries/notify.git?rev=ce58c24cad542c28e04ced02e20325a4ec28a31d#ce58c24cad542c28e04ced02e20325a4ec28a31d"+version = "9.0.0-rc.4"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "b44b771d4dd781ef14c84078693e67495da6b47f609f72e8a4da8420a861240e"dependencies = ["bitflags 2.10.0",- "fsevent-sys","inotify 0.11.0","kqueue","libc","log","mio 1.2.0","notify-types",+ "objc2-core-foundation",+ "objc2-core-services","walkdir",- "windows-sys 0.60.2",+ "windows-sys 0.61.2",+ "xxhash-rust",][[package]]@@ -11497,8 +11500,12 @@ dependencies = [[[package]]name = "notify-types"-version = "2.0.0"-source = "git+https://github.com/zed-industries/notify.git?rev=ce58c24cad542c28e04ced02e20325a4ec28a31d#ce58c24cad542c28e04ced02e20325a4ec28a31d"+version = "2.1.0"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"+dependencies = [+ "bitflags 2.10.0",+][[package]]name = "ntapi"@@ -11515,7 +11522,7 @@ version = "0.50.3"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.59.0",][[package]]@@ -11902,6 +11909,16 @@ dependencies = ["objc2-metal 0.2.2",]+[[package]]+name = "objc2-core-services"+version = "0.3.2"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "583300ad934cba24ff5292aee751ecc070f7ca6b39a574cc21b7b5e588e06a0b"+dependencies = [+ "libc",+ "objc2-core-foundation",+]+[[package]]name = "objc2-encode"version = "4.1.0"@@ -15584,7 +15601,7 @@ dependencies = ["errno 0.3.14","libc","linux-raw-sys 0.11.0",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -17017,7 +17034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e"dependencies = ["libc",- "windows-sys 0.61.2",+ "windows-sys 0.60.2",][[package]]@@ -18134,7 +18151,7 @@ dependencies = ["getrandom 0.3.4","once_cell","rustix 1.1.2",- "windows-sys 0.61.2",+ "windows-sys 0.52.0",][[package]]@@ -21135,7 +21152,7 @@ version = "0.1.11"source = "registry+https://github.com/rust-lang/crates.io-index"checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"dependencies = [- "windows-sys 0.61.2",+ "windows-sys 0.48.0",][[package]]@@ -22588,6 +22605,12 @@ dependencies = ["toml_edit 0.22.27",]+[[package]]+name = "xxhash-rust"+version = "0.8.15"+source = "registry+https://github.com/rust-lang/crates.io-index"+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"+[[package]]name = "y4m"version = "0.8.0"diff --git a/Cargo.toml b/Cargo.tomlindex f3925a6223d..cdb78d78dd3 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -884,8 +884,6 @@ features = [[patch.crates-io]async-task = { git = "https://github.com/smol-rs/async-task.git", rev = "b4486cd71e4e94fbda54ce6302444de14f4d190e" }-notify = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }-notify-types = { git = "https://github.com/zed-industries/notify.git", rev = "ce58c24cad542c28e04ced02e20325a4ec28a31d" }windows-capture = { git = "https://github.com/zed-industries/windows-capture.git", rev = "f0d6c1b6691db75461b732f6d5ff56eed002eeb9" }calloop = { git = "https://github.com/zed-industries/calloop" }livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "c3a55bbc207008f1ca3474b6037fdd3c443cad0f" }diff --git a/crates/fs/Cargo.toml b/crates/fs/Cargo.tomlindex 3e5f5dcad2f..01526ae07a3 100644--- a/crates/fs/Cargo.toml+++ b/crates/fs/Cargo.toml@@ -43,7 +43,7 @@ text.workspace = truetime.workspace = trueutil.workspace = trueis_executable = "1.0.5"-notify = "8.2.0"+notify = "9.0.0-rc.4"trash = { git = "https://github.com/zed-industries/trash-rs", rev = "3bf27effd4eb8699f2e484d3326b852fe3e53af7" }[target.'cfg(target_os = "windows")'.dependencies]diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rsindex c4138a084d3..82aeaf2a73e 100644--- a/crates/fs/src/fs_watcher.rs+++ b/crates/fs/src/fs_watcher.rs@@ -726,7 +726,14 @@ impl GlobalWatcher {return Ok(());}- let watcher = notify::recommended_watcher(handle_native_event)?;+ // CORE excludes Access events, which Zed discards anyway. Without this,+ // the default mask subscribes to inotify OPEN/CLOSE_* on Linux, so every+ // file read in a watched directory would queue events, increasing the+ // risk of queue overflows (and thus full rescans) under read-heavy+ // workloads like grep or language server indexing.+ let config = notify::Config::default().with_event_kinds(notify::EventKindMask::CORE);+ let watcher =+ <notify::RecommendedWatcher as notify::Watcher>::new(handle_native_event, config)?;*self.native_watcher.lock() = Some(Box::new(watcher));Ok(())}