From 0ccf1b43c43bf294f6fb6c11e740a3d03ea50803 Mon Sep 17 00:00:00 2001 From: reya Date: Sat, 10 Jan 2026 09:26:19 +0700 Subject: [PATCH] chore: update deps --- Cargo.lock | 225 ++++++++++++------------- crates/auto_update/src/lib.rs | 8 +- crates/chat_ui/src/lib.rs | 24 +-- crates/coop/src/actions.rs | 3 +- crates/coop/src/new_identity/backup.rs | 6 +- crates/coop/src/new_identity/mod.rs | 14 +- crates/coop/src/user/mod.rs | 11 +- crates/key_store/src/backend.rs | 6 +- crates/ui/src/dock_area/tab_panel.rs | 28 ++- crates/ui/src/input/blink_cursor.rs | 5 +- 10 files changed, 157 insertions(+), 173 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94b019f..8880fd6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -114,7 +114,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -367,7 +367,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -443,7 +443,7 @@ checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -632,7 +632,7 @@ dependencies = [ "regex", "rustc-hash 2.1.1", "shlex", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -749,7 +749,7 @@ source = "git+https://github.com/kvark/blade?rev=e3cf011ca18a6dfd907d1dedd93e85e dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -854,7 +854,7 @@ checksum = "f9abbd1bc6865053c427f7198e6af43bfdedc55ab791faed4fbd361d789575ff" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -922,16 +922,16 @@ dependencies = [ "quote", "serde", "serde_json", - "syn 2.0.113", + "syn 2.0.114", "tempfile", "toml 0.8.23", ] [[package]] name = "cc" -version = "1.2.51" +version = "1.2.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0aeaff4ff1a90589618835a598e545176939b97874f7abc7851caa0618f203" +checksum = "cd4932aefd12402b36c60956a4fe0035421f544799057659ff86f923657aada3" dependencies = [ "find-msvc-tools", "jobserver", @@ -1173,7 +1173,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1594,17 +1594,17 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -1683,7 +1683,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -1773,7 +1773,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.9.10+spec-1.1.0", + "toml 0.9.11+spec-1.1.0", "vswhom", "winreg", ] @@ -1820,7 +1820,7 @@ checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -1840,7 +1840,7 @@ checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -1963,7 +1963,7 @@ checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -2009,9 +2009,9 @@ dependencies = [ [[package]] name = "find-msvc-tools" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "645cbb3a84e60b7531617d5ae4e57f7e27308f6445f5abf653209ea76dec8dff" +checksum = "f449e6c6c08c865631d4890cfacf252b3d396c9bcc83adb6623cdb02a8336c41" [[package]] name = "flatbuffers" @@ -2157,7 +2157,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -2311,7 +2311,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -2486,7 +2486,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.2.2" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2587,18 +2587,18 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "gpui", @@ -2820,7 +2820,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "async-compression", @@ -2845,7 +2845,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3112,9 +3112,9 @@ checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8" [[package]] name = "indexmap" -version = "2.12.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad4bb2b565bca0645f4d68c5c9af97fba094e9791da685bf83cb5f3ce74acf2" +checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017" dependencies = [ "equivalent", "hashbrown 0.16.1", @@ -3124,9 +3124,9 @@ dependencies = [ [[package]] name = "indexset" -version = "0.12.3" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff794cab64c942437d60272e215f923d466b23dfa6c999cdd0cafe5b6d170805" +checksum = "ceb59e93f24cfa0ebb2d19943356df8d4217ef0b291cc3db969f280498aadbd2" dependencies = [ "ftree", ] @@ -3158,7 +3158,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -3361,9 +3361,9 @@ checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" [[package]] name = "libc" -version = "0.2.179" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5a2d376baa530d1238d133232d15e239abad80d05838b4b59354e5268af431f" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libfuzzer-sys" @@ -3484,9 +3484,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.16.2" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f" +checksum = "a1dc47f592c06f33f8e3aea9591776ec7c9f9e4124778ff8a3c3b87159f7e593" [[package]] name = "lru-slab" @@ -3606,7 +3606,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "bindgen", @@ -3816,7 +3816,6 @@ dependencies = [ "cfg-if", "cfg_aliases", "libc", - "memoffset", ] [[package]] @@ -3847,7 +3846,7 @@ checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" [[package]] name = "nostr" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "aes", "base64", @@ -3872,7 +3871,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "async-utility", "nostr", @@ -3884,7 +3883,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "btreecap", "flatbuffers", @@ -3896,7 +3895,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "nostr", ] @@ -3904,7 +3903,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "async-utility", "flume", @@ -3918,7 +3917,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.44.0" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "async-utility", "async-wsocket", @@ -3935,7 +3934,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.44.1" -source = "git+https://github.com/rust-nostr/nostr#3fc1b32732909cc388d10e6cb2f4904e0abfdb2c" +source = "git+https://github.com/rust-nostr/nostr#4767ad138ed47b49584cdc3cea9cccf69f283be5" dependencies = [ "async-utility", "nostr", @@ -4022,7 +4021,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4299,7 +4298,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4458,7 +4457,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" [[package]] name = "perf" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "collections", "serde", @@ -4510,7 +4509,7 @@ dependencies = [ "phf_shared", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4545,7 +4544,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4676,7 +4675,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" dependencies = [ "proc-macro2", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4707,7 +4706,7 @@ dependencies = [ "proc-macro-error-attr2", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -4735,7 +4734,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b" dependencies = [ "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -5087,13 +5086,13 @@ checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "derive_refineable", ] @@ -5192,7 +5191,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "bytes", @@ -5246,7 +5245,7 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "arrayvec", "log", @@ -5284,7 +5283,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.113", + "syn 2.0.114", "walkdir", ] @@ -5539,7 +5538,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -5693,7 +5692,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -5704,7 +5703,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -5751,7 +5750,7 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6010,7 +6009,7 @@ checksum = "172175341049678163e979d9107ca3508046d4d2a7c6682bee46ac541b17db69" dependencies = [ "proc-macro-error2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6071,7 +6070,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6083,7 +6082,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6095,7 +6094,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "arrayvec", "log", @@ -6222,9 +6221,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.113" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678faa00651c9eb72dd2020cbdf275d92eccb2400d568e419efdd64838145cb4" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", @@ -6257,7 +6256,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6407,7 +6406,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6418,7 +6417,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6544,7 +6543,7 @@ checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -6622,9 +6621,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.10+spec-1.1.0" +version = "0.9.11+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0825052159284a1a8b4d6c0c86cbc801f2da5afd2b225fa548c72f2e74002f48" +checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46" dependencies = [ "indexmap", "serde_core", @@ -6765,7 +6764,7 @@ checksum = "7490cfa5ec963746568740651ac6781f701c9c5ea257c58e057f3ba8cf69e8da" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -7053,7 +7052,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "async-fs", @@ -7089,11 +7088,11 @@ dependencies = [ [[package]] name = "util_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "perf", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -7285,7 +7284,7 @@ dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", "wasm-bindgen-shared", ] @@ -7643,7 +7642,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -7654,7 +7653,7 @@ checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -7665,7 +7664,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -7676,7 +7675,7 @@ checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -8289,15 +8288,15 @@ checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", "synstructure", ] [[package]] name = "zbus" -version = "5.12.0" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b622b18155f7a93d1cd2dc8c01d2d6a44e08fb9ebb7b3f9e6ed101488bad6c91" +checksum = "7515214ab069b46f614dee52c1256015cdc1a0b441ed612118e2871014956741" dependencies = [ "async-broadcast", "async-executor", @@ -8313,8 +8312,9 @@ dependencies = [ "futures-core", "futures-lite 2.6.1", "hex", - "nix 0.30.1", + "libc", "ordered-stream", + "rustix 1.1.3", "serde", "serde_repr", "tracing", @@ -8329,14 +8329,14 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "5.12.0" +version = "5.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cdb94821ca8a87ca9c298b5d1cbd80e2a8b67115d99f6e4551ac49e42b6a314" +checksum = "04f54d8a5b4e9c46cf4a9732da4899b12851b5df952fc8deda23aca1d6f3e26c" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", "zbus_names", "zvariant", "zvariant_utils", @@ -8344,12 +8344,11 @@ dependencies = [ [[package]] name = "zbus_names" -version = "4.2.0" +version = "4.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97" +checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f" dependencies = [ "serde", - "static_assertions", "winnow", "zvariant", ] @@ -8469,22 +8468,22 @@ checksum = "6df3dc4292935e51816d896edcd52aa30bc297907c26167fec31e2b0c6a32524" [[package]] name = "zerocopy" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd74ec98b9250adb3ca554bdde269adf631549f51d8a8f8f0a10b50f1cb298c3" +checksum = "668f5168d10b9ee831de31933dc111a459c97ec93225beb307aed970d1372dfd" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.31" +version = "0.8.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8a8d209fdf45cf5138cbb5a506f6b52522a25afccc534d1475dad8e31105c6a" +checksum = "2c7962b26b0a8685668b671ee4b54d007a67d4eaf05fda79ac0ecf41e32270f1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -8504,7 +8503,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", "synstructure", ] @@ -8525,7 +8524,7 @@ checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] @@ -8558,13 +8557,13 @@ checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", ] [[package]] name = "zlog" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "anyhow", "chrono", @@ -8581,7 +8580,7 @@ checksum = "2fc5a66a20078bf1251bde995aa2fdcc4b800c70b5d92dd2c62abc5c60f679f8" [[package]] name = "ztracing" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" dependencies = [ "tracing", "tracing-subscriber", @@ -8592,7 +8591,7 @@ dependencies = [ [[package]] name = "ztracing_macro" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#189241bf74da9fd5a7fdf3cfce09ae7f0b59b6ef" +source = "git+https://github.com/zed-industries/zed#93e3a3907723672f2df885e583a5040565930786" [[package]] name = "zune-core" @@ -8635,9 +8634,9 @@ dependencies = [ [[package]] name = "zvariant" -version = "5.8.0" +version = "5.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2be61892e4f2b1772727be11630a62664a1826b62efa43a6fe7449521cb8744c" +checksum = "788ca131e3757991e4b9fe9f7b78ae302749ed96093ff60858a1f4732b04b164" dependencies = [ "endi", "enumflags2", @@ -8650,26 +8649,26 @@ dependencies = [ [[package]] name = "zvariant_derive" -version = "5.8.0" +version = "5.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da58575a1b2b20766513b1ec59d8e2e68db2745379f961f86650655e862d2006" +checksum = "0e69a2f6b221a6fec9bd6bcc77c19360cca106f92a5fd948b8aa17d2339c7505" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.113", + "syn 2.0.114", "zvariant_utils", ] [[package]] name = "zvariant_utils" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599" +checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9" dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.113", + "syn 2.0.114", "winnow", ] diff --git a/crates/auto_update/src/lib.rs b/crates/auto_update/src/lib.rs index a6bc986..de57b71 100644 --- a/crates/auto_update/src/lib.rs +++ b/crates/auto_update/src/lib.rs @@ -253,12 +253,10 @@ impl AutoUpdater { } fn check_for_updates(version: Version, cx: &AsyncApp) -> Task, Error>> { - let Ok(client) = cx.update(|cx| { + let client = cx.update(|cx| { let nostr = NostrRegistry::global(cx); nostr.read(cx).client() - }) else { - return Task::ready(Err(anyhow!("Entity has been released"))); - }; + }); cx.background_spawn(async move { let opts = SubscribeAutoCloseOptions::default().exit_policy(ReqExitPolicy::ExitOnEOSE); @@ -416,7 +414,7 @@ async fn install_release_macos( downloaded_dmg: PathBuf, cx: &AsyncApp, ) -> Result<(), Error> { - let running_app_path = cx.update(|cx| cx.app_path())??; + let running_app_path = cx.update(|cx| cx.app_path())?; let running_app_filename = running_app_path .file_name() .with_context(|| format!("invalid running app path {running_app_path:?}"))?; diff --git a/crates/chat_ui/src/lib.rs b/crates/chat_ui/src/lib.rs index 86baaf4..f1e6900 100644 --- a/crates/chat_ui/src/lib.rs +++ b/crates/chat_ui/src/lib.rs @@ -7,10 +7,10 @@ use common::{nip96_upload, RenderedTimestamp}; use gpui::prelude::FluentBuilder; use gpui::{ div, img, list, px, red, relative, rems, svg, white, AnyElement, App, AppContext, - ClipboardItem, Context, Entity, EventEmitter, Flatten, FocusHandle, Focusable, - InteractiveElement, IntoElement, ListAlignment, ListOffset, ListState, MouseButton, ObjectFit, - ParentElement, PathPromptOptions, Render, RetainAllImageCache, SharedString, - StatefulInteractiveElement, Styled, StyledImage, Subscription, Task, WeakEntity, Window, + ClipboardItem, Context, Entity, EventEmitter, FocusHandle, Focusable, InteractiveElement, + IntoElement, ListAlignment, ListOffset, ListState, MouseButton, ObjectFit, ParentElement, + PathPromptOptions, Render, RetainAllImageCache, SharedString, StatefulInteractiveElement, + Styled, StyledImage, Subscription, Task, WeakEntity, Window, }; use gpui_tokio::Tokio; use indexset::{BTreeMap, BTreeSet}; @@ -446,25 +446,19 @@ impl ChatPanel { Some(url) }); - if let Ok(task) = upload { + if let Ok(task) = upload.await { this.update(cx, |this, cx| { this.set_uploading(true, cx); }) .ok(); - let result = Flatten::flatten(task.await.map_err(|e| e.into())); - - this.update_in(cx, |this, window, cx| { - match result { - Ok(Some(url)) => { + this.update_in(cx, |this, _window, cx| { + match task { + Some(url) => { this.add_attachment(url, cx); this.set_uploading(false, cx); } - Ok(None) => { - this.set_uploading(false, cx); - } - Err(e) => { - window.push_notification(Notification::error(e.to_string()), cx); + None => { this.set_uploading(false, cx); } }; diff --git a/crates/coop/src/actions.rs b/crates/coop/src/actions.rs index 0a189bb..16bc4c6 100644 --- a/crates/coop/src/actions.rs +++ b/crates/coop/src/actions.rs @@ -83,8 +83,7 @@ pub fn reset(cx: &mut App) { cx.update(|cx| { cx.restart(); - }) - .ok(); + }); }) .detach(); } diff --git a/crates/coop/src/new_identity/backup.rs b/crates/coop/src/new_identity/backup.rs index 2bedb0d..36858db 100644 --- a/crates/coop/src/new_identity/backup.rs +++ b/crates/coop/src/new_identity/backup.rs @@ -3,8 +3,8 @@ use std::time::Duration; use anyhow::{anyhow, Error}; use common::home_dir; use gpui::{ - div, App, AppContext, ClipboardItem, Context, Entity, Flatten, IntoElement, ParentElement, - Render, SharedString, Styled, Task, Window, + div, App, AppContext, ClipboardItem, Context, Entity, IntoElement, ParentElement, Render, + SharedString, Styled, Task, Window, }; use nostr_sdk::prelude::*; use smallvec::{smallvec, SmallVec}; @@ -60,7 +60,7 @@ impl Backup { let nsec = self.secret_input.read(cx).value().to_string(); cx.spawn_in(window, async move |this, cx| { - match Flatten::flatten(path.await.map_err(|e| e.into())) { + match path.await { Ok(Ok(Some(path))) => { if let Err(e) = smol::fs::write(&path, nsec).await { this.update_in(cx, |this, window, cx| { diff --git a/crates/coop/src/new_identity/mod.rs b/crates/coop/src/new_identity/mod.rs index 3fe9823..6d2ad62 100644 --- a/crates/coop/src/new_identity/mod.rs +++ b/crates/coop/src/new_identity/mod.rs @@ -1,9 +1,8 @@ use anyhow::{anyhow, Error}; use common::{default_nip17_relays, default_nip65_relays, nip96_upload, BOOTSTRAP_RELAYS}; use gpui::{ - rems, AnyElement, App, AppContext, Context, Entity, EventEmitter, Flatten, FocusHandle, - Focusable, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task, - Window, + rems, AnyElement, App, AppContext, Context, Entity, EventEmitter, FocusHandle, Focusable, + IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task, Window, }; use gpui_tokio::Tokio; use key_store::{KeyItem, KeyStore}; @@ -221,8 +220,8 @@ impl NewAccount { }); let task = Tokio::spawn(cx, async move { - match Flatten::flatten(paths.await.map_err(|e| e.into())) { - Ok(Some(mut paths)) => { + match paths.await { + Ok(Ok(Some(mut paths))) => { if let Some(path) = paths.pop() { let file = fs::read(path).await?; let url = nip96_upload(&client, &nip96_server, file).await?; @@ -232,13 +231,12 @@ impl NewAccount { Err(anyhow!("Path not found")) } } - Ok(None) => Err(anyhow!("User cancelled")), - Err(e) => Err(anyhow!("File dialog error: {e}")), + _ => Err(anyhow!("Error")), } }); cx.spawn_in(window, async move |this, cx| { - let result = Flatten::flatten(task.await.map_err(|e| e.into())); + let result = task.await; this.update_in(cx, |this, window, cx| { match result { diff --git a/crates/coop/src/user/mod.rs b/crates/coop/src/user/mod.rs index 7d606c4..cb76374 100644 --- a/crates/coop/src/user/mod.rs +++ b/crates/coop/src/user/mod.rs @@ -5,7 +5,7 @@ use anyhow::{anyhow, Error}; use common::{nip96_upload, shorten_pubkey}; use gpui::prelude::FluentBuilder; use gpui::{ - div, img, App, AppContext, ClipboardItem, Context, Entity, Flatten, IntoElement, ParentElement, + div, img, App, AppContext, ClipboardItem, Context, Entity, IntoElement, ParentElement, PathPromptOptions, Render, SharedString, Styled, Task, Window, }; use gpui_tokio::Tokio; @@ -194,8 +194,8 @@ impl UserProfile { }); let task = Tokio::spawn(cx, async move { - match Flatten::flatten(paths.await.map_err(|e| e.into())) { - Ok(Some(mut paths)) => { + match paths.await { + Ok(Ok(Some(mut paths))) => { if let Some(path) = paths.pop() { let file = fs::read(path).await?; let url = nip96_upload(&client, &nip96_server, file).await?; @@ -205,13 +205,12 @@ impl UserProfile { Err(anyhow!("Path not found")) } } - Ok(None) => Err(anyhow!("User cancelled")), - Err(e) => Err(anyhow!("File dialog error: {e}")), + _ => Err(anyhow!("Error")), } }); cx.spawn_in(window, async move |this, cx| { - let result = Flatten::flatten(task.await.map_err(|e| e.into())); + let result = task.await; this.update_in(cx, |this, window, cx| { match result { diff --git a/crates/key_store/src/backend.rs b/crates/key_store/src/backend.rs index bc1cebc..6e83dd7 100644 --- a/crates/key_store/src/backend.rs +++ b/crates/key_store/src/backend.rs @@ -96,7 +96,7 @@ impl KeyBackend for KeyringProvider { url: &'a str, cx: &'a AsyncApp, ) -> Pin)>>> + 'a>> { - async move { cx.update(|cx| cx.read_credentials(url))?.await }.boxed_local() + async move { cx.update(|cx| cx.read_credentials(url)).await }.boxed_local() } fn write_credentials<'a>( @@ -107,7 +107,7 @@ impl KeyBackend for KeyringProvider { cx: &'a AsyncApp, ) -> Pin> + 'a>> { async move { - cx.update(move |cx| cx.write_credentials(url, username, password))? + cx.update(move |cx| cx.write_credentials(url, username, password)) .await } .boxed_local() @@ -118,7 +118,7 @@ impl KeyBackend for KeyringProvider { url: &'a str, cx: &'a AsyncApp, ) -> Pin> + 'a>> { - async move { cx.update(move |cx| cx.delete_credentials(url))?.await }.boxed_local() + async move { cx.update(move |cx| cx.delete_credentials(url)).await }.boxed_local() } } diff --git a/crates/ui/src/dock_area/tab_panel.rs b/crates/ui/src/dock_area/tab_panel.rs index 9a6ffe6..f92b7d3 100644 --- a/crates/ui/src/dock_area/tab_panel.rs +++ b/crates/ui/src/dock_area/tab_panel.rs @@ -182,16 +182,15 @@ impl TabPanel { // Sync the active state to all panels cx.spawn(async move |view, cx| { - _ = cx.update(|cx| { - _ = view.update(cx, |view, cx| { - if let Some(last_active) = view.panels.get(last_active_ix) { - last_active.set_active(false, cx); - } - if let Some(active) = view.panels.get(view.active_ix) { - active.set_active(true, cx); - } - }); - }); + view.update(cx, |view, cx| { + if let Some(last_active) = view.panels.get(last_active_ix) { + last_active.set_active(false, cx); + } + if let Some(active) = view.panels.get(view.active_ix) { + active.set_active(true, cx); + } + }) + .ok(); }) .detach(); @@ -923,11 +922,10 @@ impl TabPanel { cx.spawn({ let is_zoomed = self.is_zoomed; async move |view, cx| { - _ = cx.update(|cx| { - _ = view.update(cx, |view, cx| { - view.set_zoomed(is_zoomed, cx); - }); - }); + view.update(cx, |view, cx| { + view.set_zoomed(is_zoomed, cx); + }) + .ok(); } }) .detach(); diff --git a/crates/ui/src/input/blink_cursor.rs b/crates/ui/src/input/blink_cursor.rs index ac3f57a..cbc755c 100644 --- a/crates/ui/src/input/blink_cursor.rs +++ b/crates/ui/src/input/blink_cursor.rs @@ -56,7 +56,7 @@ impl BlinkCursor { cx.spawn(async move |this, cx| { Timer::after(INTERVAL).await; if let Some(this) = this.upgrade() { - this.update(cx, |this, cx| this.blink(epoch, cx)).ok(); + this.update(cx, |this, cx| this.blink(epoch, cx)); } }) .detach(); @@ -82,8 +82,7 @@ impl BlinkCursor { this.update(cx, |this, cx| { this.paused = false; this.blink(epoch, cx); - }) - .ok(); + }); } }) .detach();