Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

Fix the macOS tests that hang locally (#61407)

Kirill Bulatov88447e9b9c8a
diff --git a/Cargo.lock b/Cargo.lock
index b0a4d26dcc7..417b6eda081 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -621,7 +621,7 @@ version = "0.26.1-dev"
source = "git+https://github.com/zed-industries/alacritty?rev=4c129667ce56611becdc82de6e28218c80e2e88f#4c129667ce56611becdc82de6e28218c80e2e88f"
dependencies = [
"base64 0.22.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"home",
"libc",
"log",
@@ -676,7 +676,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c88dbbce13b232b26250e1e2e6ac18b6a891a646b8148285036ebce260ac5c3"
dependencies = [
"alsa-sys",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"libc",
]
@@ -2207,7 +2207,7 @@ version = "0.71.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
@@ -2227,7 +2227,7 @@ version = "0.72.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cexpr",
"clang-sys",
"itertools 0.11.0",
@@ -2298,9 +2298,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.10.0"
+version = "2.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da"
dependencies = [
"serde_core",
]
@@ -2711,7 +2711,7 @@ name = "calloop"
version = "0.14.3"
source = "git+https://github.com/zed-industries/calloop#eb6b4fd17b9af5ecc226546bdd04185391b3e265"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"polling",
"rustix 1.1.2",
"slab",
@@ -3333,7 +3333,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block",
"cocoa-foundation 0.2.0",
"core-foundation 0.10.0",
@@ -3363,7 +3363,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block",
"core-foundation 0.10.0",
"core-graphics-types 0.2.0",
@@ -3966,7 +3966,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.10.0",
"core-graphics-types 0.2.0",
"foreign-types 0.5.0",
@@ -3979,7 +3979,7 @@ version = "0.24.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.9.4",
"core-graphics-types 0.1.3",
"foreign-types 0.5.0",
@@ -4003,7 +4003,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.10.0",
"libc",
]
@@ -4014,7 +4014,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block",
"cfg-if",
"core-foundation 0.10.0",
@@ -4114,7 +4114,7 @@ version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"fontdb",
"harfrust",
"linebender_resource_handle",
@@ -4986,7 +4986,7 @@ name = "debugger_ui"
version = "0.1.0"
dependencies = [
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"client",
"collections",
"command_palette_hooks",
@@ -5304,7 +5304,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users 0.5.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
]
[[package]]
@@ -5330,7 +5330,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"libc",
"objc2 0.6.3",
@@ -6113,7 +6113,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]]
@@ -7331,7 +7331,7 @@ dependencies = [
"gobject-sys",
"libc",
"system-deps",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -7590,7 +7590,7 @@ version = "0.21.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"futures-channel",
"futures-core",
"futures-executor",
@@ -7759,7 +7759,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"gpu-descriptor-types",
"hashbrown 0.15.5",
]
@@ -7770,7 +7770,7 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -7783,7 +7783,7 @@ dependencies = [
"async-task",
"backtrace",
"bindgen 0.71.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block",
"cbindgen",
"chrono",
@@ -7875,7 +7875,7 @@ dependencies = [
"anyhow",
"as-raw-xcb-connection",
"ashpd",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"calloop",
"calloop-wayland-source",
@@ -8226,7 +8226,7 @@ version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4f9f40651a03bc0f7316bd75267ff5767e93017ef3cfffe76c6aa7252cc5a31c"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"core_maths",
"read-fonts 0.37.0",
@@ -8391,7 +8391,7 @@ version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd54745cfacb7b97dee45e8fdb91814b62bccddb481debb7de0f9ee6b7bf5b43"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"byteorder",
"heed-traits",
"heed-types",
@@ -9092,7 +9092,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"inotify-sys",
"libc",
]
@@ -9608,9 +9608,9 @@ checksum = "e2db585e1d738fc771bf08a151420d3ed193d9d895a36df7f6f8a9456b911ddc"
[[package]]
name = "kqueue"
-version = "1.1.1"
+version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+checksum = "273c0752728918e0ac4976f2b275b6fefb9ecd400585dec929419f3844cd87b5"
dependencies = [
"kqueue-sys",
"libc",
@@ -9618,11 +9618,11 @@ dependencies = [
[[package]]
name = "kqueue-sys"
-version = "1.0.4"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+checksum = "07293a4e297ac234359b510362495713f75ea345d5307140414f20c69ffeb087"
dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.13.1",
"libc",
]
@@ -10162,7 +10162,7 @@ version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"libc",
"redox_syscall 0.5.18",
]
@@ -10504,7 +10504,7 @@ version = "2.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6888e8653f6e49cb2924c660fc367a8beeb6239b71e117fa082153c6ea44d427"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"cssparser 0.36.0",
"encoding_rs",
@@ -11093,7 +11093,7 @@ version = "0.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block",
"core-graphics-types 0.2.0",
"foreign-types 0.5.0",
@@ -11152,7 +11152,7 @@ version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2e16d10087ae9e375bad7a40e8ef5504bc08e808ccc6019067ff9de42a84570f"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"debugid",
"num-derive",
"num-traits",
@@ -11167,7 +11167,7 @@ version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0e1fc14d6ded915b8e850801465e7096f77ed60bf87e4e85878d463720d9dc4d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"byteorder",
"cfg-if",
"crash-context",
@@ -11269,7 +11269,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]]
@@ -11369,7 +11369,7 @@ checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df"
dependencies = [
"arrayvec",
"bit-set 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"cfg_aliases 0.2.1",
"codespan-reporting",
@@ -11467,7 +11467,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"jni-sys",
"log",
"ndk-sys",
@@ -11513,7 +11513,7 @@ version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"cfg_aliases 0.1.1",
"libc",
@@ -11525,7 +11525,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"cfg_aliases 0.2.1",
"libc",
@@ -11538,7 +11538,7 @@ version = "0.30.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74523f3a35e05aba87a1d978330aef40f67b0304ac79c1c00b294c9830543db6"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"cfg_aliases 0.2.1",
"libc",
@@ -11626,7 +11626,7 @@ version = "6.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"crossbeam-channel",
"filetime",
"fsevent-sys",
@@ -11642,9 +11642,9 @@ dependencies = [
[[package]]
name = "notify"
version = "9.0.0-rc.4"
-source = "git+https://github.com/zed-industries/notify?rev=faecbc33db4f59313e5225ef766bfd9e54a54cfd#faecbc33db4f59313e5225ef766bfd9e54a54cfd"
+source = "git+https://github.com/zed-industries/notify?rev=0890bbb8ca40a4b5d1f67031698dd7918b37d991#0890bbb8ca40a4b5d1f67031698dd7918b37d991"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"inotify 0.11.0",
"kqueue",
"libc",
@@ -11686,9 +11686,9 @@ dependencies = [
[[package]]
name = "notify-types"
version = "2.1.0"
-source = "git+https://github.com/zed-industries/notify?rev=faecbc33db4f59313e5225ef766bfd9e54a54cfd#faecbc33db4f59313e5225ef766bfd9e54a54cfd"
+source = "git+https://github.com/zed-industries/notify?rev=0890bbb8ca40a4b5d1f67031698dd7918b37d991#0890bbb8ca40a4b5d1f67031698dd7918b37d991"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -11706,7 +11706,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]]
@@ -11988,7 +11988,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -12004,7 +12004,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-foundation 0.3.2",
@@ -12016,7 +12016,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"libc",
"objc2 0.6.3",
"objc2-core-audio",
@@ -12054,7 +12054,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a89f2ec274a0cf4a32642b2991e8b351a404d290da87bb6a9a9d8632490bd1c"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"objc2 0.6.3",
]
@@ -12064,7 +12064,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -12076,7 +12076,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"dispatch2",
"libc",
@@ -12127,7 +12127,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.5.1",
"libc",
"objc2 0.5.2",
@@ -12139,7 +12139,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"libc",
"objc2 0.6.3",
@@ -12162,7 +12162,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -12174,7 +12174,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"dispatch2",
"objc2 0.6.3",
@@ -12188,7 +12188,7 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.5.1",
"objc2 0.5.2",
"objc2-foundation 0.2.2",
@@ -12201,7 +12201,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"objc2 0.6.3",
"objc2-core-foundation",
"objc2-foundation 0.3.2",
@@ -12214,7 +12214,7 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"objc2 0.6.3",
"objc2-core-location",
@@ -12493,7 +12493,7 @@ version = "0.10.81"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cfg-if",
"foreign-types 0.3.2",
"libc",
@@ -13791,7 +13791,7 @@ version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"crc32fast",
"fdeflate",
"flate2",
@@ -14075,7 +14075,7 @@ version = "0.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"hex",
"serde",
]
@@ -14322,7 +14322,7 @@ source = "git+https://github.com/proptest-rs/proptest?rev=3dca198a8fef1b32e3a66f
dependencies = [
"bit-set 0.8.0",
"bit-vec 0.8.0",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"num-traits",
"proptest-macro",
"rand 0.9.4",
@@ -14538,7 +14538,7 @@ version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"memchr",
"pulldown-cmark-escape 0.10.1",
"unicase",
@@ -14550,7 +14550,7 @@ version = "0.12.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f86ba2052aebccc42cbbb3ed234b8b13ce76f75c3551a303cb2bcffcff12bb14"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"getopts",
"memchr",
"pulldown-cmark-escape 0.11.0",
@@ -14563,7 +14563,7 @@ version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"memchr",
"unicase",
]
@@ -15076,7 +15076,7 @@ version = "0.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -15085,7 +15085,7 @@ version = "0.7.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4666a1a60d8412eab19d94f6d13dcc9cea0a5ef4fdf6a5db306537413c661b1b"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -15858,7 +15858,7 @@ version = "0.38.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"errno 0.3.14",
"libc",
"linux-raw-sys 0.4.15",
@@ -15871,11 +15871,11 @@ version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"errno 0.3.14",
"libc",
"linux-raw-sys 0.11.0",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -16052,7 +16052,7 @@ version = "0.20.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"core_maths",
"log",
@@ -16380,7 +16380,7 @@ version = "0.1.0"
dependencies = [
"any_vec",
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"collections",
"db",
"editor",
@@ -16453,7 +16453,7 @@ version = "2.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.9.4",
"core-foundation-sys",
"libc",
@@ -16466,7 +16466,7 @@ version = "3.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.10.0",
"core-foundation-sys",
"libc",
@@ -16489,7 +16489,7 @@ version = "0.35.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93fdfed56cd634f04fe8b9ddf947ae3dc493483e819593d2ba17df9ad05db8b2"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cssparser 0.36.0",
"derive_more",
"log",
@@ -17341,7 +17341,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]]
@@ -17377,7 +17377,7 @@ version = "0.4.0+sdk-1.4.341.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9571ea910ebd84c86af4b3ed27f9dbdc6ad06f17c5f96146b2b671e2976744f"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -17538,7 +17538,7 @@ dependencies = [
"atoi",
"base64 0.22.1",
"bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"byteorder",
"bytes 1.11.1",
"chrono",
@@ -17585,7 +17585,7 @@ dependencies = [
"atoi",
"base64 0.22.1",
"bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"byteorder",
"chrono",
"crc",
@@ -18240,7 +18240,7 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"core-foundation 0.9.4",
"system-configuration-sys 0.6.0",
]
@@ -18284,7 +18284,7 @@ version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc4592f674ce18521c2a81483873a49596655b179f71c5e05d10c1fe66c78745"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cap-fs-ext",
"cap-std",
"fd-lock",
@@ -18471,7 +18471,7 @@ dependencies = [
"getrandom 0.3.4",
"once_cell",
"rustix 1.1.2",
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
]
[[package]]
@@ -19251,7 +19251,7 @@ version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytes 1.11.1",
"futures-core",
"futures-util",
@@ -19270,7 +19270,7 @@ version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytes 1.11.1",
"futures-util",
"http 1.3.1",
@@ -20296,7 +20296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5924018406ce0063cd67f8e008104968b74b563ee1b85dde3ed1f7cb87d3dbd"
dependencies = [
"arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"cursor-icon",
"log",
"memchr",
@@ -20577,7 +20577,7 @@ version = "0.201.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"indexmap 2.14.0",
"semver",
]
@@ -20588,7 +20588,7 @@ version = "0.227.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f51cad774fb3c9461ab9bccc9c62dfb7388397b5deda31bf40e8108ccd678b2"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"hashbrown 0.15.5",
"indexmap 2.14.0",
"semver",
@@ -20600,7 +20600,7 @@ version = "0.236.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"hashbrown 0.15.5",
"indexmap 2.14.0",
"semver",
@@ -20613,7 +20613,7 @@ version = "0.244.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"hashbrown 0.15.5",
"indexmap 2.14.0",
"semver",
@@ -20625,7 +20625,7 @@ version = "0.252.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d3eb099dcadcde5be9eef55e3a337128efd4e44b4c93122487e4d2e4e1c6627c"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"hashbrown 0.17.1",
"indexmap 2.14.0",
"semver",
@@ -20652,7 +20652,7 @@ dependencies = [
"addr2line",
"anyhow",
"async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bumpalo",
"cc",
"cfg-if",
@@ -20899,7 +20899,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fd4703351476262d715b72431e80d10289908e3494050071d6521267f522d97"
dependencies = [
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"heck 0.5.0",
"indexmap 2.14.0",
"wit-parser 0.236.1",
@@ -20913,7 +20913,7 @@ checksum = "21921b6e8e8ed876a288cb3b0b3aee68809fed8182ce26c9977ffc4af4cb77f6"
dependencies = [
"anyhow",
"async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytes 1.11.1",
"cap-fs-ext",
"cap-net-ext",
@@ -21004,7 +21004,7 @@ version = "0.31.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"rustix 1.1.2",
"wayland-backend",
"wayland-scanner",
@@ -21027,7 +21027,7 @@ version = "0.32.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"wayland-backend",
"wayland-client",
"wayland-scanner",
@@ -21039,7 +21039,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a07a14257c077ab3279987c4f8bb987851bf57081b93710381daea94f2c2c032"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -21052,7 +21052,7 @@ version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"wayland-backend",
"wayland-client",
"wayland-protocols",
@@ -21212,7 +21212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07"
dependencies = [
"arrayvec",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"cfg-if",
"cfg_aliases 0.2.1",
@@ -21244,7 +21244,7 @@ dependencies = [
"arrayvec",
"bit-set 0.9.1",
"bit-vec 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"cfg_aliases 0.2.1",
"document-features",
@@ -21305,7 +21305,7 @@ dependencies = [
"arrayvec",
"ash",
"bit-set 0.9.1",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"block2 0.6.2",
"bytemuck",
"cfg-if",
@@ -21365,7 +21365,7 @@ version = "29.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"bytemuck",
"js-sys",
"log",
@@ -21439,7 +21439,7 @@ checksum = "55a0751406b641ff50ef42d4a1ca843a03040c488c0c27f92093633447464013"
dependencies = [
"anyhow",
"async-trait",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"thiserror 2.0.17",
"tracing",
"wasmtime",
@@ -21494,7 +21494,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.52.0",
]
[[package]]
@@ -22332,7 +22332,7 @@ version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f3fd376f71958b862e7afb20cfe5a22830e1963462f3a17f49d82a6c1d1f42d"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"windows-sys 0.59.0",
]
@@ -22351,7 +22351,7 @@ version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "288f992ea30e6b5c531b52cdd5f3be81c148554b09ea416f058d16556ba92c27"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"wit-bindgen-rt 0.22.0",
"wit-bindgen-rust-macro 0.22.0",
]
@@ -22425,7 +22425,7 @@ version = "0.41.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4db52a11d4dfb0a59f194c064055794ee6564eb1ced88c25da2cf76e50c5621"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"futures 0.3.32",
"once_cell",
]
@@ -22527,7 +22527,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825"
dependencies = [
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"indexmap 2.14.0",
"log",
"serde",
@@ -22546,7 +22546,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "635c3adc595422cbf2341a17fb73a319669cc8d33deed3a48368a841df86b676"
dependencies = [
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"indexmap 2.14.0",
"log",
"serde",
@@ -22565,7 +22565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
dependencies = [
"anyhow",
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"indexmap 2.14.0",
"log",
"serde",
@@ -22883,7 +22883,7 @@ name = "xim-parser"
version = "0.2.1"
source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
]
[[package]]
@@ -23335,7 +23335,7 @@ name = "zed-font-kit"
version = "0.14.1-zed"
source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269"
dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.13.1",
"byteorder",
"core-foundation 0.10.0",
"core-graphics 0.24.0",
diff --git a/Cargo.toml b/Cargo.toml
index 2dcb410a8fe..5741492485d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -961,8 +961,8 @@ windows-capture = { git = "https://github.com/zed-industries/windows-capture.git
calloop = { git = "https://github.com/zed-industries/calloop" }
livekit = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
libwebrtc = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
-notify = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
-notify-types = { git = "https://github.com/zed-industries/notify", rev = "faecbc33db4f59313e5225ef766bfd9e54a54cfd" }
+notify = { git = "https://github.com/zed-industries/notify", rev = "0890bbb8ca40a4b5d1f67031698dd7918b37d991" }
+notify-types = { git = "https://github.com/zed-industries/notify", rev = "0890bbb8ca40a4b5d1f67031698dd7918b37d991" }
webrtc-sys = { git = "https://github.com/zed-industries/livekit-rust-sdks", rev = "d0e27be0cdad89eadab3e36207cda0a2b6e359ee" }
[profile.dev]
diff --git a/crates/fs/src/fs_watcher.rs b/crates/fs/src/fs_watcher.rs
index 99664ae7480..59ee6ac9847 100644
--- a/crates/fs/src/fs_watcher.rs
+++ b/crates/fs/src/fs_watcher.rs
@@ -1046,35 +1046,37 @@ impl GlobalWatcher {
}
fn ensure_native_watcher(&self) -> anyhow::Result<()> {
- if self.native_watcher.lock().is_some() {
- return Ok(());
+ // The lock is held across creation: with a check-then-insert under two
+ // separate lock acquisitions, concurrent callers could each create a
+ // watcher and the loser's insert would silently drop the winner's
+ // watcher along with every path registered on it.
+ let mut native_watcher = self.native_watcher.lock();
+ if native_watcher.is_none() {
+ // 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(
+ |event| global_watcher().enqueue(WatcherMode::Native, event),
+ config,
+ )?;
+ *native_watcher = Some(Box::new(watcher));
}
-
- // 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(
- |event| global_watcher().enqueue(WatcherMode::Native, event),
- config,
- )?;
- *self.native_watcher.lock() = Some(Box::new(watcher));
Ok(())
}
fn ensure_poll_watcher(&self) -> anyhow::Result<()> {
- if self.poll_watcher.lock().is_some() {
- return Ok(());
+ let mut poll_watcher = self.poll_watcher.lock();
+ if poll_watcher.is_none() {
+ let config = notify::Config::default().with_poll_interval(*POLL_INTERVAL);
+ let watcher = notify::PollWatcher::new(
+ |event| global_watcher().enqueue(WatcherMode::Poll, event),
+ config,
+ )?;
+ *poll_watcher = Some(Box::new(watcher));
}
-
- let config = notify::Config::default().with_poll_interval(*POLL_INTERVAL);
- let watcher = notify::PollWatcher::new(
- |event| global_watcher().enqueue(WatcherMode::Poll, event),
- config,
- )?;
- *self.poll_watcher.lock() = Some(Box::new(watcher));
Ok(())
}
}
diff --git a/crates/worktree/src/worktree.rs b/crates/worktree/src/worktree.rs
index 9ca1fa52abc..ee83eb65449 100644
--- a/crates/worktree/src/worktree.rs
+++ b/crates/worktree/src/worktree.rs
@@ -6379,10 +6379,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
};
// Use select to avoid blocking indefinitely if events are delayed
+ let mut ticks = 0;
while !file_exists() {
futures::select_biased! {
_ = events.next() => {}
- _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+ _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+ ticks += 1;
+ if ticks % SENTINEL_RETRY_TICKS == 0 {
+ retouch_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+ }
+ }
}
}
@@ -6399,10 +6405,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
};
// Use select to avoid blocking indefinitely if events are delayed
+ let mut ticks = 0;
while !file_gone() {
futures::select_biased! {
_ = events.next() => {}
- _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+ _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+ ticks += 1;
+ if ticks % SENTINEL_RETRY_TICKS == 0 {
+ retouch_and_remove_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+ }
+ }
}
}
@@ -6467,10 +6479,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
.unwrap();
// Use select to avoid blocking indefinitely if events are delayed
+ let mut ticks = 0;
while !tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
futures::select_biased! {
_ = events.next() => {}
- _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+ _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+ ticks += 1;
+ if ticks % SENTINEL_RETRY_TICKS == 0 {
+ retouch_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+ }
+ }
}
}
@@ -6479,10 +6497,16 @@ impl WorktreeModelHandle for Entity<Worktree> {
.unwrap();
// Use select to avoid blocking indefinitely if events are delayed
+ let mut ticks = 0;
while !tree.update(cx, |tree, _| scan_id_increased(tree, &mut git_dir_scan_id)) {
futures::select_biased! {
_ = events.next() => {}
- _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {}
+ _ = futures::FutureExt::fuse(cx.background_executor.timer(std::time::Duration::from_millis(10))) => {
+ ticks += 1;
+ if ticks % SENTINEL_RETRY_TICKS == 0 {
+ retouch_and_remove_sentinel(fs.as_ref(), &root_path.join(file_name)).await;
+ }
+ }
}
}
@@ -6493,6 +6517,41 @@ impl WorktreeModelHandle for Entity<Worktree> {
}
}
+#[cfg(feature = "test-support")]
+const SENTINEL_RETRY_TICKS: usize = 10;
+
+// On macOS an FS event can rarely be dropped while notify's shared FSEventStream
+// is being swapped out by a concurrent watch/unwatch: events already queued for
+// the old stream's callback are discarded when it is stopped. A dropped sentinel
+// event would park the test forever, so touch the sentinel again to emit a fresh
+// event on the current stream.
+#[cfg(feature = "test-support")]
+async fn retouch_sentinel(fs: &dyn Fs, abs_path: &std::path::Path) {
+ fs.create_file(
+ abs_path,
+ fs::CreateOptions {
+ overwrite: true,
+ ignore_if_exists: false,
+ },
+ )
+ .await
+ .unwrap();
+}
+
+#[cfg(feature = "test-support")]
+async fn retouch_and_remove_sentinel(fs: &dyn Fs, abs_path: &std::path::Path) {
+ retouch_sentinel(fs, abs_path).await;
+ fs.remove_file(
+ abs_path,
+ RemoveOptions {
+ recursive: false,
+ ignore_if_not_exists: true,
+ },
+ )
+ .await
+ .unwrap();
+}
+
#[derive(Clone, Debug)]
struct TraversalProgress<'a> {
max_path: &'a RelPath,