From ab665cd6615a67a0b63f5126e5cbdfcd23b1a5f0 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Sat, 18 Jul 2026 14:23:01 +0700 Subject: [PATCH] . --- Cargo.lock | 726 ++++++++++-------- Cargo.toml | 10 +- crates/auto_update/Cargo.toml | 6 +- crates/auto_update/src/lib.rs | 2 + crates/chat/Cargo.toml | 4 +- crates/chat/src/lib.rs | 8 +- crates/chat_ui/Cargo.toml | 7 +- crates/chat_ui/src/lib.rs | 3 + crates/common/Cargo.toml | 1 - crates/device/Cargo.toml | 5 +- crates/device/src/lib.rs | 3 +- crates/person/Cargo.toml | 1 - crates/relay_auth/Cargo.toml | 1 - crates/settings/Cargo.toml | 4 +- crates/settings/src/lib.rs | 16 +- crates/state/Cargo.toml | 15 +- crates/state/src/blossom.rs | 9 +- crates/state/src/lib.rs | 14 +- crates/state/src/nip05.rs | 2 +- crates/ui/Cargo.toml | 4 +- .../ui/src/input/display_map/display_map.rs | 7 +- crates/ui/src/list/list.rs | 6 +- crates/workspace/Cargo.toml | 2 - crates/workspace/src/dialogs/import.rs | 2 +- crates/workspace/src/dialogs/restore.rs | 2 +- desktop/Cargo.toml | 1 - desktop/src/main.rs | 3 - rust-toolchain.toml | 3 +- 28 files changed, 509 insertions(+), 358 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b54f02..a5fe820 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,6 +8,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3b7f7f85a7e5f68090000ed7622545829afd484d210358702ae4cb97dd0c320" dependencies = [ + "enumn", "uuid", ] @@ -46,13 +47,23 @@ dependencies = [ ] [[package]] -name = "accesskit_macos" -version = "0.26.2" +name = "accesskit_consumer" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cb8b66cef272d48161b02a6317cc2bdd5f98bb0a5e79c68f704a5862aa396b" +checksum = "5d10a236f96f87d70732e44520046785431ef01d5bcd6b041317bfadd2f88245" dependencies = [ "accesskit", - "accesskit_consumer 0.37.0", + "hashbrown 0.16.1", +] + +[[package]] +name = "accesskit_macos" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce02dc63b43f0c9296af9ac946312a2dc8814427d7a64d2d600971dac55b6076" +dependencies = [ + "accesskit", + "accesskit_consumer 0.38.0", "hashbrown 0.16.1", "objc2 0.5.2", "objc2-app-kit 0.2.2", @@ -303,9 +314,9 @@ dependencies = [ [[package]] name = "ashpd" -version = "0.13.12" +version = "0.13.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "281e6645758940dee594495e28807a7672ce40f11ebf4df6c22c4fcd59e2689f" +checksum = "fb8421aaa9644a5faf26735f258b669b15f063313ef8f8e2bdb28912a1a6f111" dependencies = [ "enumflags2", "futures-channel", @@ -644,9 +655,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.17.1" +version = "1.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad" +checksum = "00bdb5da18dac48ca2cc7cd4a98e533e8635a58e2361d13a1a4ee3888e0d72f1" dependencies = [ "aws-lc-sys", "zeroize", @@ -654,9 +665,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444" +checksum = "43103168cc76fe62678a375e722fc9cb3a0146159ac5828bc4f0dfd755c2224c" dependencies = [ "cc", "cmake", @@ -698,7 +709,7 @@ version = "0.71.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "cexpr", "clang-sys", "itertools 0.13.0", @@ -746,21 +757,20 @@ checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" [[package]] name = "bitcoin-consensus-encoding" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2d6094e2a1ba3c93b5a596fe5a10d1a10c3c6e06785cde89f693a044c01aa40" +checksum = "207311705279250ba465076a1bac4b1ac982855fff73fc5f67e22158ac58cdc9" dependencies = [ "bitcoin-internals", + "hex-conservative 1.2.0", + "serde", ] [[package]] name = "bitcoin-internals" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a30a22d1f112dde8e16be7b45c63645dc165cef254f835b3e1e9553e485cfa64" -dependencies = [ - "hex-conservative 0.3.2", -] +checksum = "d573f4cf32996a8dce612e4348cece65a241f1882ed594047c9ba348e8869fa5" [[package]] name = "bitcoin-io" @@ -790,9 +800,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.13.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" dependencies = [ "serde_core", ] @@ -872,9 +882,9 @@ dependencies = [ [[package]] name = "borsh" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f3f6da4992df95bbcd9af42a6c7dcb994498fc9048230405f3b36ff7cd3f145" +checksum = "a88b7ea17d208c4193f2c1e6de3c35fe71f98c96982d5ced308bdcc749ff6e1f" dependencies = [ "bytes", "cfg_aliases", @@ -882,9 +892,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.12.3" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" +checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530" dependencies = [ "memchr", "serde_core", @@ -910,18 +920,18 @@ checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" [[package]] name = "bytemuck" -version = "1.25.0" +version = "1.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8efb64bd706a16a1bdde310ae86b351e4d21550d98d056f22f8a7f7a2183fec" +checksum = "d6aedf8ae72766347502cf3cb4f41cf5e9cc37d28bee90f1fdaaae15f9cf9424" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.2" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" +checksum = "f65693059b6b9c588b9f62fed1cedbf0a8b805631457ea162d68f0de186f3de5" dependencies = [ "proc-macro2", "quote", @@ -961,7 +971,7 @@ version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4dbf9978365bac10f54d1d4b04f7ce4427e51f71d61f2fe15e3fed5166474df7" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "polling", "rustix 1.1.4", "slab", @@ -1009,9 +1019,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.66" +version = "1.2.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d6cac793997bd970000024b2934968efe83b382de4fdcf4fcb46b6ee4ad996" +checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" dependencies = [ "find-msvc-tools", "jobserver", @@ -1042,9 +1052,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "cfg_aliases" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" [[package]] name = "cgl" @@ -1190,9 +1200,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.6.1" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "dd059f9da4f5c36b3787f65d38ccaab1cc315f07b01f89abc8359ee6a8205011" dependencies = [ "clap_builder", "clap_derive", @@ -1200,9 +1210,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "f09628afdcc538b57f3c6341e9c8e9970f18e4a481690a64974d7023bd33548b" dependencies = [ "anstream", "anstyle", @@ -1265,10 +1275,10 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block", "cocoa-foundation 0.2.0", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics 0.24.0", "foreign-types", "libc", @@ -1295,9 +1305,9 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics-types 0.2.0", "libc", "objc", @@ -1317,7 +1327,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "gpui_util", "indexmap", @@ -1363,7 +1373,6 @@ dependencies = [ "qrcode", "regex", "smallvec", - "smol", ] [[package]] @@ -1405,9 +1414,9 @@ dependencies = [ [[package]] name = "console_log" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8aed40e4edbf4d3b4431ab260b63fdc40f5780a4766824329ea0f1eefe3c0f" +checksum = "86919cef3e37b9356ccf54d4421208c17ecfda01beae61393e7ffd72916c0ef1" dependencies = [ "log", "web-sys", @@ -1468,7 +1477,6 @@ dependencies = [ "gpui_windows", "itertools 0.13.0", "log", - "nostr-connect", "nostr-sdk", "oneshot", "person", @@ -1491,37 +1499,29 @@ dependencies = [ name = "coop_web" version = "1.0.0-beta5" dependencies = [ - "anyhow", "assets", "chat", "common", "console_error_panic_hook", "console_log", "device", - "futures", + "getrandom 0.2.17", + "getrandom 0.3.4", + "getrandom 0.4.3", "gpui", "gpui_platform", - "gpui_tokio", "gpui_web", - "itertools 0.13.0", "log", - "nostr-connect", "nostr-sdk", - "oneshot", "person", "relay_auth", - "serde", - "serde_json", "settings", - "smallvec", - "smol", "state", "theme", - "tracing-subscriber", + "tokio", "tracing-wasm", "ui", "wasm-bindgen", - "webbrowser", "workspace", ] @@ -1537,9 +1537,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" +checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" dependencies = [ "core-foundation-sys", "libc", @@ -1570,8 +1570,8 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ - "bitflags 2.13.0", - "core-foundation 0.10.0", + "bitflags 2.13.1", + "core-foundation 0.10.1", "core-graphics-types 0.2.0", "foreign-types", "libc", @@ -1583,7 +1583,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "core-foundation 0.9.4", "core-graphics-types 0.1.3", "foreign-types", @@ -1607,8 +1607,8 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ - "bitflags 2.13.0", - "core-foundation 0.10.0", + "bitflags 2.13.1", + "core-foundation 0.10.1", "libc", ] @@ -1618,10 +1618,10 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block", "cfg-if", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "libc", ] @@ -1631,7 +1631,7 @@ version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics 0.24.0", "foreign-types", "libc", @@ -1644,7 +1644,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "139679cc63eb9504bdbe37e37874b0247136177655f0008588781e90863afa62" dependencies = [ "block", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics2", "io-surface", "libc", @@ -1666,7 +1666,7 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be17b688510d934ce13f48a2beba700e11583e281e0fda99c22bb256a14eda73" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "fontdb", "harfrust", "linebender_resource_handle", @@ -1772,9 +1772,9 @@ dependencies = [ [[package]] name = "ctor" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb22e947478ccf9dc44d8922042c677a63fbb88f2cb468521d1145816e5087cb" +checksum = "a394189d59f9befacce833f337f7b1eca5e9a91221bcdd4d28e0114d96e597b3" dependencies = [ "link-section", "linktime-proc-macro", @@ -1801,6 +1801,12 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" +[[package]] +name = "deranged" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" + [[package]] name = "derive_more" version = "2.1.1" @@ -1827,7 +1833,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "proc-macro2", "quote", @@ -1933,7 +1939,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.6.2", "libc", "objc2 0.6.4", @@ -2022,7 +2028,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 1.1.2+spec-1.1.0", + "toml 1.1.3+spec-1.1.0", "vswhom", "winreg", ] @@ -2063,6 +2069,17 @@ dependencies = [ "syn", ] +[[package]] +name = "enumn" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "equator" version = "0.4.2" @@ -2152,9 +2169,9 @@ dependencies = [ [[package]] name = "exr" -version = "1.74.1" +version = "1.74.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be87932f10230a4339ab394edd8e4611fcb72553d8295b4d52ea55249b3daa5" +checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3" dependencies = [ "bit_field", "half", @@ -2230,7 +2247,7 @@ version = "25.12.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35f6839d7b3b98adde531effaf34f0c2badc6f4735d26fe74709d8e513a96ef3" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "rustc_version", ] @@ -2279,8 +2296,7 @@ checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095" dependencies = [ "futures-core", "futures-sink", - "nanorand", - "spin 0.9.8", + "spin 0.9.9", ] [[package]] @@ -2292,7 +2308,7 @@ dependencies = [ "fastrand", "futures-core", "futures-sink", - "spin 0.9.8", + "spin 0.9.9", ] [[package]] @@ -2322,6 +2338,15 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "font-types" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad67eced03f5504d9cbd3a879b5958b5c54d4e5fd794361c6eb21b05fb703411" +dependencies = [ + "bytemuck", +] + [[package]] name = "fontconfig-parser" version = "0.5.8" @@ -2635,9 +2660,9 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "globset" -version = "0.4.18" +version = "0.4.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" +checksum = "e47d37d2ae4464254884b60ab7071be2b876a9c35b696bd018ddcc76847309cd" dependencies = [ "aho-corasick", "bstr", @@ -2699,7 +2724,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "gpu-descriptor-types", "hashbrown 0.15.5", ] @@ -2710,27 +2735,27 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "accesskit", "anyhow", "async-channel", "async-task", "bindgen", - "bitflags 2.13.0", + "bitflags 2.13.1", "block", "cbindgen", "chrono", "cocoa 0.26.0", "cocoa-foundation 0.2.0", "collections", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", "core-text", @@ -2765,7 +2790,7 @@ dependencies = [ "pollster 0.4.0", "postage", "profiling", - "rand 0.9.4", + "rand 0.9.5", "raw-window-handle", "refineable", "regex", @@ -2777,7 +2802,7 @@ dependencies = [ "serde_json", "slotmap", "smallvec", - "spin 0.10.0", + "spin 0.10.1", "stacksafe", "strum", "sum_tree", @@ -2798,14 +2823,14 @@ dependencies = [ [[package]] name = "gpui_linux" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "accesskit", "accesskit_unix", "anyhow", "as-raw-xcb-connection", "ashpd", - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "calloop", "calloop-wayland-source", @@ -2820,6 +2845,7 @@ dependencies = [ "itertools 0.14.0", "libc", "log", + "notify-rust", "oo7", "open", "parking_lot", @@ -2849,17 +2875,18 @@ dependencies = [ [[package]] name = "gpui_macos" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "accesskit", "accesskit_macos", "anyhow", "async-task", "block", + "block2 0.6.2", "cbindgen", "cocoa 0.26.0", "collections", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "core-graphics 0.24.0", "core-text", @@ -2883,6 +2910,7 @@ dependencies = [ "objc2 0.6.4", "objc2-app-kit 0.3.2", "objc2-foundation 0.3.2", + "objc2-user-notifications", "parking_lot", "pathfinder_geometry", "raw-window-handle", @@ -2896,7 +2924,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2907,7 +2935,7 @@ dependencies = [ [[package]] name = "gpui_platform" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "console_error_panic_hook", "gpui", @@ -2920,7 +2948,7 @@ dependencies = [ [[package]] name = "gpui_shared_string" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "schemars", "serde", @@ -2930,7 +2958,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "gpui", @@ -2941,7 +2969,7 @@ dependencies = [ [[package]] name = "gpui_util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "log", @@ -2951,7 +2979,7 @@ dependencies = [ [[package]] name = "gpui_web" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "console_error_panic_hook", @@ -2975,7 +3003,7 @@ dependencies = [ [[package]] name = "gpui_wgpu" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "bytemuck", @@ -3004,7 +3032,7 @@ dependencies = [ [[package]] name = "gpui_windows" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "accesskit", "accesskit_windows", @@ -3019,7 +3047,7 @@ dependencies = [ "itertools 0.14.0", "log", "parking_lot", - "rand 0.9.4", + "rand 0.9.5", "raw-window-handle", "smallvec", "uuid", @@ -3072,7 +3100,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9da2e5ae821f6e96664977bf974d6d6a2d6682f9ccee23e62ec1d134246845f9" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "core_maths", "read-fonts 0.37.0", @@ -3158,7 +3186,7 @@ version = "0.20.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "byteorder", "heed-traits", "heed-types", @@ -3209,9 +3237,9 @@ dependencies = [ [[package]] name = "hex-conservative" -version = "0.3.2" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830e599c2904b08f0834ee6337d8fe8f0ed4a63b5d9e7a7f49c0ffa06d08d360" +checksum = "35431185f361ccf3ffc58254628af5f1f5d5f28531da2e02e5d6c82bbc282a10" dependencies = [ "arrayvec", ] @@ -3270,9 +3298,9 @@ dependencies = [ [[package]] name = "http-body" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "ca2a8f2913ee65f60facd6a5905613afaa448497a0230cc41ce022d93290bc2c" dependencies = [ "bytes", "http", @@ -3280,9 +3308,9 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "e9f41fd6a08e4d4ec69df65976da761afd5ad5e58a9d4acb46bd1c953a9e3ff2" dependencies = [ "bytes", "futures-core", @@ -3294,7 +3322,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "async-compression", @@ -3314,7 +3342,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3636,7 +3664,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" dependencies = [ "cgl", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "leaky-cow", ] @@ -3900,7 +3928,7 @@ version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "libc", "plain", "redox_syscall 0.9.0", @@ -3998,9 +4026,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a860605968fce16869fd239cf4237a82f3ac470723415db603b0e8b6c8d4fb9" +checksum = "0b6180140927ee907000b0aa540091f6ea512ead4447c92b8fc35bc72788a5a6" [[package]] name = "lru-slab" @@ -4073,6 +4101,20 @@ dependencies = [ "num-traits", ] +[[package]] +name = "mac-notification-sys" +version = "0.6.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd604973958ddcc11b561193c0fb96ba146506ef2f231ef2e7c35fd2cbc9beca" +dependencies = [ + "cc", + "log", + "objc2 0.6.4", + "objc2-foundation 0.3.2", + "time", + "uuid", +] + [[package]] name = "mach2" version = "0.5.0" @@ -4123,11 +4165,11 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "bindgen", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-video", "ctor", "foreign-types", @@ -4165,7 +4207,7 @@ version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block", "core-graphics-types 0.2.0", "foreign-types", @@ -4208,9 +4250,9 @@ dependencies = [ [[package]] name = "mio" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" +checksum = "30d65c71f1ce40ab09135ce117d742b9f8a19ff91a41a8b57ed50bc2de59c427" dependencies = [ "libc", "wasi", @@ -4235,7 +4277,7 @@ checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df" dependencies = [ "arrayvec", "bit-set", - "bitflags 2.13.0", + "bitflags 2.13.1", "cfg-if", "cfg_aliases", "codespan-reporting", @@ -4253,15 +4295,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "nanorand" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "ndk-context" version = "0.1.1" @@ -4326,9 +4359,8 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ - "aes", "base64", "bech32", "bip39", @@ -4351,7 +4383,7 @@ dependencies = [ [[package]] name = "nostr-blossom" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "base64", "nostr", @@ -4360,24 +4392,10 @@ dependencies = [ "serde", ] -[[package]] -name = "nostr-connect" -version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" -dependencies = [ - "async-utility", - "futures-core", - "nostr", - "nostr-sdk", - "opaquerr", - "tokio", - "tracing", -] - [[package]] name = "nostr-database" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "btreecap", "flatbuffers", @@ -4388,7 +4406,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "nostr", "opaquerr", @@ -4397,7 +4415,7 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "indexmap", "lru", @@ -4409,7 +4427,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "async-utility", "flume 0.12.0", @@ -4420,10 +4438,21 @@ dependencies = [ "tracing", ] +[[package]] +name = "nostr-memory" +version = "0.45.0-alpha.4" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" +dependencies = [ + "btreecap", + "nostr", + "nostr-database", + "tokio", +] + [[package]] name = "nostr-sdk" version = "0.45.0-alpha.4" -source = "git+https://github.com/rust-nostr/nostr#d909f46bb12389e46d55027a268acce478fd6f5a" +source = "git+https://github.com/rust-nostr/nostr#f564daaf4edd6279cd28f16ef8a017e912ef2ce9" dependencies = [ "async-utility", "async-wsocket", @@ -4441,6 +4470,20 @@ dependencies = [ "universal-time", ] +[[package]] +name = "notify-rust" +version = "4.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5b4c1b4f2aa9f25f63a7a49d3dd0ed567b3670da15330a66b29434be899b891" +dependencies = [ + "futures-lite", + "log", + "mac-notification-sys", + "serde", + "tauri-winrt-notification", + "zbus", +] + [[package]] name = "ntapi" version = "0.4.3" @@ -4494,7 +4537,7 @@ dependencies = [ "num-iter", "num-traits", "once_cell", - "rand 0.9.4", + "rand 0.9.5", "serde", "smallvec", "zeroize", @@ -4510,6 +4553,12 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-conv" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" + [[package]] name = "num-derive" version = "0.4.2" @@ -4623,7 +4672,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4639,7 +4688,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", @@ -4651,7 +4700,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4663,7 +4712,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "dispatch2", "objc2 0.6.4", ] @@ -4680,6 +4729,16 @@ dependencies = [ "objc2-metal 0.2.2", ] +[[package]] +name = "objc2-core-location" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009" +dependencies = [ + "objc2 0.6.4", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc2-encode" version = "4.1.0" @@ -4692,7 +4751,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.5.1", "libc", "objc2 0.5.2", @@ -4704,7 +4763,9 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", + "block2 0.6.2", + "libc", "objc2 0.6.4", "objc2-core-foundation", ] @@ -4715,7 +4776,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4727,7 +4788,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.6.2", "objc2 0.6.4", "objc2-foundation 0.3.2", @@ -4739,7 +4800,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.5.1", "objc2 0.5.2", "objc2-foundation 0.2.2", @@ -4752,13 +4813,26 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "objc2 0.6.4", "objc2-core-foundation", "objc2-foundation 0.3.2", "objc2-metal 0.3.2", ] +[[package]] +name = "objc2-user-notifications" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e" +dependencies = [ + "bitflags 2.13.1", + "block2 0.6.2", + "objc2 0.6.4", + "objc2-core-location", + "objc2-foundation 0.3.2", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -4853,9 +4927,9 @@ checksum = "e55a7b7f0accc9fdd8e514f122a697adf824d55de481ca26c31ff8f9a8e813c5" [[package]] name = "open" -version = "5.3.6" +version = "5.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d3b65c44123a56e0133d2cd06ce4361bd3ca99d41198b2f25e3c3db9b8b4a" +checksum = "a0b3d059e795d52b8a72fef45658620edd4d9c359b338564aa14391ffa511ed5" dependencies = [ "is-wsl", "libc", @@ -4991,7 +5065,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "collections", "serde", @@ -5009,7 +5083,6 @@ dependencies = [ "log", "nostr-sdk", "smallvec", - "smol", "state", "urlencoding", ] @@ -5025,7 +5098,7 @@ dependencies = [ "itertools 0.15.0", "proc-macro2", "quote", - "rand 0.8.6", + "rand 0.8.7", ] [[package]] @@ -5056,7 +5129,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ "phf_shared 0.11.3", - "rand 0.8.6", + "rand 0.8.7", ] [[package]] @@ -5187,7 +5260,7 @@ version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60769b8b31b2a9f263dae2776c37b1b28ae246943cf719eb6946a1db05128a61" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "crc32fast", "fdeflate", "flate2", @@ -5242,9 +5315,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "3d20d5497ef88037a52ff98267d066e7f11fcc5e99bbfbd58a42336193aacec3" [[package]] name = "portable-atomic-util" @@ -5281,6 +5354,12 @@ dependencies = [ "zerovec", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -5312,7 +5391,7 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.12+spec-1.1.0", + "toml_edit 0.25.13+spec-1.1.0", ] [[package]] @@ -5368,8 +5447,7 @@ dependencies = [ [[package]] name = "psm" version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645dbe486e346d9b5de3ef16ede18c26e6c70ad97418f4874b8b1889d6e761ea" +source = "git+https://github.com/rust-lang/stacker?branch=master#1d45da4653e1d6e5d273cf20e215b372d84ade5e" dependencies = [ "ar_archive_writer", "cc", @@ -5381,7 +5459,7 @@ version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f068eba8e7071c5f9511831b44f32c740d5adf574e990f946ddb53db2f314e" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "getopts", "memchr", "pulldown-cmark-escape", @@ -5544,9 +5622,9 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "22f6172bdec972074665ed81ed53b71da00bfc44b65a753cfde883ec4c702a1a" dependencies = [ "libc", "rand_chacha 0.3.1", @@ -5555,9 +5633,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" +checksum = "b9ef1d0d795eb7d84685bca4f72f3649f064e6641543d3a8c415898726a57b41" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.5", @@ -5666,7 +5744,7 @@ dependencies = [ "num-traits", "paste", "profiling", - "rand 0.9.4", + "rand 0.9.5", "rand_chacha 0.9.0", "simd_helpers", "thiserror 2.0.18", @@ -5695,7 +5773,7 @@ version = "11.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] @@ -5744,17 +5822,18 @@ checksum = "7b634fabf032fab15307ffd272149b622260f55974d9fad689292a5d33df02e5" dependencies = [ "bytemuck", "core_maths", - "font-types", + "font-types 0.11.3", ] [[package]] name = "read-fonts" -version = "0.39.2" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ed38b89c2c77ff968c524145ad65fb010f38af5c7a224b53b81d47ac2daa81" +checksum = "046a7d674daf459825b32f5062056d6882db0d2f5a479fbd76ccfc870ac18709" dependencies = [ "bytemuck", - "font-types", + "font-types 0.12.1", + "once_cell", ] [[package]] @@ -5769,7 +5848,7 @@ version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] @@ -5778,7 +5857,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5102a6aaa05aa011a238e178e6bca86d2cb56fc9f586d37cb80f5bca6e07759" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] @@ -5826,16 +5905,16 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "derive_refineable", ] [[package]] name = "regex" -version = "1.12.4" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -5845,9 +5924,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -5872,7 +5951,6 @@ dependencies = [ "nostr-sdk", "settings", "smallvec", - "smol", "state", "theme", "ui", @@ -5926,7 +6004,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "bytes", @@ -6074,7 +6152,7 @@ version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "errno", "libc", "linux-raw-sys 0.4.15", @@ -6087,7 +6165,7 @@ version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "errno", "libc", "linux-raw-sys 0.12.1", @@ -6096,9 +6174,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.41" +version = "0.23.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" +checksum = "3c54fcab019b409d04215d3a17cb438fd7fbf192ee61461f20f4fe18704bc138" dependencies = [ "aws-lc-rs", "log", @@ -6147,7 +6225,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-foundation-sys", "jni 0.21.1", "log", @@ -6192,7 +6270,7 @@ version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd3c7c96f8a08ee34eff8857b11b49b07d71d1c3f4e88f8a88d4c9e9f90b1702" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "core_maths", "log", @@ -6241,15 +6319,15 @@ dependencies = [ [[package]] name = "scheduler" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "async-task", "backtrace", "chrono", - "flume 0.11.1", + "flume 0.12.0", "futures", "parking_lot", - "rand 0.9.4", + "rand 0.9.5", "web-time", ] @@ -6357,8 +6435,8 @@ version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ - "bitflags 2.13.0", - "core-foundation 0.10.0", + "bitflags 2.13.1", + "core-foundation 0.10.1", "core-foundation-sys", "libc", "security-framework-sys", @@ -6376,9 +6454,9 @@ dependencies = [ [[package]] name = "self_cell" -version = "1.2.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b12e76d157a900eb52e81bc6e9f3069344290341720e9178cde2407113ac8d89" +checksum = "2ab42ca02749e120097e328d91d415325bdf43b1c72c4c8badf37375fe40a813" [[package]] name = "semver" @@ -6524,9 +6602,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +checksum = "a978451301f4db1d02937a4ab3ccce137717b81826e79b7d49ffe3244a13c3b8" dependencies = [ "cfg-if", "cpufeatures 0.2.17", @@ -6594,15 +6672,15 @@ dependencies = [ [[package]] name = "simd-adler32" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" +checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea" [[package]] name = "simd_cesu8" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" +checksum = "11031e251abf8611c80f460e19dbdeb54a66db918e49c65a7065b46ac7aec520" dependencies = [ "rustc_version", "simdutf8", @@ -6650,12 +6728,12 @@ dependencies = [ [[package]] name = "skrifa" -version = "0.42.1" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c34617370ae968efb7161bb2beb517d9084659aae19e24b89e3db25b46e4564" +checksum = "819ab7d62b1d3e72d9d9dea5650bac30424f9111364bb94928dbf5ecad1baa68" dependencies = [ "bytemuck", - "read-fonts 0.39.2", + "read-fonts 0.41.0", ] [[package]] @@ -6708,9 +6786,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.4" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" +checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", "windows-sys 0.61.2", @@ -6718,18 +6796,18 @@ dependencies = [ [[package]] name = "spin" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +checksum = "3763264f6b73151db08c50ff20d7d8a0b8796e021cdea7ceedad07b80155fa0e" dependencies = [ "lock_api", ] [[package]] name = "spin" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5fe4ccb98d9c292d56fec89a5e07da7fc4cf0dc11e156b41793132775d3e591" +checksum = "023a211cb3138dbc438680b32560ad89f699977624c9f8dbb95a47d5b4c07dd3" dependencies = [ "lock_api", ] @@ -6740,7 +6818,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.13.0", + "bitflags 2.13.1", ] [[package]] @@ -6790,15 +6868,16 @@ dependencies = [ "anyhow", "common", "flume 0.11.1", + "futures", "gpui", "gpui_tokio", "log", "mime_guess", "nostr", "nostr-blossom", - "nostr-connect", "nostr-gossip-memory", "nostr-lmdb", + "nostr-memory", "nostr-sdk", "petname", "rustls", @@ -6872,7 +6951,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "heapless 0.9.3", "log", @@ -6977,20 +7056,20 @@ dependencies = [ [[package]] name = "swash" -version = "0.2.9" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0811b01ca2c4e8718760713911feaf4675c24f94e50530a015ec646cfb622f7c" +checksum = "6c2499c2d826531388872b2268718aed907a39bd785ab0dcfe57fab26283f92e" dependencies = [ - "skrifa 0.42.1", + "skrifa 0.44.0", "yazi", "zeno", ] [[package]] name = "syn" -version = "2.0.118" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -7055,7 +7134,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "core-foundation 0.9.4", "system-configuration-sys", ] @@ -7072,9 +7151,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.10.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859" +checksum = "340a09581f29809fc0df82a3955501dc7f2a21f887e5d1c13dbe288fe1c0bef4" dependencies = [ "arrayvec", "grid", @@ -7094,6 +7173,17 @@ dependencies = [ "objc", ] +[[package]] +name = "tauri-winrt-notification" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed071c670382e85fc2f48ae706492d8c338f4f89bf72520d32f8abfe880aade" +dependencies = [ + "thiserror 2.0.18", + "windows 0.61.3", + "windows-version", +] + [[package]] name = "tempfile" version = "3.27.0" @@ -7172,9 +7262,9 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.9" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +checksum = "1ad99c4c6d32803332c548b1af0540b357b3f5fc0be8f6c6bfe8b2e6ae784070" dependencies = [ "cfg-if", ] @@ -7193,6 +7283,25 @@ dependencies = [ "zune-jpeg", ] +[[package]] +name = "time" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" +dependencies = [ + "deranged", + "num-conv", + "powerfmt", + "serde_core", + "time-core", +] + +[[package]] +name = "time-core" +version = "0.1.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" + [[package]] name = "tiny-keccak" version = "2.0.2" @@ -7240,9 +7349,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" +checksum = "bb4ebadaa0af04fab11ae01eb5f9fdb5f9c5b875506e210e71c07873528baa7f" dependencies = [ "tinyvec_macros", ] @@ -7255,9 +7364,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.52.3" +version = "1.53.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" +checksum = "d988bcd52dbe076d3d46903332f58c912b87a2c49b1428419a5845154762ffee" dependencies = [ "bytes", "libc", @@ -7279,9 +7388,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" +checksum = "6328af13490e73a9b4694030fafd93f8c8c6a9dede33e821c3fc63eddf8042ba" dependencies = [ "proc-macro2", "quote", @@ -7365,9 +7474,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.2+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee" +checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c" dependencies = [ "indexmap", "serde_core", @@ -7375,7 +7484,7 @@ dependencies = [ "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] @@ -7412,14 +7521,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.12+spec-1.1.0" +version = "0.25.13+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7" +checksum = "6975367e4d2ef766d86af01ffad14b622fecc8d4357a998fbc4deb6e9bacaf9b" dependencies = [ "indexmap", "toml_datetime 1.1.1+spec-1.1.0", "toml_parser", - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] @@ -7428,7 +7537,7 @@ version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ - "winnow 1.0.3", + "winnow 1.0.4", ] [[package]] @@ -7439,9 +7548,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.1.1+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756daf9b1013ebe47a8776667b466417e2d4c5679d441c26230efd9ef78692db" +checksum = "7d56353a2a665ad0f41a421187180aab746c8c325620617ad883a99a1cbe66d2" [[package]] name = "tower" @@ -7464,7 +7573,7 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bytes", "futures-util", "http", @@ -7563,9 +7672,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.26.10" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c343ed63e3f5c64d1acdecb5d2c13d4e169cb5fde0052106ebaa6c6f27f9e55" +checksum = "af1c71c1c4cc0920b20d6b0f6572e7682cd07a6a2faec71067a31fa394c586df" dependencies = [ "cc", "regex", @@ -7607,7 +7716,7 @@ dependencies = [ "http", "httparse", "log", - "rand 0.9.4", + "rand 0.9.5", "rustls", "rustls-pki-types", "sha1", @@ -7832,7 +7941,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "perf", "quote", @@ -7841,9 +7950,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.23.4" +version = "1.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" +checksum = "bf3923a6f5c4c6382e0b653c4117f48d631ea17f38ed86e2a828e6f7412f5239" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -7871,9 +7980,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] name = "value-bag" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0" +checksum = "5dd4ec1eb1d240636e354a30110a1dfcb37047169a4d9bd6d9d3469df574b5c4" dependencies = [ "value-bag-serde1", "value-bag-sval2", @@ -7881,9 +7990,9 @@ dependencies = [ [[package]] name = "value-bag-serde1" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16530907bfe2999a1773ca5900a65101e092c70f642f25cc23ca0c43573262c5" +checksum = "2a8e44fd7ce9cf838a1e2dad56d2d83f2b2435ae1df9cb3cac31e759e455e88d" dependencies = [ "erased-serde", "serde_core", @@ -7892,9 +8001,9 @@ dependencies = [ [[package]] name = "value-bag-sval2" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00ae130edd690eaa877e4f40605d534790d1cf1d651e7685bd6a144521b251f" +checksum = "3f9f1705b87b798b06a8d7a51f44ed0626eee413991555e8edfd3562b35a130d" dependencies = [ "sval", "sval_buffer", @@ -8077,7 +8186,7 @@ version = "0.31.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "645c7c96bb74690c3189b5c9cb4ca1627062bb23693a4fad9d8c3de958260144" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "rustix 1.1.4", "wayland-backend", "wayland-scanner", @@ -8100,7 +8209,7 @@ version = "0.32.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-scanner", @@ -8112,7 +8221,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -8125,7 +8234,7 @@ version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "wayland-backend", "wayland-client", "wayland-protocols", @@ -8181,7 +8290,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc95580916af1e68ff6a7be07446fc5db73ebf71cf092de939bbf5f7e189f72" dependencies = [ - "core-foundation 0.10.0", + "core-foundation 0.10.1", "jni 0.22.4", "log", "ndk-context", @@ -8240,7 +8349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07" dependencies = [ "arrayvec", - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "cfg-if", "cfg_aliases", @@ -8272,7 +8381,7 @@ dependencies = [ "arrayvec", "bit-set", "bit-vec", - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "cfg_aliases", "document-features", @@ -8333,7 +8442,7 @@ dependencies = [ "arrayvec", "ash", "bit-set", - "bitflags 2.13.0", + "bitflags 2.13.1", "block2 0.6.2", "bytemuck", "cfg-if", @@ -8393,7 +8502,7 @@ version = "29.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "bytemuck", "js-sys", "log", @@ -8859,6 +8968,15 @@ dependencies = [ "windows-link 0.2.1", ] +[[package]] +name = "windows-version" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4060a1da109b9d0326b7262c8e12c84df67cc0dbc9e33cf49e01ccc2eb63631" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -9050,9 +9168,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" dependencies = [ "memchr", ] @@ -9103,7 +9221,6 @@ dependencies = [ "indexset", "itertools 0.13.0", "log", - "nostr-connect", "nostr-sdk", "oneshot", "person", @@ -9112,7 +9229,6 @@ dependencies = [ "serde_json", "settings", "smallvec", - "smol", "state", "theme", "tracing-subscriber", @@ -9197,7 +9313,7 @@ name = "xim-parser" version = "0.2.1" source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", ] [[package]] @@ -9278,9 +9394,9 @@ dependencies = [ [[package]] name = "zbus" -version = "5.17.0" +version = "5.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28b97f866896a4be7aefd2b5a8e01bb6773d19a775d54ab28b4d094b9a4480e" +checksum = "fe18fb60dc696039e738717b76eaea21e7a4489bbb1885020b43c94236d7e98a" dependencies = [ "async-broadcast", "async-executor", @@ -9305,7 +9421,7 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 1.0.3", + "winnow 1.0.4", "zbus_macros", "zbus_names", "zvariant", @@ -9337,9 +9453,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.17.0" +version = "5.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e05ad887425eecf5e8384dc2406a4a9313eb73468712fc1cdea362eb4fe0469" +checksum = "fe96480bed92df2b442a1a30df364e12d08eed03aeb061f2b8dc6afb2be91119" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9352,23 +9468,23 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.3.3" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1039ca249fee9559680f3a9f05b55e0761fee51af4f6c1e7d8c1f31e549721d2" +checksum = "d8bf88b4a3ff53e883001e0e0115b297a9d53c31b9c1edd2bfdd853e3428624e" dependencies = [ "serde", - "winnow 1.0.3", + "winnow 1.0.4", "zvariant", ] [[package]] name = "zbus_xml" -version = "5.2.0" +version = "5.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ab0513c0a66a60a8718d5ad712a5094845a20d95b5c1c81e2bd8e904a52b4f" +checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a" dependencies = [ "serde", - "winnow 1.0.3", + "winnow 1.0.4", "zbus_names", "zvariant", ] @@ -9378,9 +9494,9 @@ name = "zed-font-kit" version = "0.14.1-zed" source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269" dependencies = [ - "bitflags 2.13.0", + "bitflags 2.13.1", "byteorder", - "core-foundation 0.10.0", + "core-foundation 0.10.1", "core-graphics 0.24.0", "core-text", "dirs 6.0.0", @@ -9456,7 +9572,7 @@ dependencies = [ "core-graphics-helmer-fork", "log", "objc", - "rand 0.8.6", + "rand 0.8.7", "screencapturekit", "screencapturekit-sys", "sysinfo", @@ -9583,7 +9699,7 @@ dependencies = [ [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "anyhow", "chrono", @@ -9593,14 +9709,14 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" dependencies = [ "tracing", "tracing-subscriber", @@ -9611,7 +9727,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#10504e3ce18bb1d2444baf1047fa4ea9835ff1cc" +source = "git+https://github.com/zed-industries/zed#9d7ab044366fb266cecb30b214aea8b7b94c032d" [[package]] name = "zune-core" @@ -9639,24 +9755,24 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.13.0" +version = "5.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cf057bb00bf5c9ad77abb6147b0ca4818236a1858416e9d988e40d6322fefa7" +checksum = "bee2a0bcd2a907786a456fff45aaaaf54c9ba5f50b71ae9ec1a4edd200c94911" dependencies = [ "endi", "enumflags2", "serde", "serde_bytes", - "winnow 1.0.3", + "winnow 1.0.4", "zvariant_derive", "zvariant_utils", ] [[package]] name = "zvariant_derive" -version = "5.13.0" +version = "5.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8118ca6bda77bfc0ab51d660db0c955f2505eef854c9a449435bccb616933b31" +checksum = "38a708216a18780796770bfe3f4739c7c83a3e8f789b755534bbbc06e4e23e12" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9675,5 +9791,5 @@ dependencies = [ "quote", "serde", "syn", - "winnow 1.0.3", + "winnow 1.0.4", ] diff --git a/Cargo.toml b/Cargo.toml index ca1839a..c9738f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,8 +19,8 @@ gpui_tokio = { git = "https://github.com/zed-industries/zed" } reqwest_client = { git = "https://github.com/zed-industries/zed" } # Nostr -nostr-lmdb = { git = "https://github.com/rust-nostr/nostr", } -nostr-connect = { git = "https://github.com/rust-nostr/nostr" } +nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" } +nostr-memory = { git = "https://github.com/rust-nostr/nostr" } nostr-blossom = { git = "https://github.com/rust-nostr/nostr" } nostr-gossip-memory = { git = "https://github.com/rust-nostr/nostr" } nostr-sdk = { git = "https://github.com/rust-nostr/nostr" } @@ -43,6 +43,12 @@ smol = "2" tracing = "0.1.40" webbrowser = "1.0.4" tracing-subscriber = { version = "0.3.18", features = ["fmt", "env-filter"] } +# Use errno stub for WASM +errno = { version = "0.3.14", default-features = false } + +[patch.crates-io] +# Use stacker's psm version which may have better WASM support +psm = { git = "https://github.com/rust-lang/stacker", branch = "master" } [profile.release] strip = true diff --git a/crates/auto_update/Cargo.toml b/crates/auto_update/Cargo.toml index 5533d42..eb38556 100644 --- a/crates/auto_update/Cargo.toml +++ b/crates/auto_update/Cargo.toml @@ -8,9 +8,7 @@ publish.workspace = true common = { path = "../common" } gpui.workspace = true -gpui_tokio.workspace = true anyhow.workspace = true -smol.workspace = true log.workspace = true smallvec.workspace = true serde = { workspace = true, features = ["derive"] } @@ -19,3 +17,7 @@ serde_json.workspace = true semver = "1.0.27" tempfile = "3.23.0" futures.workspace = true + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true +gpui_tokio.workspace = true diff --git a/crates/auto_update/src/lib.rs b/crates/auto_update/src/lib.rs index 596025d..b57f292 100644 --- a/crates/auto_update/src/lib.rs +++ b/crates/auto_update/src/lib.rs @@ -1,3 +1,5 @@ +#![cfg(not(target_arch = "wasm32"))] + use std::ffi::OsString; use std::path::{Path, PathBuf}; use std::sync::Arc; diff --git a/crates/chat/Cargo.toml b/crates/chat/Cargo.toml index a37256b..1d1e012 100644 --- a/crates/chat/Cargo.toml +++ b/crates/chat/Cargo.toml @@ -17,7 +17,6 @@ nostr-sdk.workspace = true anyhow.workspace = true itertools.workspace = true smallvec.workspace = true -smol.workspace = true log.workspace = true futures.workspace = true flume.workspace = true @@ -25,3 +24,6 @@ serde.workspace = true serde_json.workspace = true fuzzy-matcher = "0.3.7" + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true diff --git a/crates/chat/src/lib.rs b/crates/chat/src/lib.rs index a1c135a..8052b04 100644 --- a/crates/chat/src/lib.rs +++ b/crates/chat/src/lib.rs @@ -2,6 +2,8 @@ use std::cmp::Reverse; use std::collections::{BTreeSet, HashMap, HashSet}; use std::hash::{DefaultHasher, Hash, Hasher}; use std::sync::Arc; +#[cfg(target_arch = "wasm32")] +use std::sync::RwLock; use std::sync::atomic::{AtomicBool, Ordering}; use std::time::Duration; @@ -15,6 +17,7 @@ use gpui::{ }; use nostr_sdk::prelude::*; use smallvec::{SmallVec, smallvec}; +#[cfg(not(target_arch = "wasm32"))] use smol::lock::RwLock; use state::{DEVICE_GIFTWRAP, NostrRegistry, USER_GIFTWRAP}; @@ -318,9 +321,8 @@ impl ChatRegistry { let status = self.tracking.clone(); let tx = self.signal_tx.clone(); - self.tasks.push(cx.background_spawn(async move { + self.tasks.push(cx.spawn(async move |_, cx| { let loop_duration = Duration::from_secs(15); - loop { if status.load(Ordering::Acquire) { _ = status.compare_exchange(true, false, Ordering::Release, Ordering::Relaxed); @@ -328,7 +330,7 @@ impl ChatRegistry { } else { _ = tx.send_async(Signal::Eose).await; } - smol::Timer::after(loop_duration).await; + cx.background_executor().timer(loop_duration).await; } })); } diff --git a/crates/chat_ui/Cargo.toml b/crates/chat_ui/Cargo.toml index 658b111..b7dbe08 100644 --- a/crates/chat_ui/Cargo.toml +++ b/crates/chat_ui/Cargo.toml @@ -14,13 +14,10 @@ chat = { path = "../chat" } settings = { path = "../settings" } gpui.workspace = true -gpui_tokio.workspace = true - nostr-sdk.workspace = true anyhow.workspace = true itertools.workspace = true smallvec.workspace = true -smol.workspace = true flume.workspace = true log.workspace = true serde.workspace = true @@ -30,3 +27,7 @@ once_cell = "1.19.0" regex = "1" linkify = "0.10.0" pulldown-cmark = "0.13.1" + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true +gpui_tokio.workspace = true diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs index 624c6f5..9fc1164 100644 --- a/crates/chat_ui/src/lib.rs +++ b/crates/chat_ui/src/lib.rs @@ -1,5 +1,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::sync::Arc; +#[cfg(target_arch = "wasm32")] +use std::sync::RwLock; pub use actions::*; use anyhow::{Context as AnyhowContext, Error}; @@ -18,6 +20,7 @@ use nostr_sdk::prelude::*; use person::{Person, PersonRegistry}; use settings::{AppSettings, SignerKind}; use smallvec::{SmallVec, smallvec}; +#[cfg(not(target_arch = "wasm32"))] use smol::lock::RwLock; use state::{NostrRegistry, upload}; use theme::ActiveTheme; diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index 670e635..bec018d 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -13,7 +13,6 @@ anyhow.workspace = true itertools.workspace = true chrono.workspace = true smallvec.workspace = true -smol.workspace = true futures.workspace = true log.workspace = true diff --git a/crates/device/Cargo.toml b/crates/device/Cargo.toml index 4f4cf11..1b84189 100644 --- a/crates/device/Cargo.toml +++ b/crates/device/Cargo.toml @@ -14,12 +14,13 @@ settings = { path = "../settings" } gpui.workspace = true nostr-sdk.workspace = true - anyhow.workspace = true itertools.workspace = true smallvec.workspace = true -smol.workspace = true log.workspace = true flume.workspace = true serde.workspace = true serde_json.workspace = true + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true diff --git a/crates/device/src/lib.rs b/crates/device/src/lib.rs index 6aeb16c..d719216 100644 --- a/crates/device/src/lib.rs +++ b/crates/device/src/lib.rs @@ -265,12 +265,13 @@ impl DeviceRegistry { })); let announcement_existed = self.announcement_existed.clone(); + let executor = cx.background_executor().clone(); self.tasks.push(cx.spawn(async move |this, cx| { if !cx .background_spawn(async move { // Wait for 5 seconds - smol::Timer::after(Duration::from_secs(5)).await; + executor.timer(Duration::from_secs(5)).await; // Then check if the msg relays have been found if !announcement_existed.load(Ordering::Acquire) { diff --git a/crates/person/Cargo.toml b/crates/person/Cargo.toml index 8ce2e2b..9ba05ed 100644 --- a/crates/person/Cargo.toml +++ b/crates/person/Cargo.toml @@ -12,7 +12,6 @@ gpui.workspace = true nostr-sdk.workspace = true anyhow.workspace = true smallvec.workspace = true -smol.workspace = true flume.workspace = true log.workspace = true urlencoding = "2.1.3" diff --git a/crates/relay_auth/Cargo.toml b/crates/relay_auth/Cargo.toml index 1b88afd..d532a52 100644 --- a/crates/relay_auth/Cargo.toml +++ b/crates/relay_auth/Cargo.toml @@ -16,6 +16,5 @@ nostr-sdk.workspace = true anyhow.workspace = true smallvec.workspace = true -smol.workspace = true flume.workspace = true log.workspace = true diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index 3fcb518..21947ac 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -10,7 +10,6 @@ common = { path = "../common" } nostr-sdk.workspace = true gpui.workspace = true -smol.workspace = true anyhow.workspace = true log.workspace = true smallvec.workspace = true @@ -18,3 +17,6 @@ serde.workspace = true serde_json.workspace = true paste = "1.0.15" + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true diff --git a/crates/settings/src/lib.rs b/crates/settings/src/lib.rs index e450a1c..89e6080 100644 --- a/crates/settings/src/lib.rs +++ b/crates/settings/src/lib.rs @@ -229,13 +229,14 @@ impl AppSettings { /// Load settings fn load(&mut self, window: &mut Window, cx: &mut Context) { let task: Task> = cx.background_spawn(async move { - let path = config_dir().join(".settings"); - - if let Ok(content) = smol::fs::read_to_string(&path).await { - Ok(serde_json::from_str(&content)?) - } else { - Err(anyhow!("Not found")) + #[cfg(not(target_arch = "wasm32"))] + { + let path = config_dir().join(".settings"); + if let Ok(content) = smol::fs::read_to_string(&path).await { + return Ok(serde_json::from_str(&content)?); + } } + Err(anyhow!("Not found")) }); cx.spawn_in(window, async move |this, cx| { @@ -254,11 +255,10 @@ impl AppSettings { /// Save settings pub fn save(&mut self, cx: &mut Context) { let settings = self.inner.read(cx); - if let Ok(content) = serde_json::to_string(&settings) { + #[cfg(not(target_arch = "wasm32"))] cx.background_spawn(async move { let path = config_dir().join(".settings"); - // Write settings to file smol::fs::write(&path, content).await.ok(); }) .detach(); diff --git a/crates/state/Cargo.toml b/crates/state/Cargo.toml index f3384d7..5001eeb 100644 --- a/crates/state/Cargo.toml +++ b/crates/state/Cargo.toml @@ -9,22 +9,27 @@ common = { path = "../common" } nostr.workspace = true nostr-sdk.workspace = true -nostr-lmdb.workspace = true nostr-gossip-memory.workspace = true -nostr-connect.workspace = true nostr-blossom.workspace = true gpui.workspace = true -gpui_tokio.workspace = true -smol.workspace = true flume.workspace = true +futures.workspace = true log.workspace = true anyhow.workspace = true webbrowser.workspace = true serde.workspace = true serde_json.workspace = true -rustls = "0.23" petname = "2.0.2" whoami = "1.6.1" mime_guess = "2.0.4" + +[target.'cfg(target_arch = "wasm32")'.dependencies] +nostr-memory.workspace = true + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +nostr-lmdb.workspace = true +smol.workspace = true +gpui_tokio.workspace = true +rustls = "0.23" diff --git a/crates/state/src/blossom.rs b/crates/state/src/blossom.rs index 7994187..b162854 100644 --- a/crates/state/src/blossom.rs +++ b/crates/state/src/blossom.rs @@ -1,12 +1,14 @@ use std::path::PathBuf; -use anyhow::{anyhow, Error}; +use anyhow::{Error, anyhow}; use gpui::AsyncApp; +#[cfg(not(target_arch = "wasm32"))] use gpui_tokio::Tokio; use mime_guess::from_path; use nostr_blossom::prelude::*; use nostr_sdk::prelude::*; +#[cfg(not(target_arch = "wasm32"))] pub async fn upload(server: Url, path: PathBuf, cx: &AsyncApp) -> Result { let content_type = from_path(&path).first_or_octet_stream().to_string(); let data = smol::fs::read(path).await?; @@ -25,3 +27,8 @@ pub async fn upload(server: Url, path: PathBuf, cx: &AsyncApp) -> Result Result { + Err(anyhow!("File upload not supported on web")) +} diff --git a/crates/state/src/lib.rs b/crates/state/src/lib.rs index 7c92d98..3ca8d2c 100644 --- a/crates/state/src/lib.rs +++ b/crates/state/src/lib.rs @@ -4,9 +4,11 @@ use std::time::Duration; use anyhow::{Error, anyhow}; use common::config_dir; use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, SharedString, Task, Window}; -use nostr_connect::prelude::*; use nostr_gossip_memory::prelude::*; +#[cfg(not(target_arch = "wasm32"))] use nostr_lmdb::prelude::*; +#[cfg(target_arch = "wasm32")] +use nostr_memory::prelude::*; use nostr_sdk::prelude::*; mod blossom; @@ -23,11 +25,13 @@ pub fn init(window: &mut Window, cx: &mut App) { // rustls uses the `aws_lc_rs` provider by default // This only errors if the default provider has already // been installed. We can ignore this `Result`. + #[cfg(not(target_arch = "wasm32"))] rustls::crypto::aws_lc_rs::default_provider() .install_default() .ok(); // Initialize the tokio runtime + #[cfg(not(target_arch = "wasm32"))] gpui_tokio::init(cx); NostrRegistry::set_global(cx.new(|cx| NostrRegistry::new(window, cx)), cx); @@ -88,15 +92,19 @@ impl NostrRegistry { let signer = cx.new(|_| None); // Construct the nostr lmdb instance - let lmdb = cx.foreground_executor().block_on(async move { + #[cfg(not(target_arch = "wasm32"))] + let database = cx.foreground_executor().block_on(async move { NostrLmdb::open(config_dir().join("nostr")) .await .expect("Failed to initialize database") }); + #[cfg(target_arch = "wasm32")] + let database = MemoryDatabase::unbounded(); + // Construct the nostr client let client = ClientBuilder::default() - .database(lmdb) + .database(database) .gossip(NostrGossipMemory::unbounded()) .gossip_config(GossipConfig::default().no_background_refresh()) .connect_timeout(Duration::from_secs(10)) diff --git a/crates/state/src/nip05.rs b/crates/state/src/nip05.rs index afd3d65..5c46b52 100644 --- a/crates/state/src/nip05.rs +++ b/crates/state/src/nip05.rs @@ -1,9 +1,9 @@ use std::sync::Arc; use anyhow::Error; +use futures::io::AsyncReadExt; use gpui::http_client::{AsyncBody, HttpClient}; use nostr_sdk::prelude::*; -use smol::io::AsyncReadExt; #[allow(async_fn_in_trait)] pub trait NostrAddress { diff --git a/crates/ui/Cargo.toml b/crates/ui/Cargo.toml index a060255..1e6112c 100644 --- a/crates/ui/Cargo.toml +++ b/crates/ui/Cargo.toml @@ -9,7 +9,6 @@ common = { path = "../common" } theme = { path = "../theme" } gpui.workspace = true -smol.workspace = true serde.workspace = true serde_json.workspace = true smallvec.workspace = true @@ -25,3 +24,6 @@ lsp-types = "0.97.0" ropey = { version = "=2.0.0-beta.1", features = ["metric_lines_lf", "metric_utf16"] } sum_tree = { git = "https://github.com/zed-industries/zed" } tree-sitter = "0.26" + +[target.'cfg(not(target_arch = "wasm32"))'.dependencies] +smol.workspace = true diff --git a/crates/ui/src/input/display_map/display_map.rs b/crates/ui/src/input/display_map/display_map.rs index c40d6fc..bb19824 100644 --- a/crates/ui/src/input/display_map/display_map.rs +++ b/crates/ui/src/input/display_map/display_map.rs @@ -14,9 +14,9 @@ use super::folding::FoldRange; use super::text_wrapper::{LineItem, WrapDisplayPoint}; use super::wrap_map::WrapMap; use super::{BufferPoint, DisplayPoint}; +use crate::input::Point as TreeSitterPoint; use crate::input::display_map::WrapPoint; use crate::input::rope_ext::RopeExt as _; -use crate::input::Point as TreeSitterPoint; /// DisplayMap is the main interface for Editor/Input coordinate mapping. /// @@ -269,10 +269,7 @@ impl DisplayMap { /// Convert wrap display point to TreeSitterPoint (buffer line/col). #[inline] - pub(crate) fn wrap_display_point_to_point( - &self, - point: WrapDisplayPoint, - ) -> TreeSitterPoint { + pub(crate) fn wrap_display_point_to_point(&self, point: WrapDisplayPoint) -> TreeSitterPoint { self.wrap_map.wrapper().display_point_to_point(point) } diff --git a/crates/ui/src/list/list.rs b/crates/ui/src/list/list.rs index 5a14721..d0ab462 100644 --- a/crates/ui/src/list/list.rs +++ b/crates/ui/src/list/list.rs @@ -9,7 +9,6 @@ use gpui::{ SharedString, StatefulInteractiveElement, StyleRefinement, Styled, Subscription, Task, UniformListScrollHandle, Window, div, px, size, uniform_list, }; -use smol::Timer; use theme::ActiveTheme; use crate::actions::{Cancel, Confirm, SelectDown, SelectUp}; @@ -265,6 +264,7 @@ where } self.set_searching(true, window, cx); + let search = self.delegate.perform_search(&text, window, cx); if self.rows_cache.len() > 0 { @@ -273,6 +273,7 @@ where self._set_selected_index(None, window, cx); } + let executor = cx.background_executor().clone(); self._search_task = cx.spawn_in(window, async move |this, window| { search.await; @@ -282,7 +283,8 @@ where }); // Always wait 100ms to avoid flicker - Timer::after(Duration::from_millis(100)).await; + executor.timer(Duration::from_millis(100)).await; + _ = this.update_in(window, |this, window, cx| { this.set_searching(false, window, cx); }); diff --git a/crates/workspace/Cargo.toml b/crates/workspace/Cargo.toml index 668a930..dd1fc82 100644 --- a/crates/workspace/Cargo.toml +++ b/crates/workspace/Cargo.toml @@ -18,7 +18,6 @@ person = { path = "../person" } relay_auth = { path = "../relay_auth" } gpui.workspace = true -nostr-connect.workspace = true nostr-sdk.workspace = true anyhow.workspace = true serde.workspace = true @@ -26,7 +25,6 @@ serde_json.workspace = true itertools.workspace = true log.workspace = true smallvec.workspace = true -smol.workspace = true futures.workspace = true oneshot.workspace = true webbrowser.workspace = true diff --git a/crates/workspace/src/dialogs/import.rs b/crates/workspace/src/dialogs/import.rs index 0b690c6..775a8aa 100644 --- a/crates/workspace/src/dialogs/import.rs +++ b/crates/workspace/src/dialogs/import.rs @@ -6,7 +6,7 @@ use gpui::{ AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, Window, div, }; -use nostr_connect::prelude::*; +use nostr_sdk::prelude::*; use state::NostrRegistry; use theme::ActiveTheme; use ui::button::{Button, ButtonVariants}; diff --git a/crates/workspace/src/dialogs/restore.rs b/crates/workspace/src/dialogs/restore.rs index 1577541..b51424b 100644 --- a/crates/workspace/src/dialogs/restore.rs +++ b/crates/workspace/src/dialogs/restore.rs @@ -7,7 +7,7 @@ use gpui::{ AppContext, Context, Entity, IntoElement, ParentElement, Render, SharedString, Styled, Subscription, Task, Window, div, }; -use nostr_connect::prelude::*; +use nostr_sdk::prelude::*; use theme::ActiveTheme; use ui::button::{Button, ButtonVariants}; use ui::input::{Input, InputEvent, InputState}; diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index bf12d2a..b5627d7 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -49,7 +49,6 @@ gpui_macos.workspace = true gpui_tokio.workspace = true reqwest_client.workspace = true -nostr-connect.workspace = true nostr-sdk.workspace = true anyhow.workspace = true diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 6fe518d..44b0970 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -66,9 +66,6 @@ fn main() { cx.activate(true); cx.new(|cx| { - // Initialize the tokio runtime - gpui_tokio::init(cx); - // Initialize components ui::init(cx); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 65beb3c..74544e8 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -10,5 +10,6 @@ targets = [ "aarch64-pc-windows-msvc", "aarch64-apple-ios", "aarch64-linux-android", - "wasm32-unknown-unknown" + "wasm32-unknown-unknown", + "wasm32-wasip2" ]