From c32030cf217723980275c056885364b748c0a1c4 Mon Sep 17 00:00:00 2001 From: Ren Amamiya Date: Wed, 11 Nov 2026 19:04:36 +0700 Subject: [PATCH] extract workspace crates and switch to gpui-native-kit --- Cargo.lock | 4404 ++++++----------------- Cargo.toml | 17 +- crates/assets/Cargo.toml | 3 +- crates/assets/assets/themes/.keep | 0 crates/assets/assets/themes/signed.json | 433 --- crates/assets/src/lib.rs | 40 +- crates/settings/Cargo.toml | 3 - crates/settings/src/settings.rs | 86 +- crates/signed_app/Cargo.toml | 22 + crates/signed_app/src/app.rs | 55 + crates/signed_app/src/dialogs/mod.rs | 47 + crates/signed_app/src/lib.rs | 12 + crates/signed_app/src/panels.rs | 1 + crates/signed_app/src/views/mod.rs | 1 + desktop/Cargo.toml | 8 +- desktop/src/main.rs | 177 +- docs/gpui-native-kit-gaps.md | 39 + rust-toolchain.toml | 2 +- 18 files changed, 1343 insertions(+), 4007 deletions(-) delete mode 100644 crates/assets/assets/themes/.keep delete mode 100644 crates/assets/assets/themes/signed.json create mode 100644 crates/signed_app/Cargo.toml create mode 100644 crates/signed_app/src/app.rs create mode 100644 crates/signed_app/src/dialogs/mod.rs create mode 100644 crates/signed_app/src/lib.rs create mode 100644 crates/signed_app/src/panels.rs create mode 100644 crates/signed_app/src/views/mod.rs create mode 100644 docs/gpui-native-kit-gaps.md diff --git a/Cargo.lock b/Cargo.lock index 7588ab7..9bb94d3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,20 +12,6 @@ dependencies = [ "uuid", ] -[[package]] -name = "accesskit_atspi_common" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "023da0e5097f46df7092d5280b02efb9bbf8d93298daeced42652463e357d636" -dependencies = [ - "accesskit", - "accesskit_consumer", - "atspi-common", - "phf 0.13.1", - "serde", - "zvariant", -] - [[package]] name = "accesskit_consumer" version = "0.38.0" @@ -50,24 +36,6 @@ dependencies = [ "objc2-foundation 0.2.2", ] -[[package]] -name = "accesskit_unix" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03e156ed3802e35eefe894ef2671bc6c889303d8a7e110b5e1b48f504b91362f" -dependencies = [ - "accesskit", - "accesskit_atspi_common", - "async-channel", - "async-executor", - "async-task", - "atspi", - "futures-lite", - "futures-util", - "serde", - "zbus", -] - [[package]] name = "accesskit_windows" version = "0.34.0" @@ -84,9 +52,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.25.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b" +checksum = "e567177890eb1617b1f774005b66b26b2377afd138a2ca37aae7d8f0c81429d4" dependencies = [ "gimli", ] @@ -119,19 +87,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "const-random", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.5" @@ -165,6 +120,28 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "alsa" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "812947049edcd670a82cd5c73c3661d2e58468577ba8489de58e1a73c04cbd5d" +dependencies = [ + "alsa-sys", + "bitflags 2.13.2", + "cfg-if", + "libc", +] + +[[package]] +name = "alsa-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad7569085a265dd3f607ebecce7458eaab2132a84393534c95b18dcbc3f31e04" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "android_system_properties" version = "0.1.6" @@ -174,23 +151,6 @@ dependencies = [ "libc", ] -[[package]] -name = "annotate-snippets" -version = "0.12.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a5b0a5ab8561c603f16c3b78c24a386b1f70e7fc1b1b1e8c15738828e4a176" -dependencies = [ - "anstyle", - "memchr", - "unicode-width", -] - -[[package]] -name = "anstyle" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" - [[package]] name = "anyhow" version = "1.0.104" @@ -205,9 +165,9 @@ checksum = "3bc62ac97cc33321f50863d514c3bc38a453947a8f9e781137e47c7401020aed" [[package]] name = "arc-swap" -version = "1.9.3" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380962b3d93b99642e50b9febf72c071e97e8b32d86eae9cf4ef582bb960ae6e" +checksum = "84a22b5d51209f6de83d37a0b33d320acb8da88823e42a94c075140708f032a5" dependencies = [ "rustversion", ] @@ -223,12 +183,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "arraydeque" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" - [[package]] name = "arrayref" version = "0.3.9" @@ -241,12 +195,6 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" -[[package]] -name = "as-raw-xcb-connection" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175571dd1d178ced59193a6fc02dde1b972eb0bc56c892cde9beeceac5bf0f6b" - [[package]] name = "as-slice" version = "0.2.1" @@ -272,24 +220,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb8421aaa9644a5faf26735f258b669b15f063313ef8f8e2bdb28912a1a6f111" dependencies = [ "enumflags2", - "futures-channel", "futures-util", "getrandom 0.4.3", "serde", - "serde_repr", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "zbus", + "zbus 5.19.0", ] [[package]] name = "assets" version = "0.2.0" dependencies = [ - "anyhow", - "gpui-component", - "gpui-pre", + "gpui", + "gpui-native-kit", "rust-embed", "serde_json", ] @@ -318,23 +260,11 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "async-compression" -version = "0.4.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5755640120b24961f8231e05892e4a4f7e0d04e8aeca161508c9c397946970" -dependencies = [ - "compression-codecs", - "compression-core", - "futures-io", - "pin-project-lite", -] - [[package]] name = "async-executor" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a" +checksum = "f426a31126c735126297bc5ea7a521263c9faff4f63ca415267ee625651c4f37" dependencies = [ "async-task", "concurrent-queue", @@ -375,9 +305,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.4.2" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" +checksum = "0876700b0d007ad25d5508865a4259c3af9af6d296bf663a0d586d0bc3369f6f" dependencies = [ "event-listener", "event-listener-strategy", @@ -421,7 +351,7 @@ checksum = "4f8abc12baad266b1c8cec146854c195b5864b4221d4b2ca7296a7ae82d9e451" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -456,7 +386,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -490,55 +420,12 @@ dependencies = [ "web-sys", ] -[[package]] -name = "atomic" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" - [[package]] name = "atomic-waker" version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" -[[package]] -name = "atspi" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77886257be21c9cd89a4ae7e64860c6f0eefca799bb79127913052bd0eefb3d" -dependencies = [ - "atspi-common", - "atspi-proxies", -] - -[[package]] -name = "atspi-common" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c5617155740c98003016429ad13fe43ce7a77b007479350a9f8bf95a29f63d" -dependencies = [ - "enumflags2", - "serde", - "static_assertions", - "zbus", - "zbus-lockstep", - "zbus-lockstep-macros", - "zbus_names", - "zvariant", -] - -[[package]] -name = "atspi-proxies" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2230e48787ed3eb4088996eab66a32ca20c0b67bbd4fd6cdfe79f04f1f04c9fc" -dependencies = [ - "atspi-common", - "serde", - "zbus", -] - [[package]] name = "autocfg" version = "1.5.1" @@ -558,7 +445,7 @@ dependencies = [ "log", "num-rational", "num-traits", - "pastey", + "pastey 0.1.1", "rayon", "thiserror 2.0.21", "v_frame", @@ -574,7 +461,7 @@ dependencies = [ "anyhow", "arrayvec", "log", - "nom 8.0.0", + "nom", "num-rational", "v_frame", ] @@ -590,9 +477,9 @@ dependencies = [ [[package]] name = "aws-lc-rs" -version = "1.18.2" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faac5829c2b74c28f830747e7818ccfb684261b5f48a1118b1e2a13d36dfab13" +checksum = "048006790404103c488e6c5616b3e7e702a71292aadda08e8f7698a9e0d2eb53" dependencies = [ "aws-lc-sys", "zeroize", @@ -600,9 +487,9 @@ dependencies = [ [[package]] name = "aws-lc-sys" -version = "0.46.0" +version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1622d8446a2d4b2ce0c7eefc73dd43a99779028d5ee5c2dd8073a658ba8a2bc" +checksum = "8bfbe32ac36b3c428696ce315464181bc4029d689fd58e3f2a4e58c252242f52" dependencies = [ "cc", "cmake", @@ -613,25 +500,19 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.76" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6" +checksum = "42f4220217f3288537b83684130f42fad43320b1c3b805f1910d683d52ded24f" dependencies = [ "addr2line", "cfg-if", "libc", - "miniz_oxide 0.8.9", + "miniz_oxide 0.9.1", "object", "rustc-demangle", "windows-link 0.2.1", ] -[[package]] -name = "base62" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3a647dce9631f152a99ec16cfc09267ae55fe280d5dc288964027d458076323" - [[package]] name = "base64" version = "0.22.1" @@ -650,26 +531,6 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efbd3e1070bbdf4cd88a75264e18e8a26f7cb5c6949eadf0ceb85fb159cf08f8" -[[package]] -name = "bindgen" -version = "0.72.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895" -dependencies = [ - "bitflags 2.13.2", - "cexpr", - "clang-sys", - "itertools 0.13.0", - "log", - "prettyplease", - "proc-macro2", - "quote", - "regex", - "rustc-hash 2.1.3", - "shlex 1.3.0", - "syn 2.0.119", -] - [[package]] name = "bip39" version = "2.2.2" @@ -681,45 +542,26 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "bit-set" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ddef2995421ab6a5c779542c81ee77c115206f4ad9d5a8e05f4ff49716a3dd" -dependencies = [ - "bit-vec 0.9.1", -] - [[package]] name = "bit-set" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56d87354e4229f54a44f7bf2435906a4656dba36026ab6eaca629a2c436a691c" dependencies = [ - "bit-vec 0.10.1", + "bit-vec", ] [[package]] name = "bit-vec" -version = "0.9.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" - -[[package]] -name = "bit-vec" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5727b15fa97d4f4fee0a3b7c3d550ed0269f54329207b86388de918604e31269" -dependencies = [ - "borsh", - "serde", -] +checksum = "72503af1e72be411d74ca45cd6b309878fcb35354e252fc2a3a8bda3a97082a0" [[package]] name = "bit_field" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6" +checksum = "cb2907cc03d08cdb1c6724ad0670ce67c4a71e1c45a6d7635224011714cfc4b1" [[package]] name = "bitcoin-consensus-encoding" @@ -799,12 +641,6 @@ dependencies = [ "no_std_io2", ] -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - [[package]] name = "block-buffer" version = "0.10.4" @@ -863,39 +699,6 @@ dependencies = [ "piper", ] -[[package]] -name = "borsh" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "553c5d846a6ba5150c65e3b1b8ec073bcf1abc20f9b7220de384a4443ea4e20a" -dependencies = [ - "borsh-derive", - "bytes", - "cfg_aliases", -] - -[[package]] -name = "borsh-derive" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12cdfe656708a01f89b451a7d36466e6fe6c414de0aa18fc54f864f6f9ca9f56" -dependencies = [ - "once_cell", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 3.0.9", -] - -[[package]] -name = "bs58" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" -dependencies = [ - "tinyvec", -] - [[package]] name = "bstr" version = "1.13.1" @@ -936,7 +739,7 @@ checksum = "6a1f896587b6f2c069c73d2f0913e2d590c3990285cd2f0b6aa02b786b4c679c" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -957,15 +760,6 @@ version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc652a48c352aef3ea3aed32080501cf3ef6ed5da78602a020c991775b0aff04" -[[package]] -name = "bzip2" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a53fac24f34a81bc9954b5d6cfce0c21e18ec6959f44f56e8e90e4bb7c346c" -dependencies = [ - "libbz2-rs-sys", -] - [[package]] name = "calloop" version = "0.14.5" @@ -978,18 +772,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "calloop-wayland-source" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138efcf0940a02ebf0cc8d1eff41a1682a46b431630f4c52450d6265876021fa" -dependencies = [ - "calloop", - "rustix", - "wayland-backend", - "wayland-client", -] - [[package]] name = "cbc" version = "0.1.2" @@ -1006,7 +788,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eadd868a2ce9ca38de7eeafdcec9c7065ef89b42b32f0839278d55f35c54d1ff" dependencies = [ "heck 0.4.1", - "indexmap 2.14.2", + "indexmap", "log", "proc-macro2", "quote", @@ -1019,23 +801,14 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.67" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17dd265a7d0f31ef544e1b20e03add05d3b45b491b633b10d67145d2acc1a38" +checksum = "4ff2a8126fff0f8c839080d619675a585e61720bb12d2baceae45769fd66f155" dependencies = [ "find-msvc-tools", "jobserver", "libc", - "shlex 2.0.1", -] - -[[package]] -name = "cexpr" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" -dependencies = [ - "nom 7.1.3", + "shlex", ] [[package]] @@ -1050,15 +823,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f079e83a288787bcd14a6aea84cee5c87a67c5a3e660c30f557a3d24761b3527" -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - [[package]] name = "chacha20" version = "0.9.1" @@ -1127,18 +891,7 @@ checksum = "e8cf2a2c93cd704877c0858356ed03480ff301ee950b43f1cbe4573b088bfa6c" dependencies = [ "block-buffer 0.12.1", "crypto-common 0.2.2", - "inout 0.2.5", -] - -[[package]] -name = "clang-sys" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "157a8ba7b480713b56f4c09fd13fc3e0a22a5dfab8097ba61cbc5feef950788a" -dependencies = [ - "glob", - "libc", - "libloading", + "inout 0.2.6", ] [[package]] @@ -1165,65 +918,6 @@ version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9ea0ac24bc397ab3c98583a3c9ba74fa56b09a4449bbe172b9b1ddb016027a" -[[package]] -name = "cocoa" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c" -dependencies = [ - "bitflags 1.3.2", - "block", - "cocoa-foundation 0.1.2", - "core-foundation 0.9.4", - "core-graphics 0.23.2", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" -dependencies = [ - "bitflags 2.13.2", - "block", - "cocoa-foundation 0.2.1", - "core-foundation 0.10.1", - "core-graphics 0.24.0", - "foreign-types", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7" -dependencies = [ - "bitflags 1.3.2", - "block", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" -dependencies = [ - "bitflags 2.13.2", - "block", - "core-foundation 0.10.1", - "core-graphics-types 0.2.0", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.13.1" @@ -1235,6 +929,16 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "collections" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "gpui_util", + "indexmap", + "rustc-hash 2.1.3", +] + [[package]] name = "color_quant" version = "1.1.0" @@ -1251,24 +955,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "compression-codecs" -version = "0.4.46" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae36683101b2899f48bd31f8db9839437356188e3b1ff23096e73dab09ba8fe" -dependencies = [ - "bzip2", - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ebdda89edc534bf8d5dd2857562633b6495557e5846552ade994b99ed13c36a" - [[package]] name = "concurrent-queue" version = "2.5.0" @@ -1278,12 +964,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "configparser" -version = "3.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "031ad3d167622974ed636505ae4556267ed4aa2aea0464122fa6bc9698a32825" - [[package]] name = "console_error_panic_hook" version = "0.1.7" @@ -1296,29 +976,9 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c" - -[[package]] -name = "const-random" -version = "0.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" -dependencies = [ - "const-random-macro", -] - -[[package]] -name = "const-random-macro" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" -dependencies = [ - "getrandom 0.2.17", - "once_cell", - "tiny-keccak", -] +checksum = "be95d4a884358a21a199689323c29e9256b4a1b315e22f183d155422041d3a9a" [[package]] name = "convert_case" @@ -1329,25 +989,6 @@ dependencies = [ "unicode-segmentation", ] -[[package]] -name = "convert_case" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "affbf0190ed2caf063e3def54ff444b449371d55c58e513a95ab98eca50adb49" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", - "libc", -] - [[package]] name = "core-foundation" version = "0.10.1" @@ -1364,19 +1005,6 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" -[[package]] -name = "core-graphics" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types", - "libc", -] - [[package]] name = "core-graphics" version = "0.24.0" @@ -1384,36 +1012,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ "bitflags 2.13.2", - "core-foundation 0.10.1", - "core-graphics-types 0.2.0", + "core-foundation", + "core-graphics-types", "foreign-types", "libc", ] -[[package]] -name = "core-graphics-helmer-fork" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32eb7c354ae9f6d437a6039099ce7ecd049337a8109b23d73e48e8ffba8e9cd5" -dependencies = [ - "bitflags 2.13.2", - "core-foundation 0.9.4", - "core-graphics-types 0.1.3", - "foreign-types", - "libc", -] - -[[package]] -name = "core-graphics-types" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf" -dependencies = [ - "bitflags 1.3.2", - "core-foundation 0.9.4", - "libc", -] - [[package]] name = "core-graphics-types" version = "0.2.0" @@ -1421,20 +1025,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ "bitflags 2.13.2", - "core-foundation 0.10.1", - "libc", -] - -[[package]] -name = "core-graphics2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4416167a69126e617f8d0a214af0e3c1dbdeffcb100ddf72dcd1a1ac9893c146" -dependencies = [ - "bitflags 2.13.2", - "block", - "cfg-if", - "core-foundation 0.10.1", + "core-foundation", "libc", ] @@ -1444,26 +1035,12 @@ version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" dependencies = [ - "core-foundation 0.10.1", - "core-graphics 0.24.0", + "core-foundation", + "core-graphics", "foreign-types", "libc", ] -[[package]] -name = "core-video" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139679cc63eb9504bdbe37e37874b0247136177655f0008588781e90863afa62" -dependencies = [ - "block", - "core-foundation 0.10.1", - "core-graphics2", - "io-surface", - "libc", - "metal", -] - [[package]] name = "core_detect" version = "1.0.0" @@ -1479,6 +1056,20 @@ dependencies = [ "libm", ] +[[package]] +name = "coreaudio-rs" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5d7dca3ebcf65a035582c9ad4385371a9d9ee6537474d2a278f4e1e475bb58" +dependencies = [ + "bitflags 2.13.2", + "libc", + "objc2-audio-toolbox", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", +] + [[package]] name = "cosmic-text" version = "0.19.0" @@ -1503,6 +1094,36 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "cpal" +version = "0.18.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f02e8d0327b42d3e2e4ab2119af397344eb9fc54a34bf0ddeaa1277af8681f1" +dependencies = [ + "alsa", + "block2 0.6.2", + "coreaudio-rs", + "dasp_sample", + "jni", + "js-sys", + "libc", + "mach2", + "ndk", + "ndk-context", + "num-derive", + "num-traits", + "objc2 0.6.5", + "objc2-audio-toolbox", + "objc2-avf-audio", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "web-sys", + "windows 0.62.2", + "windows-core 0.62.2", +] + [[package]] name = "cpufeatures" version = "0.2.17" @@ -1523,9 +1144,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.5.2" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a7799fd6b852db0e61728dde9a204c423b44d689dbd432522543614b490e78" +checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64" dependencies = [ "cfg-if", ] @@ -1610,47 +1231,13 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.3" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574" +checksum = "261af4dc7a06ea8a527a8717d8cbba3417530d6ea14e1edb3de6b67806be474f" dependencies = [ "cmov", ] -[[package]] -name = "darling" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed17f5901b6630b993ca003def43f2f8ef4014fc13b047b57aad617ff32bc2ec" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6837e2cf7485aaae18f86181d2f0e9a7ed297a025e220aeabf63fdebd3a2ddff" -dependencies = [ - "ident_case", - "proc-macro2", - "quote", - "strsim", - "syn 3.0.9", -] - -[[package]] -name = "darling_macro" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac7135c3ef02b2f7833bbeb1be5ba7f966dcde8a87c6b87f65a778d71a02785" -dependencies = [ - "darling_core", - "quote", - "syn 3.0.9", -] - [[package]] name = "dashmap" version = "6.2.1" @@ -1665,6 +1252,12 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + [[package]] name = "data-encoding" version = "2.11.1" @@ -1705,7 +1298,7 @@ dependencies = [ "defmt-parser", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1722,9 +1315,6 @@ name = "deranged" version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e9de72ce2ad1f90dc62fa25f0f430ef85eb4b0d8fa0be4f30373bc40a21d28e" -dependencies = [ - "serde_core", -] [[package]] name = "derive_more" @@ -1741,12 +1331,21 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" dependencies = [ - "convert_case 0.10.0", + "convert_case", "proc-macro2", "quote", "rustc_version", "syn 2.0.119", - "unicode-xid", +] + +[[package]] +name = "derive_refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -1781,34 +1380,13 @@ dependencies = [ "ctutils", ] -[[package]] -name = "dirs" -version = "5.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" -dependencies = [ - "dirs-sys 0.4.1", -] - [[package]] name = "dirs" version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ - "dirs-sys 0.5.0", -] - -[[package]] -name = "dirs-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" -dependencies = [ - "libc", - "option-ext", - "redox_users 0.4.6", - "windows-sys 0.48.0", + "dirs-sys", ] [[package]] @@ -1819,16 +1397,10 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", "option-ext", - "redox_users 0.5.3", + "redox_users", "windows-sys 0.61.2", ] -[[package]] -name = "dispatch" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" - [[package]] name = "dispatch2" version = "0.3.1" @@ -1837,7 +1409,6 @@ checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", - "libc", "objc2 0.6.5", ] @@ -1849,7 +1420,7 @@ checksum = "c6232dd377dcc64799954cbd3a9bb882e9cdc1308ccd87b1c098f1fb2eaf82a8" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -1861,17 +1432,6 @@ dependencies = [ "libloading", ] -[[package]] -name = "dock" -version = "0.2.0" -dependencies = [ - "gpui-base", - "gpui-component", - "gpui-pre", - "settings", - "signed_ui", -] - [[package]] name = "document-features" version = "0.2.12" @@ -1881,19 +1441,13 @@ dependencies = [ "litrs", ] -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - [[package]] name = "doxygen-rs" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9" dependencies = [ - "phf 0.11.3", + "phf", ] [[package]] @@ -1935,16 +1489,16 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 1.1.8+spec-1.1.0", + "toml 1.2.1+spec-1.1.0", "vswhom", "winreg", ] [[package]] name = "encoding_rs" -version = "0.8.42" +version = "0.8.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e985e0451871ad22fb8d2b6b076e2028a502a0d3950998c2c5c0a4f9b5d9679" +checksum = "89253175e704ab869b04f9db224d38630e0211a53841a79181deae0889e169f5" dependencies = [ "cfg-if", "core_detect", @@ -1954,41 +1508,12 @@ dependencies = [ "simdutf8", ] -[[package]] -name = "encoding_rs_io" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fba3fe847045ecff794b9c138293a80db914678c453ad63fbf0c6a9eb6e00b22" -dependencies = [ - "encoding_rs", -] - [[package]] name = "endi" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099" -[[package]] -name = "enum-iterator" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4549325971814bda7a44061bf3fe7e487d447cba01e4220a4b454d630d7a016" -dependencies = [ - "enum-iterator-derive", -] - -[[package]] -name = "enum-iterator-derive" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "685adfa4d6f3d765a26bc5dbc936577de9abf756c1feeb3089b01dd395034842" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "enumflags2" version = "0.7.12" @@ -2047,17 +1572,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00d174d5400e5e8fd687ad1049e2f578285fa914201b1af7e8b112a4546bd826" -[[package]] -name = "erased-serde" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2add8a07dd6a8d93ff627029c51de145e12686fbc36ecb298ac22e74cf02dec" -dependencies = [ - "serde", - "serde_core", - "typeid", -] - [[package]] name = "errno" version = "0.3.14" @@ -2109,16 +1623,15 @@ dependencies = [ [[package]] name = "exr" -version = "1.74.2" +version = "1.74.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711fe42c9964295e01ee3fba3f9fe0e1d24b98886950d68efe81b1c76e21adf3" +checksum = "cb29d0be702adf92c645d9b2f93472906ba83d400e59f98adb3770ce5c18c2f6" dependencies = [ "bit_field", "half", "lebe", "miniz_oxide 0.8.9", - "num-complex", - "pulp", + "multiversion", "rayon-core", "smallvec", "zune-inflate", @@ -2160,17 +1673,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "filedescriptor" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e40758ed24c9b2eeb76c35fb0aebc66c626084edd827e07e1552279814c6682d" -dependencies = [ - "libc", - "thiserror 1.0.69", - "winapi", -] - [[package]] name = "filetime" version = "0.2.29" @@ -2187,12 +1689,6 @@ version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c66915cc5391097de7a2b0b972e8505aa33c0df401fd3a6811dbdb32881ba48" -[[package]] -name = "fixedbitset" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" - [[package]] name = "flatbuffers" version = "25.12.19" @@ -2205,9 +1701,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.1.10" +version = "1.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb" +checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4" dependencies = [ "crc32fast", "miniz_oxide 0.9.1", @@ -2232,15 +1728,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8bf7cc16383c4b8d58b9905a8509f02926ce3058053c056376248d958c9df1e8" -[[package]] -name = "fluent-uri" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "flume" version = "0.11.1" @@ -2270,12 +1757,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -2341,7 +1822,7 @@ checksum = "ea5190182e6915eb873ddbc16e23b711b6eb1f9c00a0d0a3a91b5f6228475225" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2376,25 +1857,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - -[[package]] -name = "futf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df420e2e84819663797d1ec6544b13c5be84629e7bb00dc960d6917db2987843" -dependencies = [ - "mac", - "new_debug_unreachable", -] - [[package]] name = "futures" version = "0.3.34" @@ -2420,19 +1882,6 @@ dependencies = [ "futures-sink", ] -[[package]] -name = "futures-concurrency" -version = "7.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "175cd8cca9e1d45b87f18ffa75088f2099e3c4fe5e2f83e42de112560bea8ea6" -dependencies = [ - "fixedbitset", - "futures-core", - "futures-lite", - "pin-project", - "smallvec", -] - [[package]] name = "futures-core" version = "0.3.34" @@ -2477,7 +1926,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -2519,16 +1968,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8" -dependencies = [ - "rustix", - "windows-link 0.2.1", -] - [[package]] name = "getrandom" version = "0.2.17" @@ -2570,16 +2009,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gif" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.14.2" @@ -2592,9 +2021,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.32.3" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +checksum = "1033caf0b349c518623b5396bfb2cf0bddf44f0306d543a250e5743297aafd10" [[package]] name = "gix" @@ -2963,9 +2392,9 @@ dependencies = [ [[package]] name = "gix-imara-diff" -version = "0.3.1" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c48eccd894bd15555b0346470e63491ded94aefe76b3fcb1052084b5a393238" +checksum = "7518b930f6aeb75e871d32ce873c2ae46e35cef19b5a0b039d4337f651d897cd" dependencies = [ "bstr", "hashbrown 0.17.1", @@ -3012,9 +2441,9 @@ dependencies = [ [[package]] name = "gix-macros" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f11f5429ca73cc3758c9f53af56a9fba100a8701c5b4bc30e29b8b0b15288991" +checksum = "d02e51a52e15255757c06a6873529ae01205711aa9e8f9a1d46b556f1a14a96e" dependencies = [ "proc-macro2", "quote", @@ -3502,17 +2931,11 @@ dependencies = [ "xml-rs", ] -[[package]] -name = "glob" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4eba85ea1d0a966a983acd07deee566e67395d2d96b6fb39e62b5a833f1eb0b" - [[package]] name = "globset" -version = "0.4.20" +version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c34a9410465b45bd9787443bc7370f37735bad04b0f0cd57ff1a3186c98988" +checksum = "f98b0d85522dc0a824cfebbc9594ff4a9b289c568bea0370319dfbdf20ccdd2d" dependencies = [ "aho-corasick", "bstr", @@ -3521,17 +2944,6 @@ dependencies = [ "regex-syntax", ] -[[package]] -name = "globwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" -dependencies = [ - "bitflags 1.3.2", - "ignore", - "walkdir", -] - [[package]] name = "gloo-timers" version = "0.3.0" @@ -3546,9 +2958,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29038e1c483364cc6bb3cf78feee1816002e127c331a1eec55a4d202b9e1adb5" +checksum = "263218b0ba2b0715c3370fb04674f5f8aa331594b521c94ff0a8e4a8472d1386" dependencies = [ "js-sys", "slotmap", @@ -3580,207 +2992,32 @@ dependencies = [ ] [[package]] -name = "gpu-descriptor" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b89c83349105e3732062a895becfc71a8f921bb71ecbbdd8ff99263e3b53a0ca" -dependencies = [ - "bitflags 2.13.2", - "gpu-descriptor-types", - "hashbrown 0.15.5", -] - -[[package]] -name = "gpu-descriptor-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdf242682df893b86f33a73828fb09ca4b2d3bb6cc95249707fc684d27484b91" -dependencies = [ - "bitflags 2.13.2", -] - -[[package]] -name = "gpui-base" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf698677b253118459f552fe15513858c669d79a25837a94e480db2ae330050" -dependencies = [ - "aho-corasick", - "anyhow", - "ashpd", - "async-channel", - "chrono", - "data-url", - "futures", - "gpui-pre", - "gpui-pre-macros", - "gpui-pre-sum-tree", - "html5ever", - "instant", - "itertools 0.13.0", - "lsp-types", - "markdown", - "markup5ever_rcdom", - "num-traits", - "objc2 0.6.5", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "raw-window-handle", - "regex", - "ropey", - "schemars 1.2.3", - "serde", - "serde_json", - "smallvec", - "smol", - "tracing", - "unicode-linebreak", - "unicode-segmentation", - "web-time", - "windows 0.58.0", -] - -[[package]] -name = "gpui-component" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc8b7def8e74b0d822d3e96f6b28fb5a2c20eb7a83d30d22fa59ca8088d1159b" -dependencies = [ - "anyhow", - "chrono", - "core-text", - "enum-iterator", - "gpui-base", - "gpui-component-macros", - "gpui-kit-assets", - "gpui-pre", - "gpui-pre-macros", - "gpui-pre-sum-tree", - "instant", - "itertools 0.13.0", - "log", - "lsp-types", - "markdown", - "notify", - "num-traits", - "objc2 0.6.5", - "objc2-app-kit 0.3.2", - "objc2-foundation 0.3.2", - "once_cell", - "paste", - "raw-window-handle", - "regex", - "resvg 0.45.1", - "ropey", - "rust-i18n", - "schemars 1.2.3", - "serde", - "serde_json", - "serde_repr", - "smallvec", - "smol", - "tracing", - "tree-sitter", - "tree-sitter-astro-next", - "tree-sitter-bash", - "tree-sitter-c", - "tree-sitter-c-sharp", - "tree-sitter-cmake", - "tree-sitter-cpp", - "tree-sitter-css", - "tree-sitter-diff", - "tree-sitter-elixir", - "tree-sitter-embedded-template", - "tree-sitter-go", - "tree-sitter-graphql", - "tree-sitter-html", - "tree-sitter-java", - "tree-sitter-javascript", - "tree-sitter-jsdoc", - "tree-sitter-json", - "tree-sitter-kotlin-sg", - "tree-sitter-lua", - "tree-sitter-make", - "tree-sitter-md", - "tree-sitter-php", - "tree-sitter-proto", - "tree-sitter-python", - "tree-sitter-ruby", - "tree-sitter-rust", - "tree-sitter-scala", - "tree-sitter-sequel", - "tree-sitter-svelte-next", - "tree-sitter-swift", - "tree-sitter-toml-ng", - "tree-sitter-typescript", - "tree-sitter-yaml", - "tree-sitter-zig", - "uuid", - "windows 0.58.0", -] - -[[package]] -name = "gpui-component-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c0c9398aaf99e595d450e38eb44ff0c500df8c332b4783d5b72022e69525359" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "gpui-kit-assets" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb5fd2b154c96abe8ac49d8c431a24a764977128fce6a72a5f9f1e8802f64fe7" -dependencies = [ - "anyhow", - "gpui-pre", - "gpui-pre-reqwest", - "log", - "rust-embed", - "wasm-bindgen", - "wasm-bindgen-futures", -] - -[[package]] -name = "gpui-pre" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7f0bc3ebba070f8981b3f8e905a12f47d27794a30d029e59cdb9edf7a4b3360" +name = "gpui" +version = "0.2.2" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "accesskit", "anyhow", "async-channel", "async-task", "backtrace", - "bindgen", "bitflags 2.13.2", "chrono", - "core-video", - "ctor", + "collections", "derive_more", "embed-resource", "etagere", "futures", - "futures-concurrency", "getrandom 0.3.4", - "gpui-pre-collections", - "gpui-pre-http-client", - "gpui-pre-macros", - "gpui-pre-refineable", - "gpui-pre-scheduler", - "gpui-pre-shared-string", - "gpui-pre-sum-tree", - "gpui-pre-util", - "gpui-pre-util-macros", + "gpui_macros", + "gpui_shared_string", + "gpui_util", "heapless 0.9.3", + "http_client", + "icu_segmenter", "image", "inventory", - "itertools 0.14.0", + "itertools", "libc", "log", "lyon", @@ -3790,15 +3027,15 @@ dependencies = [ "parking", "parking_lot", "pin-project", - "pollster 0.4.0", - "postage", + "pollster", "profiling", - "proptest", "rand 0.9.5", "raw-window-handle", + "refineable", "regex", - "resvg 0.46.0", - "schemars 1.2.3", + "resvg", + "scheduler", + "schemars", "seahash", "serde", "serde_json", @@ -3806,130 +3043,210 @@ dependencies = [ "smallvec", "spin 0.10.1", "strum", + "sum_tree", "taffy", "thiserror 2.0.21", "ttf-parser", + "unicode-segmentation", "url", - "usvg 0.46.0", + "usvg", "uuid", "waker-fn", - "web-time", "windows 0.62.2", - "zed-font-kit", "zed-scap", ] [[package]] -name = "gpui-pre-apple" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdd914311cd12894367c8b9908947bb0c27fd42f8b9a5ff7a0730551a83fa4c" +name = "gpui-native-core" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "cpal", + "flume 0.12.0", + "gpui", + "gpui-native-icons", + "gpui-native-theme", + "gpui-native-utils", + "log", + "unicode-segmentation", +] + +[[package]] +name = "gpui-native-data" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "gpui", + "gpui-native-core", + "gpui-native-icons", + "gpui-native-theme", + "gpui-native-utils", +] + +[[package]] +name = "gpui-native-editor" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "gpui", + "gpui-native-core", + "gpui-native-theme", + "gpui-native-utils", + "log", + "pulldown-cmark", + "similar", + "tree-sitter", + "tree-sitter-javascript", + "tree-sitter-python", + "tree-sitter-rust", + "tree-sitter-typescript", +] + +[[package]] +name = "gpui-native-icons" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "anyhow", + "gpui", +] + +[[package]] +name = "gpui-native-kit" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "gpui", + "gpui-native-core", + "gpui-native-data", + "gpui-native-editor", + "gpui-native-icons", + "gpui-native-layout", + "gpui-native-theme", +] + +[[package]] +name = "gpui-native-layout" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "gpui", + "gpui-native-core", + "gpui-native-data", + "gpui-native-icons", + "gpui-native-theme", + "gpui-native-utils", +] + +[[package]] +name = "gpui-native-theme" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "anyhow", + "async-channel", + "block2 0.6.2", + "gpui", + "log", + "notify", + "objc2 0.6.5", + "objc2-app-kit 0.3.2", + "objc2-foundation 0.3.2", + "serde", + "toml 0.8.23", + "windows 0.62.2", + "windows-registry 0.6.1", + "zbus 5.19.0", +] + +[[package]] +name = "gpui-native-utils" +version = "0.1.0" +source = "git+https://git.reya.info/reya/gpui-native-kit?rev=4469a4c280194db033dd0abf9c4d6b8f4daa1858#4469a4c280194db033dd0abf9c4d6b8f4daa1858" +dependencies = [ + "gpui", + "gpui-native-theme", + "log", +] + +[[package]] +name = "gpui_apple" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "anyhow", "async-task", "block2 0.6.2", "cbindgen", - "core-foundation 0.10.1", - "core-graphics 0.24.0", - "core-video", - "derive_more", + "collections", + "core-foundation", + "core-foundation-sys", + "core-graphics", + "core-text", "dispatch2", "etagere", - "foreign-types", - "gpui-pre", - "gpui-pre-util", + "futures", + "gpui", + "gpui_util", "image", "libc", "log", "mach2", - "metal", "objc2 0.6.5", + "objc2-core-foundation", + "objc2-core-graphics", + "objc2-core-text", + "objc2-core-video", + "objc2-foundation 0.3.2", + "objc2-metal 0.3.2", + "objc2-quartz-core 0.3.2", + "objc2-security", + "parking_lot", + "pathfinder_geometry", + "smallvec", + "thiserror 2.0.21", + "zed-font-kit", +] + +[[package]] +name = "gpui_ios" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "anyhow", + "block2 0.6.2", + "futures", + "gpui", + "gpui_apple", + "log", + "objc2 0.6.5", + "objc2-core-foundation", "objc2-foundation 0.3.2", "objc2-quartz-core 0.3.2", + "objc2-ui-kit", "parking_lot", + "raw-window-handle", + "uuid", ] [[package]] -name = "gpui-pre-collections" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c060863025dc3b8e90febad2d1f4ffd23a5d0dcedba39d3f6b7820ea2fdd3a0" -dependencies = [ - "gpui-pre-util", - "indexmap 2.14.2", - "rustc-hash 2.1.3", -] - -[[package]] -name = "gpui-pre-derive-refineable" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc834f30f5f49791e214f1fde01a009c7de91c9cd0a9f31dabfed130ba39e6cf" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "gpui-pre-http-client" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d2935cf82333da3f41774e5757837756408f01356197b41c817ad2666034453" -dependencies = [ - "anyhow", - "async-compression", - "bytes", - "derive_more", - "futures", - "http", - "http-body", - "log", - "parking_lot", - "serde", - "serde_json", - "serde_urlencoded", - "url", -] - -[[package]] -name = "gpui-pre-http-client-tls" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bbac58d44e80c2bfdd736cacd334e5c9446d5847cd584193ee3c8634c729c2b" -dependencies = [ - "log", - "rustls", - "rustls-platform-verifier", - "webpki-roots 1.0.10", -] - -[[package]] -name = "gpui-pre-linux" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1131746fad5c87b5de74dc9c73105655b0c820a2dd4bb247586573e7cf5720e" +name = "gpui_linux" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "accesskit", - "accesskit_unix", "anyhow", - "as-raw-xcb-connection", - "ashpd", "bytemuck", "calloop", - "calloop-wayland-source", - "filedescriptor", + "collections", "futures", - "gpui-pre", - "gpui-pre-collections", - "gpui-pre-http-client", - "gpui-pre-util", - "gpui-pre-wgpu", + "gpui", + "gpui_util", + "http_client", "libc", "log", "notify-rust", "oo7", - "open", "parking_lot", "raw-window-handle", "smallvec", @@ -3937,226 +3254,88 @@ dependencies = [ "strum", "url", "uuid", - "wayland-backend", - "wayland-client", - "wayland-cursor", - "wayland-protocols", - "wayland-protocols-plasma", - "wayland-protocols-wlr", - "x11rb", - "xkbcommon", - "zed-scap", - "zed-xim", ] [[package]] -name = "gpui-pre-macos" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d756813ff1cd741a502af60fd18869e0677795936d7349642b41c49f43120c0" +name = "gpui_macos" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "accesskit", "accesskit_macos", "anyhow", "block2 0.6.2", - "cocoa 0.26.1", - "core-foundation 0.10.1", + "collections", + "core-foundation", "core-foundation-sys", - "core-graphics 0.24.0", - "core-text", - "core-video", + "core-graphics", "ctor", "dispatch2", "foreign-types", "futures", - "gpui-pre", - "gpui-pre-apple", - "gpui-pre-collections", - "gpui-pre-scheduler", - "gpui-pre-util", + "gpui", + "gpui_apple", + "gpui_util", "image", - "itertools 0.14.0", + "itertools", "log", - "objc", "objc2 0.6.5", "objc2-app-kit 0.3.2", "objc2-core-graphics", - "objc2-core-media", + "objc2-core-video", "objc2-foundation 0.3.2", - "objc2-screen-capture-kit", + "objc2-quartz-core 0.3.2", + "objc2-uniform-type-identifiers", "objc2-user-notifications", "parking_lot", - "pathfinder_geometry", "raw-window-handle", + "scheduler", "semver", "smallvec", "strum", "uuid", - "zed-font-kit", ] [[package]] -name = "gpui-pre-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2ad26ca759364694cb55487bebff4c1b7dd6accab49990ff3cda6f7a818a9f4" +name = "gpui_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "heck 0.5.0", - "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.119", ] [[package]] -name = "gpui-pre-perf" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fcb288a506a476b6cbf97e6ec1cc0118db43f0ca91087588afa1c2d8cd4f842" -dependencies = [ - "gpui-pre-collections", - "serde", - "serde_json", -] - -[[package]] -name = "gpui-pre-platform" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e200b7b78836f1a0fc70767d971768e88f29d8b91b697285c15fb8e373635a3e" +name = "gpui_platform" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "anyhow", "console_error_panic_hook", - "gpui-pre", - "gpui-pre-linux", - "gpui-pre-macos", - "gpui-pre-web", - "gpui-pre-windows", + "gpui", + "gpui_ios", + "gpui_linux", + "gpui_macos", + "gpui_web", + "gpui_windows", ] [[package]] -name = "gpui-pre-refineable" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4042345bb5bd3ecbc5d15b21ed128154f462a992058d7038cd397631f5462338" +name = "gpui_shared_string" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ - "gpui-pre-derive-refineable", -] - -[[package]] -name = "gpui-pre-reqwest" -version = "0.12.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05be23908e707966824f8c51a609904b7f30739e8d915e120a53c1b995ba964c" -dependencies = [ - "base64 0.22.1", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "ipnet", - "js-sys", - "log", - "mime", - "mime_guess", - "once_cell", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "system-configuration", - "tokio", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "windows-registry 0.4.0", -] - -[[package]] -name = "gpui-pre-reqwest-client" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "894b8d8618c92cbd4da28a04dd3fcf3c0e0607074fa99416a864ac9b63b18aae" -dependencies = [ - "anyhow", - "bytes", - "futures", - "gpui-pre-http-client", - "gpui-pre-http-client-tls", - "gpui-pre-reqwest", - "gpui-pre-util", - "log", - "regex", - "tokio", -] - -[[package]] -name = "gpui-pre-scheduler" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4acd73345bc3c09f1b98c1b21eb4459ad8336f89bb2edcef619e11c5a08456e" -dependencies = [ - "async-task", - "backtrace", - "chrono", - "flume 0.12.0", - "futures", - "parking_lot", - "rand 0.9.5", - "wasm_thread", - "web-time", -] - -[[package]] -name = "gpui-pre-shared-string" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "477529fd5aa90bff969785ee9a3938484d94aa5101cdf7b84719629c0345f98a" -dependencies = [ - "schemars 1.2.3", + "schemars", "serde", "smol_str", ] [[package]] -name = "gpui-pre-sum-tree" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec0ec176d576b82aed716cf47185856b54ea9528caaf9d01787024689bfd824" -dependencies = [ - "gpui-pre-ztracing", - "heapless 0.9.3", - "log", - "rayon", - "tracing", -] - -[[package]] -name = "gpui-pre-util" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1635ae7d0b05400bfa211ddef6c67dc8d9f223c463022c2b3bf2c1c14c6044f" +name = "gpui_util" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "anyhow", "log", @@ -4164,33 +3343,22 @@ dependencies = [ ] [[package]] -name = "gpui-pre-util-macros" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01486fce7722e5d7d7e7bb71c719dfdcc6ed917112bdc7c56d0556fdb60d10ab" -dependencies = [ - "gpui-pre-perf", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "gpui-pre-web" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "184776d0763e6889dd2842dcb1204c15055945f2bdfe926b5ef57bdbd1952a65" +name = "gpui_web" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "anyhow", + "async-channel", "console_error_panic_hook", "futures", - "gpui-pre", - "gpui-pre-http-client", - "gpui-pre-scheduler", - "gpui-pre-wgpu", + "gpui", + "gpui_wgpu", + "http_client", "js-sys", "log", "parking_lot", "raw-window-handle", + "scheduler", "smallvec", "unicode-properties", "unicode-script", @@ -4204,19 +3372,18 @@ dependencies = [ ] [[package]] -name = "gpui-pre-wgpu" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439c5421cafe1a7cf68d0c0ae5cc82b26fad6b0e6345ac98d20acaf1f2463914" +name = "gpui_wgpu" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "anyhow", "bytemuck", + "collections", "cosmic-text", "etagere", - "gpui-pre", - "gpui-pre-collections", - "gpui-pre-util", - "itertools 0.14.0", + "gpui", + "gpui_util", + "itertools", "log", "parking_lot", "profiling", @@ -4227,31 +3394,29 @@ dependencies = [ "unicode-segmentation", "web-sys", "wgpu", - "zed-font-kit", ] [[package]] -name = "gpui-pre-windows" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371f9bb13f97e3bea2f8b8e5e81232bb74d735153c244ae67f7400e743925b1c" +name = "gpui_windows" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ "accesskit", "accesskit_windows", "anyhow", + "collections", "dunce", "etagere", "futures", - "gpui-pre", - "gpui-pre-collections", - "gpui-pre-scheduler", - "gpui-pre-util", + "gpui", + "gpui_util", "image", - "itertools 0.14.0", + "itertools", "log", "parking_lot", "rand 0.9.5", "raw-window-handle", + "scheduler", "smallvec", "uuid", "windows 0.62.2", @@ -4260,46 +3425,6 @@ dependencies = [ "windows-registry 0.6.1", ] -[[package]] -name = "gpui-pre-zlog" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bbe5b98630ef4bfed5a7105ec1062e78d571912bc491388f07ea22f2457c18b" -dependencies = [ - "anyhow", - "chrono", - "gpui-pre-collections", - "log", -] - -[[package]] -name = "gpui-pre-ztracing" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f806400f6bda1fdd9fc627e158c0e44fb0c4b7767582a3621efcf92f4a850db7" -dependencies = [ - "gpui-pre-zlog", - "gpui-pre-ztracing-macro", - "tracing", - "tracing-subscriber", -] - -[[package]] -name = "gpui-pre-ztracing-macro" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d337c9acf058238e45ce0570d8a5958439242889492f91ae2d8e324211a61ccd" - -[[package]] -name = "granit-parser" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e20f99e46474f56bd905c56e817ebddcf377a611f94c53ac4649e4d3fa3c0cd0" -dependencies = [ - "arraydeque", - "smallvec", -] - [[package]] name = "h2" version = "0.4.20" @@ -4312,7 +3437,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.14.2", + "indexmap", "slab", "tokio", "tokio-util", @@ -4353,27 +3478,12 @@ dependencies = [ "byteorder", ] -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - [[package]] name = "hashbrown" version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" -[[package]] -name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - [[package]] name = "hashbrown" version = "0.16.1" @@ -4382,7 +3492,7 @@ checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -4393,7 +3503,7 @@ checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" dependencies = [ "allocator-api2", "equivalent", - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -4492,12 +3602,6 @@ dependencies = [ "arrayvec", ] -[[package]] -name = "hexf-parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" - [[package]] name = "hkdf" version = "0.12.4" @@ -4525,20 +3629,6 @@ dependencies = [ "digest 0.11.3", ] -[[package]] -name = "html5ever" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" -dependencies = [ - "log", - "mac", - "markup5ever", - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "http" version = "1.5.0" @@ -4572,6 +3662,34 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "http_client" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "anyhow", + "bytes", + "futures", + "http", + "http-body", + "parking_lot", + "serde", + "serde_json", + "serde_urlencoded", + "url", +] + +[[package]] +name = "http_client_tls" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "log", + "rustls", + "rustls-platform-verifier", + "webpki-roots 1.0.12", +] + [[package]] name = "httparse" version = "1.10.1" @@ -4674,9 +3792,9 @@ dependencies = [ [[package]] name = "icu_collections" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa68d21081c4a05d5a901a1c62add574c77048b6a1c67be3b50ce0b60d4ca513" +checksum = "fe090a42a0d3140fed8c63263ed1fecc02422cb2f4bfe55cd8de2de1b8e105dd" dependencies = [ "displaydoc", "potential_utf", @@ -4688,22 +3806,43 @@ dependencies = [ [[package]] name = "icu_locale_core" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d56e28588da92eee5c3201a6eff33fabdd49b62269c8938d4ff050ce4d900deb" +checksum = "25d29b57c17c6528d0dc4c2141cfa2d08200465acb537a3909c8b9b8a4a984c0" dependencies = [ "displaydoc", "litemap", + "serde", "tinystr", "writeable", "zerovec", ] [[package]] -name = "icu_normalizer" -version = "2.3.0" +name = "icu_locale_fallback" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f9cf5f235641ed274641dd81c3f28d870e276763d0797aeeab72317b1c646f" +checksum = "406e9ae5b95d8aa37db6293405931b766a6172d1848daee22d70eb44aa78a43c" +dependencies = [ + "icu_locale_core", + "icu_locale_fallback_data", + "icu_provider", + "potential_utf", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locale_fallback_data" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3632ebbd0c5c3637ba1a40bdf8288f2cb9d2268e73441a69d5fc73d7cfbaa87c" + +[[package]] +name = "icu_normalizer" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "404a3b8c486f205c87fe7f23ab6894d84a4ad76d6e4671ae1981ba7def87c599" dependencies = [ "icu_collections", "icu_normalizer_data", @@ -4715,15 +3854,15 @@ dependencies = [ [[package]] name = "icu_normalizer_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1563da1ed3e0b3bf3d74c9b85917ac9c56464d2f57242270c09c9e752f8021a0" +checksum = "20f0088bfb7441f7a37fa0c9e20cb1e9cba1cac6b9ce8cd2a6dc44294f8e8cbc" [[package]] name = "icu_properties" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e7ca276ad3145661a65914e6daf131ca5120cd3dcee8f8f3214b8875184a148" +checksum = "2ea83d991c56158f7cf898bf86436c1dfe7c07ee82fe88951f2695c9f37a379f" dependencies = [ "displaydoc", "icu_collections", @@ -4736,18 +3875,20 @@ dependencies = [ [[package]] name = "icu_properties_data" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e590f038c1464a96894fd6d10127e90a8be4509f56ff7ecef851b15cee0b7caa" +checksum = "b98f29af82d02b163fe50161388350e743bb3107cc8e8c2f7314cb505faddfcf" [[package]] name = "icu_provider" -version = "2.3.1" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27bbb9d3abbefac45d55f647c9de1d44aafcd1186eb91879afef17c396c3e73" +checksum = "413099315636c588ee8f011190b329b971a09a8fae9d157e01dcae8379468514" dependencies = [ "displaydoc", "icu_locale_core", + "serde", + "stable_deref_trait", "writeable", "yoke", "zerofrom", @@ -4756,10 +3897,27 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "icu_segmenter" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "61b195dc605f81aa181bec9b3bd14e26cc71b903e4644f6af578ca9772c7a710" +dependencies = [ + "icu_collections", + "icu_locale_fallback", + "icu_provider", + "icu_segmenter_data", + "potential_utf", + "smallvec", + "utf8_iter", + "zerotrie", + "zerovec", +] + +[[package]] +name = "icu_segmenter_data" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "913a7d294ad056474749152107309fdee3ec17d2482d1ab70fdc61a81c64b9a3" [[package]] name = "idna" @@ -4784,9 +3942,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b69833ed729dc5aa7d19541d96d6cf8e9137194207a04916d658e43168402f" +checksum = "484be5657551d7868d67587df967fb4fcbe9d266a761cc855aaa148fda0b3cc7" dependencies = [ "crossbeam-deque", "globset", @@ -4808,7 +3966,7 @@ dependencies = [ "byteorder-lite", "color_quant", "exr", - "gif 0.14.2", + "gif", "image-webp", "moxcms", "num-traits", @@ -4817,8 +3975,8 @@ dependencies = [ "ravif", "rayon", "tiff", - "zune-core 0.5.3", - "zune-jpeg 0.5.15", + "zune-core", + "zune-jpeg", ] [[package]] @@ -4828,15 +3986,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3" dependencies = [ "byteorder-lite", - "quick-error 2.0.1", + "quick-error", ] -[[package]] -name = "imagesize" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" - [[package]] name = "imagesize" version = "0.14.0" @@ -4849,17 +4001,6 @@ version = "1.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e44b0a4eaa4c82f441d50a963f2d5f05a787240aeee097597033e72accfd22f" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.14.2" @@ -4904,25 +4045,13 @@ dependencies = [ [[package]] name = "inout" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5cf4372d022092674a83b8febf5865f7a573cc0c5baec5e49c879b6a20978f" +checksum = "3a580c13f0ffc335ef42dd3f6b1a41b726051c5e1656d9a3aa6fddb3c5dfbbf9" dependencies = [ "hybrid-array", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "interpolate_name" version = "0.2.4" @@ -4953,61 +4082,12 @@ dependencies = [ "winapi", ] -[[package]] -name = "io-surface" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" -dependencies = [ - "cgl", - "core-foundation 0.10.1", - "core-foundation-sys", - "leaky-cow", -] - [[package]] name = "ipnet" version = "2.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "791930b43c0d5973160d90a8f3894509f2b273430f5c5c73b668636d0287c5c0" -[[package]] -name = "is-docker" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928bae27f42bc99b60d9ac7334e3a21d10ad8f1835a4e12ec3ec0464765ed1b3" -dependencies = [ - "once_cell", -] - -[[package]] -name = "is-wsl" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "173609498df190136aa7dea1a91db051746d339e18476eed5ca40521f02d7aa5" -dependencies = [ - "is-docker", - "once_cell", -] - -[[package]] -name = "itertools" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" -dependencies = [ - "either", -] - -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.14.0" @@ -5019,17 +4099,16 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" +checksum = "3bd1574e617a9a6c1f8f8181bd7e841e1f20e4277607ef28945765188d6284d4" [[package]] name = "jiff" -version = "0.2.38" +version = "0.2.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b005715dcbeb0089a3c0dab99f2ff1cc3b2525323552703d648585d342a383" +checksum = "fefca06093eeaed707a905795e68206da0edca4edef23d2a3997a3ddbee462aa" dependencies = [ - "defmt 1.2.0", "jiff-core", "jiff-static", "jiff-tzdb-platform", @@ -5042,19 +4121,18 @@ dependencies = [ [[package]] name = "jiff-core" -version = "0.1.1" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e52fe76043ccecc9005d2305ebaadf7d7fc0cc89ca6baa10a94d6bc68c7128c" +checksum = "77a24020db0ee88d1c681d677681bd31f9f4ea189a455425223d52ce4f1508aa" dependencies = [ - "defmt 1.2.0", "log", ] [[package]] name = "jiff-static" -version = "0.2.38" +version = "0.2.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc9817253cf7c7ee4684451bd327e88d6f3658014e54a29198625590650695c" +checksum = "41d3213549742662eea1a18e6c5af9be5dfbabeb7611ab71356a54928ec398f0" dependencies = [ "jiff-core", "proc-macro2", @@ -5147,9 +4225,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7883d941dae510fb2d978fc3fe018c71c9e2892fd38854de3e8b92c2e5ad9cc5" +checksum = "8dc09d2154098bbf4ef54eab6b117a3c24cbbffe94046b16ee6d6d4510584d3a" dependencies = [ "cfg-if", "futures-util", @@ -5193,17 +4271,6 @@ dependencies = [ "libc", ] -[[package]] -name = "kurbo" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c62026ae44756f8a599ba21140f350303d4f08dcdcc71b5ad9c9bb8128c13c62" -dependencies = [ - "arrayvec", - "euclid", - "smallvec", -] - [[package]] name = "kurbo" version = "0.13.1" @@ -5222,33 +4289,12 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20870f649af7073d53e38067b2a84312175d56ea15217e1b15bc83506ec50afb" -[[package]] -name = "leak" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd100e01f1154f2908dfa7d02219aeab25d0b9c7fa955164192e3245255a0c73" - -[[package]] -name = "leaky-cow" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40a8225d44241fd324a8af2806ba635fc7c8a7e9a7de4d5cf3ef54e71f5926fc" -dependencies = [ - "leak", -] - [[package]] name = "lebe" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8" -[[package]] -name = "libbz2-rs-sys" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34b357333733e8260735ba5894eb928c02ecc69c78715f01a8019e7fa7f2db4c" - [[package]] name = "libc" version = "0.2.191" @@ -5348,12 +4394,11 @@ dependencies = [ [[package]] name = "log" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f8bd3e56ce4dfc153cf470fffbfa98c7620958b312ca5c3a4b8d5181fd13c6" +checksum = "5d15f86d12da44cd8d4ec3c73984537eb7f4cadcb9776a575a0a8a05ca11005c" dependencies = [ "serde_core", - "value-bag", ] [[package]] @@ -5377,19 +4422,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f" -[[package]] -name = "lsp-types" -version = "0.97.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53353550a17c04ac46c585feb189c2db82154fc84b79c7a66c96c2c644f66071" -dependencies = [ - "bitflags 1.3.2", - "fluent-uri", - "serde", - "serde_json", - "serde_repr", -] - [[package]] name = "lyon" version = "1.0.19" @@ -5402,9 +4434,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.21" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009" +checksum = "f3a6b9d4e8b48acd531fbf1241ad9b270df6e60b6b92bdea1469f4f40899d805" dependencies = [ "lyon_path", "num-traits", @@ -5412,9 +4444,9 @@ dependencies = [ [[package]] name = "lyon_geom" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4336502e29e32af93cf2dad2214ed6003c17ceb5bd499df77b1de663b9042b92" +checksum = "d82dd26aa4dc0b5b70b9115de59824842bcb43cf4a28e1b1e6d0ad148c93f93e" dependencies = [ "arrayvec", "euclid", @@ -5433,21 +4465,15 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b8dcf906637ecef61b3c0740c7a4e7f27caeb31257cfac0cc579ce15be6005" +checksum = "fd4872650e70dc907dd4f7ebc449d7d657a0d2658e423b2e724970870bbbf75b" dependencies = [ "float_next_after", "lyon_path", "num-traits", ] -[[package]] -name = "mac" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" - [[package]] name = "mac-notification-sys" version = "0.6.15" @@ -5464,57 +4490,25 @@ dependencies = [ [[package]] name = "mach2" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a1b95cd5421ec55b445b5ae102f5ea0e768de1f82bd3001e11f426c269c3aea" +checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b" + +[[package]] +name = "macro_rules_attribute" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3ae8f6d608c795738406608304d30a2dfbdc8e58e44f7ba43236da5208ded3c" dependencies = [ - "libc", + "macro_rules_attribute-proc_macro", + "pastey 0.2.3", ] [[package]] -name = "malloc_buf" -version = "0.0.6" +name = "macro_rules_attribute-proc_macro" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "markdown" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb" -dependencies = [ - "serde", - "unicode-id", -] - -[[package]] -name = "markup5ever" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" -dependencies = [ - "log", - "phf 0.11.3", - "phf_codegen", - "string_cache", - "string_cache_codegen", - "tendril", -] - -[[package]] -name = "markup5ever_rcdom" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edaa21ab3701bfee5099ade5f7e1f84553fd19228cf332f13cd6e964bf59be18" -dependencies = [ - "html5ever", - "markup5ever", - "tendril", - "xml5ever", -] +checksum = "fc04a4c58212d57930a24bf47d3fa87485264a3a054e9c10e042eb373573ad3c" [[package]] name = "maybe-rayon" @@ -5544,9 +4538,9 @@ checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "memmap2" -version = "0.9.11" +version = "0.9.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1219ed1b7f229ee7104d281dd01d6802fe28bb6e95d292942c4daacdeb798c0" +checksum = "6b0ca1155a9ecc25aa12e8313a119f32edf0255fea2f44839c4ac0a12b2ac157" dependencies = [ "libc", ] @@ -5567,33 +4561,18 @@ dependencies = [ "anyhow", "flume 0.11.1", "futures", - "gpui-pre", + "gpui", "log", "nostr-sdk", "signed_state", "utils", ] -[[package]] -name = "metal" -version = "0.33.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7047791b5bc903b8cd963014b355f71dc9864a9a0b727057676c1dcae5cbc15" -dependencies = [ - "bitflags 2.13.2", - "block", - "core-graphics-types 0.2.0", - "foreign-types", - "log", - "objc", - "paste", -] - [[package]] name = "mime" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" +checksum = "d5848f5a9e8117cf94f2f90faac24a87ff81600ff8628c1e3deaab572e76bfa1" [[package]] name = "mime_guess" @@ -5605,12 +4584,6 @@ dependencies = [ "unicase", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" version = "0.8.9" @@ -5653,6 +4626,28 @@ dependencies = [ "pxfm", ] +[[package]] +name = "multiversion" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb8a68be21d0755f83bfe47e79b896cc732687cf1903f0e50585e8d6ecc53076" +dependencies = [ + "multiversion-macros", + "target-features", +] + +[[package]] +name = "multiversion-macros" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a05e0c3c3e4edaa21d87c645852ed0b0c3663752bcc6ec43353bd6189dce35e1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.119", + "target-features", +] + [[package]] name = "multiversion_no_op" version = "1.0.0" @@ -5661,22 +4656,21 @@ checksum = "743fb55ba31b18fb1ecef6bdc9aa2743314978ac084044301a7eee33fb99a20d" [[package]] name = "naga" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2bf919621e7975acb27d881bae2fb993e0d45c8e0446e85e6272971e00dc8df" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "arrayvec", - "bit-set 0.9.1", + "bit-set", "bitflags 2.13.2", "cfg-if", "cfg_aliases", "codespan-reporting", "half", - "hashbrown 0.16.1", - "hexf-parse", - "indexmap 2.14.2", + "hashbrown 0.17.1", + "indexmap", "libm", "log", + "naga-types", "num-traits", "once_cell", "rustc-hash 1.1.0", @@ -5686,56 +4680,28 @@ dependencies = [ ] [[package]] -name = "native-theme" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea89548b5c74493eeda312d5b1dad2c3c5f3bb35076dfef7c9a5b85c5cf140bf" +name = "naga-types" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ - "arc-swap", - "ashpd", - "async-trait", - "block2 0.6.2", - "configparser", - "fontdb", - "inventory", - "native-theme-derive", - "notify", - "objc2 0.6.5", - "objc2-app-kit 0.3.2", - "objc2-core-foundation", - "objc2-core-text", - "objc2-foundation 0.3.2", - "pollster 1.0.1", - "serde", - "serde_with", - "toml 1.1.8+spec-1.1.0", - "unicase", - "windows 0.62.2", - "zbus", + "hashbrown 0.17.1", + "indexmap", + "rustc-hash 1.1.0", + "thiserror 2.0.21", ] [[package]] -name = "native-theme-derive" -version = "0.6.1" +name = "ndk" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cddcfe1cc7b75a3ef362b242343aabf8fd9053ed9b4c72bcf4af4a45989b4d1" +checksum = "c3f42e7bbe13d351b6bead8286a43aac9534b82bd3cc43e47037f012ebfd62d4" dependencies = [ - "proc-macro2", - "quote", - "syn 3.0.9", -] - -[[package]] -name = "native-theme-gpui" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5002c99b80209a2da63224a8ffa6a6b95feb836a1098c1189de47f69f3a40053" -dependencies = [ - "gpui-base", - "gpui-component", - "gpui-pre", - "image", - "native-theme", + "bitflags 2.13.2", + "jni-sys 0.3.1", + "log", + "ndk-sys", + "num_enum", + "thiserror 1.0.69", ] [[package]] @@ -5755,9 +4721,9 @@ dependencies = [ [[package]] name = "negentropy" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d66662cb5ca384d4991509755ed5a42dd8e31c4282bf881938e506fc3146ec" +checksum = "fd6f12461d14b5768028d39fab3cdfbcefb0bc7f09e95f413a00b6fdedcc9c2d" [[package]] name = "new_debug_unreachable" @@ -5774,22 +4740,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nom" version = "8.0.0" @@ -5811,19 +4761,10 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" -[[package]] -name = "normpath" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b11ce00d2594068e8a27c9146fdc5cf9f3ac38eb42c7cd34d05fea618873ac9f" -dependencies = [ - "windows-sys 0.61.2", -] - [[package]] name = "nostr" -version = "0.45.5" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +version = "0.45.7" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "aes", "base64 0.22.1", @@ -5849,7 +4790,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "async-utility", "nostr", @@ -5862,7 +4803,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.45.2" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "nostr", "opaquerr", @@ -5871,7 +4812,7 @@ dependencies = [ [[package]] name = "nostr-gossip" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "nostr", "opaquerr", @@ -5880,9 +4821,9 @@ dependencies = [ [[package]] name = "nostr-gossip-memory" version = "0.45.1" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ - "indexmap 2.14.2", + "indexmap", "lru", "nostr", "nostr-gossip", @@ -5892,7 +4833,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.45.3" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "async-utility", "flatbuffers", @@ -5906,8 +4847,8 @@ dependencies = [ [[package]] name = "nostr-sdk" -version = "0.45.4" -source = "git+https://github.com/rust-nostr/nostr#20096765b95f4840dd3df66cad49db35e9634462" +version = "0.45.6" +source = "git+https://github.com/rust-nostr/nostr#4904ffb85f60178375a1dda659a61793f36f03b8" dependencies = [ "async-utility", "async-wsocket", @@ -5928,41 +4869,42 @@ dependencies = [ [[package]] name = "notify" -version = "8.2.0" +version = "8.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" +checksum = "c41a04a5f59df9322cc657286dd2d79f90816119b22c5f847607c850110205ab" dependencies = [ "bitflags 2.13.2", - "fsevent-sys", "inotify", "kqueue", "libc", "log", "mio", "notify-types", + "objc2-core-foundation", + "objc2-core-services", "walkdir", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "notify-rust" -version = "4.18.2" +version = "4.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4587364a9a0074333429b3df75a30a205340c56a536ca3eb6ca0e59b87bbf8af" +checksum = "57da5b5d3b7809bf71858da5a2818c3404ca4688c02c8abecdda0fcdec235df3" dependencies = [ "futures-lite", "log", "mac-notification-sys", "serde", "tauri-winrt-notification", - "zbus", + "zbus 6.2.1", ] [[package]] name = "notify-types" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a" +checksum = "8c491a384baf9fec20df565cdb8138a12809d4c7439763b566eb8114c5d59979" dependencies = [ "bitflags 2.13.2", ] @@ -6032,7 +4974,6 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495" dependencies = [ - "bytemuck", "num-traits", ] @@ -6104,24 +5045,25 @@ dependencies = [ ] [[package]] -name = "objc" -version = "0.2.7" +name = "num_enum" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" dependencies = [ - "malloc_buf", - "objc_exception", + "num_enum_derive", + "rustversion", ] [[package]] -name = "objc-foundation" -version = "0.1.1" +name = "num_enum_derive" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "block", - "objc", - "objc_id", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.119", ] [[package]] @@ -6159,8 +5101,8 @@ dependencies = [ "block2 0.5.1", "libc", "objc2 0.5.3", - "objc2-core-data 0.2.2", - "objc2-core-image 0.2.2", + "objc2-core-data", + "objc2-core-image", "objc2-foundation 0.2.2", "objc2-quartz-core 0.2.2", ] @@ -6173,24 +5115,32 @@ checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", - "libc", "objc2 0.6.5", - "objc2-cloud-kit", - "objc2-core-data 0.3.2", "objc2-core-foundation", - "objc2-core-graphics", - "objc2-core-image 0.3.2", - "objc2-core-text", - "objc2-core-video", "objc2-foundation 0.3.2", - "objc2-quartz-core 0.3.2", + "objc2-uniform-type-identifiers", ] [[package]] -name = "objc2-cloud-kit" +name = "objc2-audio-toolbox" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c" +checksum = "6948501a91121d6399b79abaa33a8aa4ea7857fe019f341b8c23ad6e81b79b08" +dependencies = [ + "bitflags 2.13.2", + "libc", + "objc2 0.6.5", + "objc2-core-audio", + "objc2-core-audio-types", + "objc2-core-foundation", + "objc2-foundation 0.3.2", +] + +[[package]] +name = "objc2-avf-audio" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13a380031deed8e99db00065c45937da434ca987c034e13b87e4441f9e4090be" dependencies = [ "bitflags 2.13.2", "objc2 0.6.5", @@ -6207,6 +5157,7 @@ dependencies = [ "objc2 0.6.5", "objc2-core-audio-types", "objc2-core-foundation", + "objc2-foundation 0.3.2", ] [[package]] @@ -6231,17 +5182,6 @@ dependencies = [ "objc2-foundation 0.2.2", ] -[[package]] -name = "objc2-core-data" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa" -dependencies = [ - "bitflags 2.13.2", - "objc2 0.6.5", - "objc2-foundation 0.3.2", -] - [[package]] name = "objc2-core-foundation" version = "0.3.2" @@ -6281,38 +5221,13 @@ dependencies = [ ] [[package]] -name = "objc2-core-image" +name = "objc2-core-services" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006" +checksum = "583300ad934cba24ff5292aee751ecc070f7ca6b39a574cc21b7b5e588e06a0b" dependencies = [ - "objc2 0.6.5", - "objc2-foundation 0.3.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.5", - "objc2-foundation 0.3.2", -] - -[[package]] -name = "objc2-core-media" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ec576860167a15dd9fce7fbee7512beb4e31f532159d3482d1f9c6caedf31d" -dependencies = [ - "bitflags 2.13.2", - "dispatch2", - "objc2 0.6.5", - "objc2-core-audio", - "objc2-core-audio-types", + "libc", "objc2-core-foundation", - "objc2-core-video", ] [[package]] @@ -6322,11 +5237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d" dependencies = [ "bitflags 2.13.2", - "block2 0.6.2", - "libc", - "objc2 0.6.5", "objc2-core-foundation", - "objc2-core-graphics", ] [[package]] @@ -6340,6 +5251,7 @@ dependencies = [ "objc2-core-foundation", "objc2-core-graphics", "objc2-io-surface", + "objc2-metal 0.3.2", ] [[package]] @@ -6404,6 +5316,7 @@ checksum = "a0125f776a10d00af4152d74616409f0d4a2053a6f57fa5b7d6aa2854ac04794" dependencies = [ "bitflags 2.13.2", "block2 0.6.2", + "dispatch2", "objc2 0.6.5", "objc2-foundation 0.3.2", ] @@ -6430,21 +5343,41 @@ dependencies = [ "bitflags 2.13.2", "objc2 0.6.5", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation 0.3.2", "objc2-metal 0.3.2", ] [[package]] -name = "objc2-screen-capture-kit" +name = "objc2-security" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74b7c5390f477482f001bc354d6571a70db7e4f8d5288e860c45521fbce11394" +checksum = "709fe137109bd1e8b5a99390f77a7d8b2961dafc1a1c5db8f2e60329ad6d895a" dependencies = [ + "objc2-core-foundation", +] + +[[package]] +name = "objc2-ui-kit" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22" +dependencies = [ + "bitflags 2.13.2", "block2 0.6.2", - "dispatch2", "objc2 0.6.5", - "objc2-core-graphics", - "objc2-core-media", + "objc2-core-foundation", + "objc2-foundation 0.3.2", + "objc2-quartz-core 0.3.2", +] + +[[package]] +name = "objc2-uniform-type-identifiers" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7902ac02859fc1f7045f8b598c63f1ae0cc7efeaa06a9bc9f3d9a3c955974fa4" +dependencies = [ + "objc2 0.6.5", "objc2-foundation 0.3.2", ] @@ -6457,33 +5390,14 @@ dependencies = [ "bitflags 2.13.2", "block2 0.6.2", "objc2 0.6.5", - "objc2-core-location", "objc2-foundation 0.3.2", ] -[[package]] -name = "objc_exception" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" -dependencies = [ - "cc", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - [[package]] name = "object" -version = "0.37.3" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +checksum = "dd229a0361b9d0d4396176e02d65897f487eebeab7caa6d443855ee152ca0b9c" dependencies = [ "memchr", ] @@ -6497,8 +5411,7 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "oo7" version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78f2bfed90f1618b4b48dcad9307f25e14ae894e2949642c87c351601d62cebd" +source = "git+https://github.com/zed-industries/oo7?rev=731c1215edb6905876c6137ab300428c7b8d7c13#731c1215edb6905876c6137ab300428c7b8d7c13" dependencies = [ "aes", "ashpd", @@ -6523,8 +5436,8 @@ dependencies = [ "serde_bytes", "sha2 0.10.9", "subtle", - "zbus", - "zbus_macros", + "zbus 5.19.0", + "zbus_macros 5.19.0", "zeroize", "zvariant", ] @@ -6541,21 +5454,11 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f933a4265d5cdad61d19bbdfc972ea5726d56cd8d3d57b8f2d3c365dd42bee9" -[[package]] -name = "open" -version = "5.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa576c76302b7b808eecc68061e67336c47833ef9d22caa74dda10fa9675eebc" -dependencies = [ - "is-wsl", - "libc", -] - [[package]] name = "openssl-probe" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" +checksum = "7e036b411754132fd6b74e94b74e9a13c5cf606fa93d1885c35860d3060820b1" [[package]] name = "option-ext" @@ -6565,9 +5468,9 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "ordered-float" -version = "5.5.0" +version = "5.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c7c9e0d9b23589f26070720bac724174bfec1083e82f7854cdd0267518343c0" +checksum = "7f59006ce1e204c30956638535b74d317bca99477b9356dfaec54c37f6f600ab" dependencies = [ "num-traits", ] @@ -6633,6 +5536,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +[[package]] +name = "pastey" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ee67f1008b1ba2321834326597b8e186293b049a023cdef258527550b9935b4" + [[package]] name = "pathfinder_geometry" version = "0.5.1" @@ -6656,7 +5565,7 @@ dependencies = [ name = "paths" version = "0.2.0" dependencies = [ - "dirs 6.0.0", + "dirs", ] [[package]] @@ -6691,29 +5600,8 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ - "phf_macros 0.11.3", - "phf_shared 0.11.3", -] - -[[package]] -name = "phf" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" -dependencies = [ - "phf_macros 0.13.1", - "phf_shared 0.13.1", - "serde", -] - -[[package]] -name = "phf_codegen" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", + "phf_macros", + "phf_shared", ] [[package]] @@ -6722,41 +5610,18 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared 0.11.3", + "phf_shared", "rand 0.8.8", ] -[[package]] -name = "phf_generator" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" -dependencies = [ - "fastrand", - "phf_shared 0.13.1", -] - [[package]] name = "phf_macros" version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", - "syn 2.0.119", -] - -[[package]] -name = "phf_macros" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" -dependencies = [ - "phf_generator 0.13.1", - "phf_shared 0.13.1", + "phf_generator", + "phf_shared", "proc-macro2", "quote", "syn 2.0.119", @@ -6771,15 +5636,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "phf_shared" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" -dependencies = [ - "siphasher", -] - [[package]] name = "pico-args" version = "0.5.0" @@ -6869,24 +5725,12 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - [[package]] name = "pollster" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3a9f18d041e6d0e102a0a46750538147e5e8992d3b4873aaafee2520b00ce3" -[[package]] -name = "pollster" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6355899e1c9462875b6757c79f3caa011a1fdae12bbb1a2e72dd1f234f8336" - [[package]] name = "poly1305" version = "0.8.0" @@ -6922,29 +5766,14 @@ dependencies = [ "portable-atomic", ] -[[package]] -name = "postage" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af3fb618632874fb76937c2361a7f22afd393c982a2165595407edc75b06d3c1" -dependencies = [ - "atomic", - "crossbeam-queue", - "futures", - "log", - "parking_lot", - "pin-project", - "pollster 0.2.5", - "static_assertions", - "thiserror 1.0.69", -] - [[package]] name = "potential_utf" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d83eb9bc6d8e5cf568e7a1101d60ee05e81ed50ea106026f3d18deeb046d7661" dependencies = [ + "serde_core", + "writeable", "zerovec", ] @@ -6963,35 +5792,19 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "precomputed-hash" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" - [[package]] name = "presser" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8cf8e6a8aa66ce33f63993ffc4ea4271eb5b0530a9002db8455ea6050c77bfa" -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn 2.0.119", -] - [[package]] name = "proc-macro-crate" version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ - "toml_edit 0.25.17+spec-1.1.0", + "toml_edit 0.25.19+spec-1.1.0", ] [[package]] @@ -7032,61 +5845,16 @@ dependencies = [ ] [[package]] -name = "proptest" -version = "1.12.0" +name = "pulldown-cmark" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8530004ccb15eae51c7e40009fbe317f341f804db54dc033eec1c50be28cfa0" +checksum = "3db2be46835f013dd3f4fa7f5f7402c537787b54ebb6fe2b94bbdd7e2669bb7b" dependencies = [ - "bit-set 0.11.1", - "bit-vec 0.10.1", "bitflags 2.13.2", - "chacha20 0.10.2", - "core_detect", - "num-traits", - "proptest-macro", - "rand 0.10.3", - "rand_xorshift", - "regex-syntax", - "rusty-fork", - "tempfile", - "unarray", + "memchr", + "unicase", ] -[[package]] -name = "proptest-macro" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e99782ea31698c2206c6887c1220d2f594b291c26cb9ec5b6d7cf175320bc212" -dependencies = [ - "convert_case 0.11.0", - "proc-macro2", - "quote", - "syn 3.0.9", -] - -[[package]] -name = "pulp" -version = "0.22.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046aa45b989642ec2e4717c8e72d677b13edd831a4d3b6cf37d9a3e54912496a" -dependencies = [ - "bytemuck", - "cfg-if", - "libm", - "num-complex", - "paste", - "pulp-wasm-simd-flag", - "raw-cpuid", - "reborrow", - "version_check", -] - -[[package]] -name = "pulp-wasm-simd-flag" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d8f70e07b9c3962945a74e59ca1c511bba65b6419468acc217c457d93f3c740" - [[package]] name = "pxfm" version = "0.1.30" @@ -7102,12 +5870,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-error" version = "2.0.1" @@ -7286,15 +6048,6 @@ dependencies = [ "rand_core 0.10.1", ] -[[package]] -name = "rand_xorshift" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60aa6af80be32871323012e02e6e65f8a7cc7890931ae421d217ad8fe0df2ccf" -dependencies = [ - "rand_core 0.10.1", -] - [[package]] name = "range-alloc" version = "0.1.5" @@ -7323,7 +6076,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools 0.14.0", + "itertools", "libc", "libfuzzer-sys", "log", @@ -7351,21 +6104,12 @@ dependencies = [ "avif-serialize", "imgref", "loop9", - "quick-error 2.0.1", + "quick-error", "rav1e", "rayon", "rgb", ] -[[package]] -name = "raw-cpuid" -version = "11.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498cd0dc59d73224351ee52a95fee0f1a617a2eae0e7d9d720cc622c73a54186" -dependencies = [ - "bitflags 2.13.2", -] - [[package]] name = "raw-window-handle" version = "0.6.2" @@ -7426,12 +6170,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "reborrow" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03251193000f4bd3b042892be858ee50e8b3719f2b08e5833ac4353724632430" - [[package]] name = "redox_syscall" version = "0.5.18" @@ -7441,17 +6179,6 @@ dependencies = [ "bitflags 2.13.2", ] -[[package]] -name = "redox_users" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" -dependencies = [ - "getrandom 0.2.17", - "libredox", - "thiserror 1.0.69", -] - [[package]] name = "redox_users" version = "0.5.3" @@ -7479,7 +6206,15 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", +] + +[[package]] +name = "refineable" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "derive_refineable", ] [[package]] @@ -7558,20 +6293,20 @@ dependencies = [ ] [[package]] -name = "resvg" -version = "0.45.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8928798c0a55e03c9ca6c4c6846f76377427d2c1e1f7e6de3c06ae57942df43" +name = "reqwest_client" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ - "gif 0.13.3", - "image-webp", + "anyhow", + "bytes", + "futures", + "gpui_util", + "http_client", + "http_client_tls", "log", - "pico-args", - "rgb", - "svgtypes 0.15.3", - "tiny-skia", - "usvg 0.45.1", - "zune-jpeg 0.4.21", + "regex", + "tokio", + "zed-reqwest", ] [[package]] @@ -7580,15 +6315,15 @@ version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b563218631706d614e23059436526d005b50ab5f2d506b55a17eb65c5eb83419" dependencies = [ - "gif 0.14.2", + "gif", "image-webp", "log", "pico-args", "rgb", - "svgtypes 0.16.1", + "svgtypes", "tiny-skia", - "usvg 0.46.0", - "zune-jpeg 0.5.15", + "usvg", + "zune-jpeg", ] [[package]] @@ -7614,15 +6349,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "ropey" -version = "2.0.0-beta.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4045a00dc327d084a2bbf126976e14125b54f23bd30511d45b842eba76c52d74" -dependencies = [ - "str_indices", -] - [[package]] name = "roxmltree" version = "0.20.0" @@ -7631,18 +6357,18 @@ checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97" [[package]] name = "roxmltree" -version = "0.21.1" +version = "0.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1964b10c76125c36f8afe190065a4bf9a87bf324842c05701330bba9f1cacbb" +checksum = "9da7f59328b09405b181fee1018925fad50f157afb43c0c0f5c522c256dd5907" dependencies = [ "memchr", ] [[package]] name = "rust-embed" -version = "8.13.0" +version = "8.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19afa5b4b6a611de00bd1bdae6ae6f39084c9399f0679c3f52d8469cf335cc23" +checksum = "e98f580cf7a2863aeb6827800283f52cbe6fb3f3bb7c1843783f903c16dcb8ad" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -7651,78 +6377,29 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "8.13.0" +version = "8.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d8afda6374eac59e066abee06d265247ebbaf3006cf878e2879e8356e34053" +checksum = "a93e2f69cf224a6c7df7509aa5ba4a23f56828ee41b040e92ac8762371eb9ba7" dependencies = [ "mime_guess", "proc-macro2", "quote", "rust-embed-utils", - "shellexpand", "syn 2.0.119", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "8.13.0" +version = "8.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d84e8ba78bd384263e5922f084cbe1b081c3b7e69add59c8fb097b879ba968a" +checksum = "915e33dccbe7deb2b8a342dc4c517503fe85e0230ddbae40a4fb0220493dad9b" dependencies = [ "globset", "sha2 0.11.1", "walkdir", ] -[[package]] -name = "rust-i18n" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8502e73e6461c738659455c5d2cf95bc132760a6f203c717e66ee72b78906d7f" -dependencies = [ - "globwalk", - "regex", - "rust-i18n-macro", - "rust-i18n-support", - "smallvec", -] - -[[package]] -name = "rust-i18n-macro" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54a28dd9d46108d56b9f0c85b220908844233e561c03087890325104f90f2c6" -dependencies = [ - "glob", - "proc-macro2", - "quote", - "rust-i18n-support", - "serde", - "serde_json", - "syn 2.0.119", -] - -[[package]] -name = "rust-i18n-support" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e806c2a9701cbd6043992cd935c30cb1fdb128fa15e7b506f3b46f97045737c0" -dependencies = [ - "arc-swap", - "base62", - "foldhash 0.2.0", - "globwalk", - "itertools 0.11.0", - "normpath", - "serde", - "serde-saphyr", - "serde_json", - "siphasher", - "toml 0.8.23", - "triomphe", -] - [[package]] name = "rustc-demangle" version = "0.1.28" @@ -7752,9 +6429,9 @@ dependencies = [ [[package]] name = "rustix" -version = "1.1.5" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891efababe418670775f199f0d233d84843c227a0949a883ce15b37c78d6629d" +checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa" dependencies = [ "bitflags 2.13.2", "errno", @@ -7802,9 +6479,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.15.1" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4925028c7eb5d1fcdaf196971378ed9d2c1c4efc7dc5d011256f76c99c0a96" +checksum = "102f35f7de7b06d8c61f1cff6592f5253e0dea431c74867aad5dfd70f44663fb" dependencies = [ "web-time", "zeroize", @@ -7816,7 +6493,7 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1167586491e2b18b8bfbb293e8180ec17c201c4f076d7cb3070ca964e7598f98" dependencies = [ - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "jni", "log", @@ -7839,9 +6516,9 @@ checksum = "eec689c0bc40ff2458a5977b6619cb718087084a18e02a131c599b62d05e1a5f" [[package]] name = "rustls-webpki" -version = "0.103.15" +version = "0.103.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3c3cf1d8b1e7d4927e2d154c3fcb02979afb9939629c62cd9048d4f07b60ac2" +checksum = "4443b1b6d39d7c663139942cc4558262562d2c84123bb6282ef177009ca8b281" dependencies = [ "aws-lc-rs", "ring", @@ -7855,18 +6532,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" -[[package]] -name = "rusty-fork" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" -dependencies = [ - "fnv", - "quick-error 1.2.3", - "tempfile", - "wait-timeout", -] - [[package]] name = "rustybuzz" version = "0.20.1" @@ -7920,15 +6585,19 @@ dependencies = [ ] [[package]] -name = "schemars" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +name = "scheduler" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ - "dyn-clone", - "ref-cast", - "serde", - "serde_json", + "async-task", + "backtrace", + "chrono", + "flume 0.12.0", + "futures", + "parking_lot", + "rand 0.9.5", + "wasm_thread", + "web-time", ] [[package]] @@ -7938,7 +6607,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab508826f74a77ca9d5aba6ff19b522583ee3eaf28a19384ff3d0e5835fadf6e" dependencies = [ "dyn-clone", - "indexmap 2.14.2", + "indexmap", "ref-cast", "schemars_derive", "serde", @@ -7954,44 +6623,15 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 3.0.9", + "syn 3.0.10", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "screencapturekit" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a5eeeb57ac94960cfe5ff4c402be6585ae4c8d29a2cf41b276048c2e849d64e" -dependencies = [ - "screencapturekit-sys", -] - -[[package]] -name = "screencapturekit-sys" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22411b57f7d49e7fe08025198813ee6fd65e1ee5eff4ebc7880c12c82bde4c60" -dependencies = [ - "block", - "dispatch", - "objc", - "objc-foundation", - "objc_id", - "once_cell", -] - [[package]] name = "scrypt" version = "0.12.0" @@ -8037,7 +6677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags 2.13.2", - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -8079,23 +6719,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-saphyr" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8050abb251097357e24aff63ba2c52a6309ecb7d23a5474023df960a02694d8" -dependencies = [ - "annotate-snippets", - "base64 0.23.1", - "encoding_rs_io", - "granit-parser", - "nohash-hasher", - "num-traits", - "serde_core", - "smallvec", - "zmij", -] - [[package]] name = "serde_bytes" version = "0.11.19" @@ -8123,7 +6746,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -8134,16 +6757,7 @@ checksum = "f852137cce035d6a4df67ccce505ff6b3e9fd3a10e3e52b24dc71e650bb1a9bd" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", -] - -[[package]] -name = "serde_fmt" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e497af288b3b95d067a23a4f749f2861121ffcb2f6d8379310dcda040c345ed" -dependencies = [ - "serde_core", + "syn 3.0.10", ] [[package]] @@ -8152,8 +6766,8 @@ version = "1.0.154" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7e9cc8b1b85264074fbcc02a88680c4096b1e47df8f739dceb03bf482f04bd6" dependencies = [ - "foldhash 0.2.0", - "indexmap 2.14.2", + "foldhash", + "indexmap", "itoa", "memchr", "serde", @@ -8169,7 +6783,7 @@ checksum = "8d3b1629de253c70a0508c3899572da79ca359fdab27c7920ff00406df418906" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -8183,9 +6797,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7523beb55eece201a2356bee0bbca0d1ab466c14c07703b2e0ee6d42cb0c2c" +checksum = "9c187e0a369471c550af028cba56d4f4fa2a489ad28151ae95a4d340a2a8b782" dependencies = [ "serde_core", ] @@ -8202,45 +6816,12 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_with" -version = "3.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df9adc193c780ef8f159aee8b61e2d5801aaa555e6eb0947fe45530ec506296f" -dependencies = [ - "base64 0.23.1", - "bs58", - "chrono", - "hex", - "indexmap 1.9.3", - "indexmap 2.14.2", - "jiff", - "schemars 0.9.0", - "schemars 1.2.3", - "serde_core", - "serde_json", - "serde_with_macros", - "time", -] - -[[package]] -name = "serde_with_macros" -version = "3.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e17bbc68e28663bbbb90df47e058aa7eda4fb445b89fe70457bb94fbccf6e49" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 3.0.9", -] - [[package]] name = "settings" version = "0.2.0" dependencies = [ "anyhow", - "gpui-pre", + "gpui", "log", "paths", "serde", @@ -8301,21 +6882,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "shellexpand" -version = "3.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32824fab5e16e6c4d86dc1ba84489390419a39f97699852b66480bb87d297ed8" -dependencies = [ - "dirs 6.0.0", -] - -[[package]] -name = "shlex" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" - [[package]] name = "shlex" version = "2.0.1" @@ -8337,21 +6903,37 @@ name = "signed" version = "0.2.0" dependencies = [ "assets", - "dock", - "flume 0.11.1", - "gpui-component", - "gpui-pre", - "gpui-pre-platform", - "gpui-pre-reqwest-client", + "gpui", + "gpui-native-kit", + "gpui_platform", "metadata", - "native-theme", - "native-theme-gpui", "paths", + "reqwest_client", "settings", + "signed_app", "signed_state", "tracing", "tracing-subscriber", - "workspace", +] + +[[package]] +name = "signed_app" +version = "0.2.0" +dependencies = [ + "anyhow", + "assets", + "futures", + "gpui", + "gpui-native-kit", + "log", + "metadata", + "paths", + "settings", + "signed_core", + "signed_git", + "signed_nostr", + "signed_state", + "utils", ] [[package]] @@ -8402,7 +6984,7 @@ dependencies = [ "flume 0.11.1", "futures", "gix", - "gpui-pre", + "gpui", "log", "nostr", "nostr-connect", @@ -8417,19 +6999,6 @@ dependencies = [ "utils", ] -[[package]] -name = "signed_ui" -version = "0.2.0" -dependencies = [ - "assets", - "futures", - "gpui-base", - "gpui-component", - "gpui-pre", - "log", - "signed_core", -] - [[package]] name = "simd-adler32" version = "0.3.10" @@ -8461,6 +7030,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" +[[package]] +name = "similar" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" + [[package]] name = "simplecss" version = "0.2.2" @@ -8513,9 +7088,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.16.3" +version = "1.16.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3dc8af474f516a851ff4bd12db780f948b9250ad37211e4eec0bccea54e01b" +checksum = "149309498a5f7334b12ddae0cad8aba81ce785fe91755068867e017cf98fee46" [[package]] name = "smol" @@ -8536,9 +7111,9 @@ dependencies = [ [[package]] name = "smol_str" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aaa7368fcf4852a4c2dd92df0cace6a71f2091ca0a23391ce7f3a31833f1523" +checksum = "eeb7109d23f319619d4cc0de5464613c8b7b1a09db2774a58101459cf6be2f10" dependencies = [ "serde_core", ] @@ -8592,12 +7167,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "str_indices" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d08889ec5408683408db66ad89e0e1f93dff55c73a4ccc71c427d5b277ee47e6" - [[package]] name = "streaming-iterator" version = "0.1.9" @@ -8613,37 +7182,6 @@ dependencies = [ "float-cmp", ] -[[package]] -name = "string_cache" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" -dependencies = [ - "new_debug_unreachable", - "parking_lot", - "phf_shared 0.11.3", - "precomputed-hash", - "serde", -] - -[[package]] -name = "string_cache_codegen" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c711928715f1fe0fe509c53b43e993a9a557babc2d0a3567d0a3006f1ac931a0" -dependencies = [ - "phf_generator 0.11.3", - "phf_shared 0.11.3", - "proc-macro2", - "quote", -] - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "strum" version = "0.28.0" @@ -8672,82 +7210,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] -name = "sval" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81b254da21fe1fcc4e3a74fe39b46e25e3a863078f8b71c954d47f84889dbc6" - -[[package]] -name = "sval_buffer" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50be352d2822ffafb59e3e2ddac9d5ee60f2eeadbb7b5a2a951b9f3651e87a6f" +name = "sum_tree" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" dependencies = [ - "sval", - "sval_ref", - "zerocopy", -] - -[[package]] -name = "sval_dynamic" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048ca293b998d9a45659159f94a64063791e74cdc670164943dbb434405573d" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_fmt" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b5888e40f80568733217f27b7317b845f463400ced36c424b1a804730e53b2" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_json" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17664d6bb6b74947afaab9d7c991caa9bf5638d4dee16fcbef637f440796049" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_nested" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07c059969ca5ca163ea7fef6c9661758973d17691aba92abdcf5c428f4ec122c" -dependencies = [ - "sval", - "sval_buffer", - "sval_ref", -] - -[[package]] -name = "sval_ref" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42d6b29ff568c85c87561807f51d2adfff4b6016c6363133f7cd1652a12548f3" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_serde" -version = "2.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33ec9edc42b12764d5c90ca0a1d84189c6bde81ed27507f1e661c6e4e05853" -dependencies = [ - "serde_core", - "sval", - "sval_nested", + "heapless 0.9.3", + "rayon", + "tracing", + "ztracing", ] [[package]] @@ -8758,21 +7228,11 @@ checksum = "0193cc4331cfd2f3d2011ef287590868599a2f33c3e69bc22c1a3d3acf9e02fb" [[package]] name = "svgtypes" -version = "0.15.3" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68c7541fff44b35860c1a7a47a7cadf3e4a304c457b58f9870d9706ece028afc" +checksum = "9f12b12995e3638c70618c1facb1ce65302f6a6f706b675f07c58a5d7391120e" dependencies = [ - "kurbo 0.11.3", - "siphasher", -] - -[[package]] -name = "svgtypes" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695b5790b3131dafa99b3bbfd25a216edb3d216dad9ca208d4657bfb8f2abc3d" -dependencies = [ - "kurbo 0.13.1", + "kurbo", "siphasher", ] @@ -8800,9 +7260,9 @@ dependencies = [ [[package]] name = "syn" -version = "3.0.9" +version = "3.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b" +checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79" dependencies = [ "proc-macro2", "quote", @@ -8835,7 +7295,7 @@ checksum = "901704edd0dfe137f1987838ee4f259e4e063c31371bdb423f7ae38ec6f77f02" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -8863,12 +7323,12 @@ dependencies = [ [[package]] name = "system-configuration" -version = "0.6.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +checksum = "501336eb7ba9e417300a6a0fa985721065467aa83a6dcf0422a8e43e4c0328fa" dependencies = [ "bitflags 2.13.2", - "core-foundation 0.9.4", + "core-foundation", "system-configuration-sys", ] @@ -8884,27 +7344,20 @@ dependencies = [ [[package]] name = "taffy" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c034e05f6ee85a12daa63863c2245797715075c70649947aa0da54f3f2ab1d0f" +checksum = "3c8480887e8803986d96a7173729565520d4bbb721ad6b7ad6941a22897207aa" dependencies = [ - "arrayvec", "serde", "slotmap", "smallvec", ] [[package]] -name = "tao-core-video-sys" -version = "0.2.0" +name = "target-features" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271450eb289cb4d8d0720c6ce70c72c8c858c93dd61fc625881616752e6b98f6" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "objc", -] +checksum = "c1bbb9f3c5c463a01705937a24fdabc5047929ac764b2d5b9cf681c1f5041ed5" [[package]] name = "tauri-winrt-notification" @@ -8930,17 +7383,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "tendril" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24a120c5fc464a3458240ee02c299ebcb9d67b5249c8848b09d639dca8d7bb0" -dependencies = [ - "futf", - "mac", - "utf-8", -] - [[package]] name = "termcolor" version = "1.4.1" @@ -8987,7 +7429,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -9008,9 +7450,9 @@ dependencies = [ "fax", "flate2", "half", - "quick-error 2.0.1", + "quick-error", "weezl", - "zune-jpeg 0.5.15", + "zune-jpeg", ] [[package]] @@ -9024,7 +7466,6 @@ dependencies = [ "powerfmt", "serde_core", "time-core", - "time-macros", ] [[package]] @@ -9033,25 +7474,6 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" -[[package]] -name = "time-macros" -version = "0.2.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e689342a48d2ea927c87ea50cabf8594854bf940e9310208848d680d668ed85" -dependencies = [ - "num-conv", - "time-core", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "tiny-skia" version = "0.11.4" @@ -9080,11 +7502,12 @@ dependencies = [ [[package]] name = "tinystr" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1e27c91459209c2986af3dcf603a5a74a4368754ce37414f59acc971167f643" +checksum = "abc840c238154d58f9e86b2792261edfde565a17696e1cda1a449de27979801a" dependencies = [ "displaydoc", + "serde_core", "zerovec", ] @@ -9096,9 +7519,9 @@ checksum = "fd3ca314f692efd6c868f8408f53fe444634a845f96c028b97d35f6a1f79f0ee" [[package]] name = "tokio" -version = "1.54.0" +version = "1.54.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0c168a474b95bfecfe908a65d4bdffc523144b649a74c09c286afb35d53e0bc" +checksum = "b52fd3255258d26fac7264ab5a76b53c13367136dc011d3d6ad4f8ed070396a3" dependencies = [ "bytes", "libc", @@ -9126,7 +7549,7 @@ checksum = "78773a2a397f451582ce068015985c33193cf6dea8b74d2a639fe457b2f07b0e" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -9207,17 +7630,17 @@ dependencies = [ [[package]] name = "toml" -version = "1.1.8+spec-1.1.0" +version = "1.2.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20489e00e4d8741d6be680764cc12e270655e375a20d1011e844a9c3379e678d" +checksum = "d5755c51863cdac711f1956baf8eb9588e060755f7d3c4c979e70ea1e1f32cd7" dependencies = [ - "indexmap 2.14.2", + "indexmap", "serde_core", - "serde_spanned 1.1.2", - "toml_datetime 1.1.2+spec-1.1.0", + "serde_spanned 1.1.3", + "toml_datetime 1.1.3+spec-1.1.0", "toml_parser", "toml_writer", - "winnow 1.0.4", + "winnow 1.0.5", ] [[package]] @@ -9231,9 +7654,9 @@ dependencies = [ [[package]] name = "toml_datetime" -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 = "2b86d767906c6c42421dcba507eb9d203e779497710a47782a224bb871653053" +checksum = "173f25c883cd2176a2d8212155638c0a60d484a9d84546d270866f40f56b6e49" dependencies = [ "serde_core", ] @@ -9244,7 +7667,7 @@ version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ - "indexmap 2.14.2", + "indexmap", "serde", "serde_spanned 0.6.9", "toml_datetime 0.6.11", @@ -9254,14 +7677,14 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.25.17+spec-1.1.0" +version = "0.25.19+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3641d5bbb5349a79e1020a242d251efbc546ad8048d133958323ce9c40a9c9c" +checksum = "dd43688c4858d7264ae1cf9a9f874a67c3feb74a883b1cd7bebd6a4ea8307218" dependencies = [ - "indexmap 2.14.2", - "toml_datetime 1.1.2+spec-1.1.0", + "indexmap", + "toml_datetime 1.1.3+spec-1.1.0", "toml_parser", - "winnow 1.0.4", + "winnow 1.0.5", ] [[package]] @@ -9270,7 +7693,7 @@ version = "1.1.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baa693a8032d7e1cada7d0041e96126df243179ff061456783ac7f12bda4744c" dependencies = [ - "winnow 1.0.4", + "winnow 1.0.5", ] [[package]] @@ -9281,9 +7704,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "toml_writer" -version = "1.1.3+spec-1.1.0" +version = "1.2.0+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06bdbd8cfc056b8d2e2e85f29b56a3bdbecb527cef81eb39e3e7b98af4652770" +checksum = "009dbb7700f11c55ef83aebbe4c0e9cf1f1ac0844bd8d6f00dc38f302026e13a" [[package]] name = "tower" @@ -9390,9 +7813,9 @@ dependencies = [ [[package]] name = "tree-sitter" -version = "0.26.13" +version = "0.25.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ebdd3a5a7e28a1890b876fdbd0c3c0fe0a6336cffaa104f11b9f720c9daa29" +checksum = "78f873475d258561b06f1c595d93308a7ed124d9977cb26b148c2084a4a3cc87" dependencies = [ "cc", "regex", @@ -9402,146 +7825,6 @@ dependencies = [ "tree-sitter-language", ] -[[package]] -name = "tree-sitter-astro-next" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "794a4a59fc2d88e49b4bc41fef9522d77184a36f4e68bbaf545cd1eb2364c46e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-bash" -version = "0.23.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "329a4d48623ac337d42b1df84e81a1c9dbb2946907c102ca72db158c1964a52e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-c" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b2eb57a55fed6b00812912e730b7a275cf4fe98bfd6a5d76263d4438371728" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-c-sharp" -version = "0.23.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1aac67f1ad71de1d6d39708d34811081c26dfa495658de6c14c34200849357c" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-cmake" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22893fac54133fdb93497efc45713d53a96d93b035288c7a8ab0c2af77c0ddd" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-cpp" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df2196ea9d47b4ab4a31b9297eaa5a5d19a0b121dceb9f118f6790ad0ab94743" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-css" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad6489794d41350d12a7fbe520e5199f688618f43aace5443980d1ddcf1b29e" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-diff" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfe1e5ca280a65dfe5ba4205c1bcc84edf486464fed315db53dee6da9a335889" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-elixir" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66dd064a762ed95bfc29857fa3cb7403bb1e5cb88112de0f6341b7e47284ba40" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-embedded-template" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790063ef14e5b67556abc0b3be0ed863fb41d65ee791cf8c0b20eb42a1fa46af" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-go" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13d476345220dbe600147dd444165c5791bf85ef53e28acbedd46112ee18431" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-graphql" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efedc4cac157161cc23a0adc4553a2cedc908e1cd754b6cd033a919bb81ce5d6" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-html" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "261b708e5d92061ede329babaaa427b819329a9d427a1d710abb0f67bbef63ee" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-java" -version = "0.23.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aa6cbcdc8c679b214e616fd3300da67da0e492e066df01bcf5a5921a71e90d6" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "tree-sitter-javascript" version = "0.23.1" @@ -9552,92 +7835,12 @@ dependencies = [ "tree-sitter-language", ] -[[package]] -name = "tree-sitter-jsdoc" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3862dfcb1038fc5e7812d7df14190afdeb7e1415288fd5f51f58395f8cb0faf" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-json" -version = "0.24.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d727acca406c0020cffc6cf35516764f36c8e3dc4408e5ebe2cb35a947ec471" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-kotlin-sg" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06ec43ae3c12165d4ac08afe4e1f5fc6757ffe274fa7bd5af9007ef11ba4319" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "tree-sitter-language" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0af592be68c579aa78a16846bd19422978c3c52e438523d45ff5d1bff1f9d4a" -[[package]] -name = "tree-sitter-lua" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea992f4164d83f371ef1239ae178c4d4596c296c09055e9a48bb02a2760403af" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-make" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5998dc7cbcbdab19fae8aefef982bf2d6544513d8d2e69cc44aec4c63810104" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-md" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efd398be546456c814598ee56c0f51769a77241511b4a58077815d120afa882" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-php" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c17c3ab69052c5eeaa7ff5cd972dd1bc25d1b97ee779fec391ad3b5df5592" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-proto" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e4360b434b5980fc397137ef29e1988619fef4159ac86fa7ac5777d459d3924" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "tree-sitter-python" version = "0.23.6" @@ -9648,16 +7851,6 @@ dependencies = [ "tree-sitter-language", ] -[[package]] -name = "tree-sitter-ruby" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0484ea4ef6bb9c575b4fdabde7e31340a8d2dbc7d52b321ac83da703249f95" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "tree-sitter-rust" version = "0.24.2" @@ -9668,56 +7861,6 @@ dependencies = [ "tree-sitter-language", ] -[[package]] -name = "tree-sitter-scala" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efde5e68b4736e9eac17bfa296c6f104a26bffab363b365eb898c40a63c15d2f" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-sequel" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d198ad3c319c02e43c21efa1ec796b837afcb96ffaef1a40c1978fbdcec7d17" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-svelte-next" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56f88190d0743e897c3e148a7e241aba0a8844b8afe816943851426e3f7b9753" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-swift" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2688c06564afa397313e0db17d140a73e2c6a47f3884794614246167c9dd5dfd" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-toml-ng" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9adc2c898ae49730e857d75be403da3f92bb81d8e37a2f918a08dd10de5ebb1" -dependencies = [ - "cc", - "tree-sitter-language", -] - [[package]] name = "tree-sitter-typescript" version = "0.23.2" @@ -9728,37 +7871,6 @@ dependencies = [ "tree-sitter-language", ] -[[package]] -name = "tree-sitter-yaml" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c223db85f05e34794f065454843b0668ebc15d240ada63e2b5939f43ce7c97" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "tree-sitter-zig" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab11fc124851b0db4dd5e55983bbd9631192e93238389dcd44521715e5d53e28" -dependencies = [ - "cc", - "tree-sitter-language", -] - -[[package]] -name = "triomphe" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d15f4f5898bcfc5d8a8e45ed30b2f108d710c1a2e5489dbf80e078f707181bc" -dependencies = [ - "arc-swap", - "serde", - "stable_deref_trait", -] - [[package]] name = "try-lock" version = "0.2.5" @@ -9793,12 +7905,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "typeid" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc7d623258602320d5c55d1bc22793b57daff0ec7efc270ea7d55ce1d5f5471c" - [[package]] name = "typenum" version = "1.20.1" @@ -9816,12 +7922,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "unarray" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" - [[package]] name = "unicase" version = "2.10.0" @@ -9852,12 +7952,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce61d488bcdc9bc8b5d1772c404828b17fc481c0a582b5581e95fb233aef503e" -[[package]] -name = "unicode-id" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65dd75ab2d9d379dbe86d4059e91d8b5a6e7054865eaba1ddbfc7a817ff96392" - [[package]] name = "unicode-ident" version = "1.0.27" @@ -9881,15 +7975,15 @@ dependencies = [ [[package]] name = "unicode-properties" -version = "0.1.4" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d" +checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0" [[package]] name = "unicode-script" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "383ad40bb927465ec0ce7720e033cb4ca06912855fc35db31b5755d0de75b1ee" +checksum = "aa04c955db05429d464c74d495c1ee677e1866e783a4c3747f9c0cef7756cabf" [[package]] name = "unicode-segmentation" @@ -9905,15 +7999,9 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94" [[package]] name = "unicode-width" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" - -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +checksum = "ca718471876992059f251e33aafc334346ada08042b7661dd1fe313a9bced557" [[package]] name = "universal-hash" @@ -9950,33 +8038,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "usvg" -version = "0.45.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80be9b06fbae3b8b303400ab20778c80bbaf338f563afe567cf3c9eea17b47ef" -dependencies = [ - "base64 0.22.1", - "data-url", - "flate2", - "fontdb", - "imagesize 0.13.0", - "kurbo 0.11.3", - "log", - "pico-args", - "roxmltree 0.20.0", - "rustybuzz", - "simplecss", - "siphasher", - "strict-num", - "svgtypes 0.15.3", - "tiny-skia-path", - "unicode-bidi", - "unicode-script", - "unicode-vo", - "xmlwriter", -] - [[package]] name = "usvg" version = "0.46.0" @@ -9987,16 +8048,16 @@ dependencies = [ "data-url", "flate2", "fontdb", - "imagesize 0.14.0", - "kurbo 0.13.1", + "imagesize", + "kurbo", "log", "pico-args", - "roxmltree 0.21.1", + "roxmltree 0.21.2", "rustybuzz", "simplecss", "siphasher", "strict-num", - "svgtypes 0.16.1", + "svgtypes", "tiny-skia-path", "unicode-bidi", "unicode-script", @@ -10012,9 +8073,18 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "utf8_iter" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +checksum = "af3bd9d3e571c26fcce9d033b87ea5ab061b8d2ffe9b7a5675d810d68f03edf0" +dependencies = [ + "utf_types", +] + +[[package]] +name = "utf_types" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a3b425286980a367278453f3b6d28cdcb134b574e5a35824a6ff5eebad50bb6" [[package]] name = "utils" @@ -10025,9 +8095,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.28.0" +version = "1.29.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cc1186384beb7dd8eedea376413fd654937285ea6c9cfbb928dc3043ea4b606" +checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c" dependencies = [ "getrandom 0.4.3", "js-sys", @@ -10053,42 +8123,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" -[[package]] -name = "value-bag" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2799ffb329a792ecfd902b71306c8a815a6ef1c0470fa9953a6aa4d4cecbe511" -dependencies = [ - "value-bag-serde1", - "value-bag-sval2", -] - -[[package]] -name = "value-bag-serde1" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0941feceafbe7a8f59ea1096d45b97002884a41306315ad797b3684b63a81d8c" -dependencies = [ - "erased-serde", - "serde_core", - "serde_fmt", -] - -[[package]] -name = "value-bag-sval2" -version = "1.14.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "839752af8179287d27eb2b94164641b1ede9e60ab7424163388dc21ebd0508cd" -dependencies = [ - "sval", - "sval_buffer", - "sval_dynamic", - "sval_fmt", - "sval_json", - "sval_ref", - "sval_serde", -] - [[package]] name = "version_check" version = "0.9.5" @@ -10115,15 +8149,6 @@ dependencies = [ "libc", ] -[[package]] -name = "wait-timeout" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" -dependencies = [ - "libc", -] - [[package]] name = "waker-fn" version = "1.2.0" @@ -10166,12 +8191,11 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb54f33acc68fd454578d9820b0bde1a1a3d17aa17bb7b6595806d02886d409" +checksum = "a0181c14ddd6c7b8b0b0132a5f1ea2f32be0d893cd3ea97b6e3b28886b8a3d1c" dependencies = [ "cfg-if", - "once_cell", "rustversion", "wasm-bindgen-macro", "wasm-bindgen-shared", @@ -10179,9 +8203,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.79" +version = "0.4.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cbab34de2d982e9b48e18d216d04c4a6f641066ff19ffb699980f591ee3610e" +checksum = "5e14e0327cb5368ad60ccb22d04a9827a693c95a926d8d125e9fa39e0baec501" dependencies = [ "js-sys", "tokio", @@ -10190,9 +8214,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e29d0c35b16e224a7eeb5cd2d25e3e1968fbd65604117b44d3b789d00ee8535" +checksum = "6e931a02a39abdbf66966fc35902b5ed58344750a70885bed4ebb3d8eaf28ed9" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -10200,22 +8224,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f501a8bc3719dba86ef8ae4728879c08001bea749eb1333ac5b91e040e2a6b7" +checksum = "2ca4b54280e455bd831e33a6b8e734baf432fe63fbc35c42ac14ce67a043a53a" dependencies = [ "bumpalo", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.129" +version = "0.2.130" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f0c9c52aa7cd7d77769a4cfe2a9adb1b331f489a41d912ce14513d5ab995c6" +checksum = "3b1f9c3798725016c6ee5f2f57869ec0831e8bbc0ab0310a86e787e97f41389e" dependencies = [ "unicode-ident", ] @@ -10236,8 +8260,7 @@ dependencies = [ [[package]] name = "wasm_thread" version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7516db7f32decdadb1c3b8deb1b7d78b9df7606c5cc2f6241737c2ab3a0258e" +source = "git+https://github.com/zed-industries/wasm_thread?rev=0cf96c7708dfb97ccf3da50347e25edcf75d6937#0cf96c7708dfb97ccf3da50347e25edcf75d6937" dependencies = [ "futures", "js-sys", @@ -10245,93 +8268,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wayland-backend" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a91b4eaddff87b1cd1074985e3713da4af2c49742d1b356b2c01670a67a078" -dependencies = [ - "cc", - "downcast-rs", - "log", - "rustix", - "scoped-tls", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-client" -version = "0.31.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3c36a0f861ad76d0901f2800b46321410d9f73f2ea88aac0650d86c32688073" -dependencies = [ - "bitflags 2.13.2", - "rustix", - "wayland-backend", - "wayland-scanner", -] - -[[package]] -name = "wayland-cursor" -version = "0.31.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a52d18780be9b1314328a3de5f930b73d2200112e3849ca6cb11822793fb34d" -dependencies = [ - "rustix", - "wayland-client", - "xcursor", -] - -[[package]] -name = "wayland-protocols" -version = "0.32.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d0c813de3daa2ed6520af85a3bd49b0e722a3078506899aa9686fea58dc4b6" -dependencies = [ - "bitflags 2.13.2", - "wayland-backend", - "wayland-client", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-plasma" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b6d8cf1eb2c1c31ed1f5643c88a6e53538129d4af80030c8cabd1f9fa884d91" -dependencies = [ - "bitflags 2.13.2", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-protocols-wlr" -version = "0.3.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb04e52f7836d7c7976c78ca0250d61e33873c34156a2a1fc9474828ec268234" -dependencies = [ - "bitflags 2.13.2", - "wayland-backend", - "wayland-client", - "wayland-protocols", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.31.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "338e30461b3a2b67d70eb30a6d89f8e0c93a833e07d2ae89085cd070c4a00ac0" -dependencies = [ - "proc-macro2", - "quick-xml", - "quote", -] - [[package]] name = "wayland-sys" version = "0.31.11" @@ -10346,9 +8282,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.106" +version = "0.3.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88261b9deccee56594c11a3460c462c41f58d148598fe70ad77070126a68aba4" +checksum = "d7d179596ff5ec0f6de4db64d54011bde6289cc49603d3a6e4ce3f329207ab88" dependencies = [ "js-sys", "wasm-bindgen", @@ -10366,9 +8302,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "1.2.4" +version = "1.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62c35be770821a214dbc362fc26908c853e776c0004294d0b10b8a6bad582f94" +checksum = "73e91ccd4698f2647d6137e8eb17a3f1dcfd63810be9029fb2398f507279b95b" dependencies = [ "jni", "log", @@ -10382,9 +8318,9 @@ dependencies = [ [[package]] name = "webpki-root-certs" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ec80e73fd8baf57bf0d9615554c75348bda990d6d5bbeab964dd068319fecb" +checksum = "293198dcebfb821155b5092ab94b5a82ff180eddd7241df3bd6e66a4ffd1a585" dependencies = [ "rustls-pki-types", ] @@ -10395,14 +8331,14 @@ version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "webpki-roots 1.0.10", + "webpki-roots 1.0.12", ] [[package]] name = "webpki-roots" -version = "1.0.10" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c1c8e20c8a38fc7d65abfe74eb7280e4aa667e8eec8bc84996d2874810748d9" +checksum = "7265c9301c16a8711c992c2d8da90ee77ef54b1ed51482d6dfeb00dc756b1297" dependencies = [ "rustls-pki-types", ] @@ -10415,9 +8351,8 @@ checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88" [[package]] name = "wgpu" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76e8840e1ba2881d4cbb18d2147627a56af426ff064c0401eb0c8410c6325d07" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "arrayvec", "bitflags 2.13.2", @@ -10425,12 +8360,10 @@ dependencies = [ "cfg-if", "cfg_aliases", "document-features", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "js-sys", "log", "naga", - "parking_lot", - "portable-atomic", "profiling", "raw-window-handle", "smallvec", @@ -10440,89 +8373,94 @@ dependencies = [ "web-sys", "wgpu-core", "wgpu-hal", + "wgpu-sync", "wgpu-types", ] [[package]] name = "wgpu-core" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f519832254e56965a9940c4af57dcb75f702b6f6fa4a0b172f685395843a4d7" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "arrayvec", - "bit-set 0.9.1", - "bit-vec 0.9.1", + "bit-set", + "bit-vec", "bitflags 2.13.2", "bytemuck", "cfg_aliases", "document-features", - "hashbrown 0.16.1", - "indexmap 2.14.2", + "hashbrown 0.17.1", + "indexmap", "log", "naga", - "once_cell", - "parking_lot", - "portable-atomic", + "naga-types", + "num-traits", "profiling", "raw-window-handle", "rustc-hash 1.1.0", + "scopeguard", "smallvec", "thiserror 2.0.21", "wgpu-core-deps-apple", "wgpu-core-deps-emscripten", + "wgpu-core-deps-linux-android-bsd", "wgpu-core-deps-wasm", - "wgpu-core-deps-windows-linux-android", + "wgpu-core-deps-windows", "wgpu-hal", "wgpu-naga-bridge", + "wgpu-sync", "wgpu-types", ] [[package]] name = "wgpu-core-deps-apple" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e39e26c4c0e07589e67d18546cf79ff45383659fc72fca4dd293358a0347f3" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-emscripten" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01e09be551dc939498bdd5f6b2c66e55ab275dad25825267a08605a80fc9f0af" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" +dependencies = [ + "wgpu-hal", +] + +[[package]] +name = "wgpu-core-deps-linux-android-bsd" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-core-deps-wasm" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af1fb1798be2a912497d4c224f72d39bb0cb34af50e8bcc29865bc339c943059" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "wgpu-hal", ] [[package]] -name = "wgpu-core-deps-windows-linux-android" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e592c1bbef6ad047647ae6e666ebd8cee7a32bb4544d9700ec96cbf73230257" +name = "wgpu-core-deps-windows" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "wgpu-hal", ] [[package]] name = "wgpu-hal" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97ace1c17727311c22a46e4e3faf56ea6de81af99dcc839bdfb54857b94d448d" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "android_system_properties", "arrayvec", "ash", - "bit-set 0.9.1", + "bit-set", "bitflags 2.13.2", "block2 0.6.2", "bytemuck", @@ -10531,36 +8469,35 @@ dependencies = [ "glow", "glutin_wgl_sys", "gpu-allocator", - "gpu-descriptor", - "hashbrown 0.16.1", + "hashbrown 0.17.1", "js-sys", "khronos-egl", "libc", "libloading", "log", "naga", + "naga-types", "ndk-sys", "objc2 0.6.5", "objc2-core-foundation", + "objc2-core-graphics", "objc2-foundation 0.3.2", "objc2-metal 0.3.2", "objc2-quartz-core 0.3.2", - "once_cell", "ordered-float", - "parking_lot", - "portable-atomic", - "portable-atomic-util", "profiling", "range-alloc", "raw-window-handle", "raw-window-metal", "renderdoc-sys", "smallvec", + "static_assertions", "thiserror 2.0.21", "wasm-bindgen", "wayland-sys", "web-sys", "wgpu-naga-bridge", + "wgpu-sync", "wgpu-types", "windows 0.62.2", "windows-core 0.62.2", @@ -10569,25 +8506,39 @@ dependencies = [ [[package]] name = "wgpu-naga-bridge" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95226013f547544b223281cd16a4fb549aa9dcb562adbda0faae4c73ffbbc161" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "naga", "wgpu-types", ] +[[package]] +name = "wgpu-sync" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" +dependencies = [ + "cfg-if", + "lock_api", + "once_cell", + "parking_lot", + "portable-atomic", + "portable-atomic-util", +] + [[package]] name = "wgpu-types" -version = "29.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84bf84cd9ca8ca45e2b223a3868f1adf9bfc0c66aeac212e76ee7e40fdadf8f5" +version = "30.0.0" +source = "git+https://github.com/gfx-rs/wgpu?rev=cddb2f5d80dc0009b2ef6767635140cacf90a007#cddb2f5d80dc0009b2ef6767635140cacf90a007" dependencies = [ "bitflags 2.13.2", "bytemuck", "js-sys", "log", + "macro_rules_attribute", + "naga-types", "raw-window-handle", + "static_assertions", "web-sys", ] @@ -10641,16 +8592,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" -dependencies = [ - "windows-core 0.58.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows" version = "0.61.3" @@ -10719,19 +8660,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-core" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" -dependencies = [ - "windows-implement 0.58.0", - "windows-interface 0.58.0", - "windows-result 0.2.0", - "windows-strings 0.1.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.61.2" @@ -10791,17 +8719,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "windows-implement" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "windows-implement" version = "0.60.2" @@ -10824,17 +8741,6 @@ dependencies = [ "syn 2.0.119", ] -[[package]] -name = "windows-interface" -version = "0.58.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", -] - [[package]] name = "windows-interface" version = "0.59.3" @@ -10909,15 +8815,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-result" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" -dependencies = [ - "windows-targets 0.52.6", -] - [[package]] name = "windows-result" version = "0.3.4" @@ -10936,16 +8833,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-strings" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" -dependencies = [ - "windows-result 0.2.0", - "windows-targets 0.52.6", -] - [[package]] name = "windows-strings" version = "0.3.1" @@ -10973,15 +8860,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows-sys" version = "0.52.0" @@ -10991,15 +8869,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -11009,21 +8878,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - [[package]] name = "windows-targets" version = "0.52.6" @@ -11084,12 +8938,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.52.6" @@ -11102,12 +8950,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" @@ -11120,12 +8962,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - [[package]] name = "windows_i686_gnu" version = "0.52.6" @@ -11150,12 +8986,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - [[package]] name = "windows_i686_msvc" version = "0.52.6" @@ -11168,12 +8998,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" @@ -11186,12 +9010,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" @@ -11204,12 +9022,6 @@ version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" @@ -11233,9 +9045,9 @@ dependencies = [ [[package]] name = "winnow" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" +checksum = "8c3b93199df0ab874cdf0c6a94f0a0dc3423fe41f1cafb62b8bd7b1deb277aef" dependencies = [ "memchr", ] @@ -11265,30 +9077,6 @@ version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "workspace" -version = "0.2.0" -dependencies = [ - "anyhow", - "assets", - "dock", - "futures", - "gix", - "gpui-base", - "gpui-component", - "gpui-pre", - "log", - "metadata", - "nostr", - "paths", - "settings", - "signed_core", - "signed_git", - "signed_state", - "signed_ui", - "utils", -] - [[package]] name = "writeable" version = "0.6.4" @@ -11305,26 +9093,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "x11rb" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414" -dependencies = [ - "as-raw-xcb-connection", - "gethostname", - "libc", - "rustix", - "x11rb-protocol", - "xcursor", -] - -[[package]] -name = "x11rb-protocol" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd" - [[package]] name = "xcb" version = "1.7.1" @@ -11337,65 +9105,12 @@ dependencies = [ "x11", ] -[[package]] -name = "xcursor" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23" - -[[package]] -name = "xim-ctext" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ac61a7062c40f3c37b6e82eeeef835d5cc7824b632a72784a89b3963c33284c" -dependencies = [ - "encoding_rs", -] - -[[package]] -name = "xim-parser" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dcee45f89572d5a65180af3a84e7ddb24f5ea690a6d3aa9de231281544dd7b7" -dependencies = [ - "bitflags 2.13.2", -] - -[[package]] -name = "xkbcommon" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d66ca9352cbd4eecbbc40871d8a11b4ac8107cfc528a6e14d7c19c69d0e1ac9" -dependencies = [ - "as-raw-xcb-connection", - "libc", - "memmap2", - "xkeysym", -] - -[[package]] -name = "xkeysym" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9cc00251562a284751c9973bace760d86c0276c471b4be569fe6b068ee97a56" - [[package]] name = "xml-rs" version = "0.8.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e450f9b2ed1dff33c94c12589a87338689467b9c4f5d8a5710bd09a847d2c8a7" -[[package]] -name = "xml5ever" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bbb26405d8e919bc1547a5aa9abc95cbfa438f04844f5fdd9dc7596b748bf69" -dependencies = [ - "log", - "mac", - "markup5ever", -] - [[package]] name = "xmlwriter" version = "0.1.0" @@ -11410,9 +9125,9 @@ checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" [[package]] name = "yazi" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e01738255b5a16e78bbb83e7fbba0a1e7dd506905cfc53f4622d89015a03fbb5" +checksum = "ac366ea532fa8ee6a992cec9dea525b1dc284e69702f36c2ab5fbebadc81ec86" [[package]] name = "yeslogic-fontconfig-sys" @@ -11427,9 +9142,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" +checksum = "417ef3fcf6c300b7dbd25c85531a746931c02ad536f3cf4786ed1e88223340b3" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -11444,7 +9159,7 @@ checksum = "ec8ebde2db3681e8c9980cc27822030e68752690ddfa9473e739aeb4dbde6d71" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] @@ -11477,34 +9192,37 @@ dependencies = [ "uds_windows", "uuid", "windows-sys 0.61.2", - "winnow 1.0.4", - "zbus_macros", + "winnow 1.0.5", + "zbus_macros 5.19.0", "zbus_names", "zvariant", ] [[package]] -name = "zbus-lockstep" -version = "0.5.2" +name = "zbus" +version = "6.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6998de05217a084b7578728a9443d04ea4cd80f2a0839b8d78770b76ccd45863" +checksum = "0ddb2961d9587ef9f24ad14cde1c3bc4c5edc9f1525932a8cffdd5bd98886eb9" dependencies = [ - "zbus_xml", - "zvariant", -] - -[[package]] -name = "zbus-lockstep-macros" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10da05367f3a7b7553c8cdf8fa91aee6b64afebe32b51c95177957efc47ca3a0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.119", - "zbus-lockstep", - "zbus_xml", - "zvariant", + "async-trait", + "bitflags 2.13.2", + "endi", + "futures-core", + "hex", + "libc", + "ordered-stream", + "rustix", + "serde", + "serde_repr", + "socket2", + "uds_windows", + "uuid", + "windows-sys 0.61.2", + "winnow 1.0.5", + "zbus_macros 6.2.1", + "zbus_utils", + "zcheapstr", + "zruntime", ] [[package]] @@ -11516,12 +9234,24 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "zbus_names", "zvariant", "zvariant_utils", ] +[[package]] +name = "zbus_macros" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "083b38add47c340fc12ec560124fb1d9c23acb584f7021099f85ec6587a03c54" +dependencies = [ + "proc-macro2", + "quote", + "syn 3.0.10", + "zbus_utils", +] + [[package]] name = "zbus_names" version = "4.3.5" @@ -11529,27 +9259,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812a12be4ead7a59e18ea8f047d08add0066b73bc62fc1467066a2472ae088dd" dependencies = [ "serde", - "winnow 1.0.4", + "winnow 1.0.5", "zvariant", ] [[package]] -name = "zbus_xml" -version = "5.2.1" +name = "zbus_utils" +version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1586c021a01ca0a9216dcd874e546382e156a5cbab5fab6cb5f10087e22682a" +checksum = "af55e52da295311b368c45bcae221f020e28e97a2420360170ce389218e76ec7" dependencies = [ + "proc-macro2", + "quote", "serde", - "winnow 1.0.4", - "zbus_names", - "zvariant", + "syn 3.0.10", + "winnow 1.0.5", ] [[package]] name = "zcheapstr" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1afec51604565183aeb5c54c20aeab286120d4e4460f7f76e3e8bb8c0d99473" +checksum = "939f186d9ecebe044315a5cb6d6f78568bbc21152adc954d5a0c2f58bdbc9920" dependencies = [ "serde", ] @@ -11557,15 +9288,14 @@ dependencies = [ [[package]] name = "zed-font-kit" version = "0.14.1-zed" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3898e450f36f852edda72e3f985c34426042c4951790b23b107f93394f9bff5" +source = "git+https://github.com/zed-industries/font-kit?rev=94b0f28166665e8fd2f53ff6d268a14955c82269#94b0f28166665e8fd2f53ff6d268a14955c82269" dependencies = [ "bitflags 2.13.2", "byteorder", - "core-foundation 0.10.1", - "core-graphics 0.24.0", + "core-foundation", + "core-graphics", "core-text", - "dirs 5.0.1", + "dirs", "dwrote", "float-ord", "freetype-sys", @@ -11579,42 +9309,68 @@ dependencies = [ "yeslogic-fontconfig-sys", ] +[[package]] +name = "zed-reqwest" +version = "0.12.15-zed" +source = "git+https://github.com/zed-industries/reqwest.git?rev=33bc764aa15ff7b200bf7c93bd96e24878d53e14#33bc764aa15ff7b200bf7c93bd96e24878d53e14" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "system-configuration", + "tokio", + "tokio-rustls", + "tokio-socks", + "tokio-util", + "tower", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "windows-registry 0.4.0", +] + [[package]] name = "zed-scap" version = "0.0.8-zed" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b338d705ae33a43ca00287c11129303a7a0aa57b101b72a1c08c863f698ac8" +source = "git+https://github.com/zed-industries/scap?rev=b5c86ec58dd4b6b7732bf6ac8be03d6b1f190a82#b5c86ec58dd4b6b7732bf6ac8be03d6b1f190a82" dependencies = [ "anyhow", - "cocoa 0.25.0", - "core-graphics-helmer-fork", "log", - "objc", "rand 0.8.8", - "screencapturekit", - "screencapturekit-sys", "sysinfo", - "tao-core-video-sys", "windows 0.61.3", "windows-capture", "x11", "xcb", ] -[[package]] -name = "zed-xim" -version = "0.4.0-zed" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0b46ed118eba34d9ba53d94ddc0b665e0e06a2cf874cfa2dd5dec278148642" -dependencies = [ - "ahash", - "hashbrown 0.14.5", - "log", - "x11rb", - "xim-ctext", - "xim-parser", -] - [[package]] name = "zeno" version = "0.3.3" @@ -11658,7 +9414,7 @@ checksum = "f75b4683f6c7f45248d4d64056a24298c6281e0993356d7d1b4a1a962ef10d4a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "synstructure", ] @@ -11691,14 +9447,16 @@ dependencies = [ "displaydoc", "yoke", "zerofrom", + "zerovec", ] [[package]] name = "zerovec" -version = "0.11.8" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0464e17806c1d976d5cba29399c7f08e516e279e2ba493f63123b5fca67dd8" +checksum = "f58a2799cfe9a1670c7ea8edbd52ef8edb93cb37a7f83bf31ba9e35d9dae6a40" dependencies = [ + "serde", "yoke", "zerofrom", "zerovec-derive", @@ -11706,13 +9464,13 @@ dependencies = [ [[package]] name = "zerovec-derive" -version = "0.11.6" +version = "0.11.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34df6fc39dbd26ddc9c10e6a2984476e13acce22e64e4487636ef494369225da" +checksum = "c3743ddbf47738d929cd1ae2e199d40d0162979dfe31aef8ae646d2bf00bf97a" dependencies = [ "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", ] [[package]] @@ -11728,10 +9486,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" [[package]] -name = "zune-core" -version = "0.4.12" +name = "zruntime" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" +checksum = "23ef5ed7d628cdf0af82f93dfe03330a8e37383bf7422a1d3d6eb72326680be5" +dependencies = [ + "futures-core", + "futures-io", + "rustix", + "socket2", + "windows-sys 0.61.2", +] + +[[package]] +name = "ztracing" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" +dependencies = [ + "tracing", + "ztracing_macro", +] + +[[package]] +name = "ztracing_macro" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed?rev=f8cfc7ed9e57503def9479138894f3139f5400cc#f8cfc7ed9e57503def9479138894f3139f5400cc" [[package]] name = "zune-core" @@ -11748,22 +9527,13 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "zune-jpeg" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713" -dependencies = [ - "zune-core 0.4.12", -] - [[package]] name = "zune-jpeg" version = "0.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296" dependencies = [ - "zune-core 0.5.3", + "zune-core", ] [[package]] @@ -11776,7 +9546,7 @@ dependencies = [ "enumflags2", "serde", "serde_bytes", - "winnow 1.0.4", + "winnow 1.0.5", "zcheapstr", "zvariant_derive", "zvariant_utils", @@ -11791,7 +9561,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 3.0.9", + "syn 3.0.10", "zvariant_utils", ] @@ -11804,6 +9574,6 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 3.0.9", - "winnow 1.0.4", + "syn 3.0.10", + "winnow 1.0.5", ] diff --git a/Cargo.toml b/Cargo.toml index da6ac4a..d171adc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,6 +2,7 @@ resolver = "2" members = ["crates/*", "desktop"] default-members = ["desktop"] +exclude = ["crates/dock", "crates/signed_ui", "crates/workspace"] [workspace.package] version = "0.2.0" @@ -9,20 +10,14 @@ edition = "2024" publish = false [workspace.dependencies] -gpui = { package = "gpui-pre", version = "0.3.8" } -gpui_platform = { package = "gpui-pre-platform", version = "0.3.8", features = ["font-kit", "x11", "wayland"] } -reqwest_client = { package = "gpui-pre-reqwest-client", version = "0.3.8" } +gpui = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" } +gpui_platform = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc", features = ["font-kit"] } +reqwest_client = { git = "https://github.com/zed-industries/zed", rev = "f8cfc7ed9e57503def9479138894f3139f5400cc" } -# GPUI Kit; exact pins keep the graph on the gpui-pre 0.3.8 closure that -# native-theme-gpui 0.6.1 is verified against (0.7.3 and 0.8 pin 0.3.9). -gpui-component = { version = "=0.7.1", features = ["tree-sitter-languages"] } -gpui-base = "=0.7.1" +gpui-native-kit = { git = "https://git.reya.info/reya/gpui-native-kit", rev = "4469a4c280194db033dd0abf9c4d6b8f4daa1858", features = ["layout", "editor"] } -native-theme = { version = "0.6.1", features = ["watch"] } -native-theme-gpui = { version = "0.6.1", default-features = false, features = ["system-fonts"] } - -dock = { path = "crates/dock" } settings = { path = "crates/settings" } +signed_app = { path = "crates/signed_app" } nostr = { git = "https://github.com/rust-nostr/nostr", features = ["nip59", "nip49", "nip44", "os-rng"] } nostr-lmdb = { git = "https://github.com/rust-nostr/nostr" } diff --git a/crates/assets/Cargo.toml b/crates/assets/Cargo.toml index da6bf8a..1562b94 100644 --- a/crates/assets/Cargo.toml +++ b/crates/assets/Cargo.toml @@ -6,8 +6,7 @@ publish.workspace = true [dependencies] gpui.workspace = true -gpui-component.workspace = true -anyhow.workspace = true +gpui-native-kit.workspace = true rust-embed.workspace = true [dev-dependencies] diff --git a/crates/assets/assets/themes/.keep b/crates/assets/assets/themes/.keep deleted file mode 100644 index e69de29..0000000 diff --git a/crates/assets/assets/themes/signed.json b/crates/assets/assets/themes/signed.json deleted file mode 100644 index de082cf..0000000 --- a/crates/assets/assets/themes/signed.json +++ /dev/null @@ -1,433 +0,0 @@ -{ - "$schema": "https://github.com/longbridge/gpui-component/raw/refs/heads/main/.theme-schema.json", - "name": "Signed", - "author": "Signed", - "themes": [ - { - "is_default": true, - "name": "Signed Light", - "mode": "light", - "colors": { - "accent.background": "#F0F0F0", - "accent.foreground": "#202020", - "accordion.background": "#FFFFFF", - "background": "#FFFFFF", - "border": "#E4E4E7", - "caret": "#202020", - "chart.1": "#93C5FD", - "chart.2": "#3B82F6", - "chart.3": "#2563EB", - "chart.4": "#1D4ED8", - "chart.5": "#1E40AF", - "chart_bullish": "green-600", - "chart_bearish": "red-600", - "danger.background": "red-500", - "danger.foreground": "neutral-50", - "description_list.label.foreground": "#202020", - "drag.border": "#65A30D", - "drop_target.background": "#C6FF4D40", - "foreground": "#18181B", - "group_box.background": "#F0F0F0", - "group_box.foreground": "#202020", - "info.background": "cyan-500", - "info.foreground": "neutral-50", - "input.border": "#E4E4E7", - "link": "#3F6212", - "link.active": "#3F6212", - "link.hover": "#65A30D", - "list.background": "#FFFFFF", - "list.active.background": "#C6FF4D33", - "list.active.border": "#65A30D", - "list.even.background": "#F9F9F9", - "list.head.background": "#F9F9F9", - "list.hover.background": "#F0F0F0", - "muted.background": "#F9F9F9", - "muted.foreground": "#646464", - "overlay": "#0000000D", - "popover.background": "#FFFFFF", - "popover.foreground": "#18181B", - "primary.background": "#C6FF4D", - "primary.active.background": "#65A30D", - "primary.active.foreground": "#F7FEE7", - "primary.foreground": "#1A2E05", - "primary.hover.background": "#B7F03E", - "progress.bar.background": "#18181B", - "ring": "#BBBBBB", - "scrollbar.background": "#F9F9F900", - "scrollbar.thumb.background": "#BBBBBBE6", - "scrollbar.thumb.hover.background": "#BBBBBB", - "secondary.background": "#F0F0F0", - "secondary.active.background": "#E0E0E0", - "secondary.foreground": "#202020", - "secondary.hover.background": "#E8E8E8", - "selection.background": "#55A0FC", - "sidebar.background": "#F9F9F9", - "sidebar.accent.background": "#F0F0F0", - "sidebar.accent.foreground": "#202020", - "sidebar.border": "#E8E8E8", - "sidebar.foreground": "#202020", - "sidebar.primary.background": "#C6FF4D", - "sidebar.primary.foreground": "#1A2E05", - "skeleton.background": "#F0F0F0", - "slider.background": "#18181B", - "slider.thumb.background": "#FFFFFF", - "status_bar.background": "#F9F9F9", - "status_bar.border": "#E8E8E8", - "success.background": "#2FBF71", - "success.foreground": "#052E16", - "switch.background": "#CECECE", - "switch.thumb.background": "#FFFFFF", - "tab.background": "#E8E8E8", - "tab.active.background": "#F5F5F5", - "tab.active.foreground": "#18181B", - "tab.foreground": "#646464", - "tab_bar.background": "#F0F0F0", - "tab_bar.segmented.background": "#F0F0F0", - "table.background": "#FFFFFF", - "table.active.background": "#C6FF4D33", - "table.active.border": "#65A30D", - "table.even.background": "#F9F9F9", - "table.head.background": "#F9F9F9", - "table.head.foreground": "#838383", - "table.hover.background": "#F0F0F0", - "table.row.border": "#E8E8E8B3", - "tiles.background": "#F9F9F9", - "title_bar.background": "#F9F9F9", - "title_bar.border": "#E8E8E8", - "warning.background": "yellow-500", - "warning.foreground": "neutral-50", - "window.border": "#E8E8E8", - "base.red": "red-600", - "base.red.light": "red-400", - "base.green": "#16A34A", - "base.green.light": "green-400", - "base.blue": "blue-600", - "base.blue.light": "blue-400", - "base.yellow": "yellow-600", - "base.yellow.light": "yellow-400", - "base.magenta": "purple-600", - "base.magenta.light": "purple-400", - "base.cyan": "cyan-600", - "base.cyan.light": "cyan-400" - }, - "highlight": { - "editor.foreground": "#000000", - "editor.background": "#ffffff", - "editor.active_line.background": "#F5F5F5", - "editor.line_number": "#929292", - "editor.active_line_number": "#000000", - "editor.invisible": "#73737366", - "conflict": "#C5060B", - "created": "#1642FF", - "hidden": "#6D6D6D", - "hint": "#9e5dff", - "modified": "#9e7008", - "predictive": "#A4ABB6", - "warning": "#C99401", - "syntax": { - "attribute": { - "color": "#957931" - }, - "boolean": { - "color": "#C5060B" - }, - "comment": { - "color": "#007fff" - }, - "comment.doc": { - "color": "#007fff" - }, - "constant": { - "color": "#C5060B" - }, - "constructor": { - "color": "#0433ff" - }, - "embedded": { - "color": "#333333" - }, - "emphasis": { - "font_style": "italic" - }, - "emphasis.strong": { - "font_weight": 700 - }, - "function": { - "color": "#0000A2" - }, - "keyword": { - "color": "#0433ff" - }, - "link_text": { - "color": "#0000A2", - "font_style": "normal" - }, - "link_uri": { - "color": "#6A7293", - "font_style": "italic" - }, - "number": { - "color": "#0433ff" - }, - "string": { - "color": "#036A07" - }, - "string.escape": { - "color": "#036A07" - }, - "string.regex": { - "color": "#036A07" - }, - "string.special": { - "color": "#d21f07" - }, - "string.special.symbol": { - "color": "#d21f07" - }, - "tag": { - "color": "#0433ff" - }, - "text.literal": { - "color": "#6F42C1" - }, - "text.code.span": { - "color": "#6F42C1" - }, - "title": { - "color": "#0433FF" - }, - "type": { - "color": "#6f42c1" - }, - "property": { - "color": "#333333" - }, - "variable": { - "color": "#333333" - }, - "variable.special": { - "color": "#C5060B" - } - } - } - }, - { - "is_default": true, - "name": "Signed Dark", - "mode": "dark", - "colors": { - "accent.background": "#222222", - "accent.foreground": "#EEEEEE", - "accordion.background": "#0A0A0A", - "background": "#0A0A0A", - "border": "#27272A", - "caret": "#EEEEEE", - "chart.1": "#93C5FD", - "chart.2": "#3B82F6", - "chart.3": "#2563EB", - "chart.4": "#1D4ED8", - "chart.5": "#1E40AF", - "chart_bullish": "green-600", - "chart_bearish": "red-600", - "danger.background": "red-400", - "danger.foreground": "red-600", - "description_list.label.background": "#191919", - "description_list.label.foreground": "#EEEEEE", - "drag.border": "#C6FF4D", - "drop_target.background": "#C6FF4D2E", - "foreground": "#FAFAFA", - "group_box.background": "#191919", - "group_box.foreground": "#EEEEEE", - "info.background": "cyan-400", - "info.foreground": "cyan-600", - "input.border": "#2F2F2F", - "link": "#A3E635", - "link.active": "#A3E635", - "link.hover": "#C6FF4D", - "list.background": "#0A0A0A", - "list.active.background": "#C6FF4D33", - "list.active.border": "#C6FF4D", - "list.even.background": "#191919", - "list.head.background": "#191919", - "list.hover.background": "#222222", - "muted.background": "#191919", - "muted.foreground": "#B4B4B4", - "overlay": "#00000033", - "popover.background": "#0A0A0A", - "popover.foreground": "#FAFAFA", - "primary.background": "#C6FF4D", - "primary.active.background": "#65A30D", - "primary.active.foreground": "#F7FEE7", - "primary.foreground": "#1A2E05", - "primary.hover.background": "#D6FF7A", - "progress.bar.background": "#FAFAFA", - "ring": "#606060", - "scrollbar.background": "#19191900", - "scrollbar.thumb.background": "#606060E6", - "scrollbar.thumb.hover.background": "#606060", - "secondary.background": "#222222", - "secondary.active.background": "#313131", - "secondary.foreground": "#EEEEEE", - "secondary.hover.background": "#2A2A2A", - "selection.background": "#1D4ED8", - "sidebar.background": "#111111", - "sidebar.accent.background": "#222222", - "sidebar.accent.foreground": "#EEEEEE", - "sidebar.border": "#2A2A2A", - "sidebar.foreground": "#EEEEEE", - "sidebar.primary.background": "#C6FF4D", - "sidebar.primary.foreground": "#1A2E05", - "skeleton.background": "#222222", - "slider.background": "#FAFAFA", - "slider.thumb.background": "#0A0A0A", - "status_bar.background": "#191919", - "status_bar.border": "#2A2A2A", - "success.background": "#2FBF71", - "success.foreground": "#052E16", - "switch.background": "#484848", - "switch.thumb.background": "#0A0A0A", - "tab.background": "#2E2E2E", - "tab.active.background": "#2A2A2A", - "tab.active.foreground": "#FAFAFA", - "tab.foreground": "#B4B4B4", - "tab_bar.background": "#191919", - "tab_bar.segmented.background": "#191919", - "table.background": "#0A0A0A", - "table.active.background": "#C6FF4D33", - "table.active.border": "#C6FF4D", - "table.even.background": "#191919", - "table.head.background": "#191919", - "table.head.foreground": "#7B7B7B", - "table.hover.background": "#222222", - "table.row.border": "#2A2A2AB3", - "tiles.background": "#191919", - "title_bar.background": "#191919", - "title_bar.border": "#2A2A2A", - "warning.background": "yellow-400", - "warning.foreground": "yellow-600", - "window.border": "#2A2A2A", - "base.red": "red-400", - "base.red.light": "red-300", - "base.green": "#22C55E", - "base.green.light": "green-300", - "base.blue": "blue-400", - "base.blue.light": "blue-300", - "base.yellow": "yellow-400", - "base.yellow.light": "yellow-300", - "base.magenta": "purple-400", - "base.magenta.light": "purple-300", - "base.cyan": "cyan-400", - "base.cyan.light": "cyan-300" - }, - "highlight": { - "editor.foreground": "#CACCCA", - "editor.background": "#0a0a0a", - "editor.active_line.background": "#171717", - "editor.line_number": "#8F8F8F", - "editor.active_line_number": "#DDDDDD", - "editor.invisible": "#73737366", - "conflict": "#D2602D", - "created": "#3f72e2", - "created.background": "#0C4619", - "deleted.background": "#46190C", - "error.background": "#46190C", - "error.border": "#E44A4F", - "hidden": "#9E9E9E", - "hint": "#b283f8", - "hint.background": "#250c4b", - "hint.border": "#3f0891", - "info.background": "#0059D1", - "info.border": "#0059D1", - "modified": "#B0A878", - "modified.background": "#3A310E", - "predictive": "#5D5945", - "success.background": "#0C4619", - "warning.background": "#3A310E", - "warning.border": "#7B6508", - "syntax": { - "attribute": { - "color": "#7FAEF9" - }, - "boolean": { - "color": "#CC9E00" - }, - "comment": { - "color": "#9D9D9D" - }, - "comment.doc": { - "color": "#9D9D9D" - }, - "constant": { - "color": "#CC9E00" - }, - "constructor": { - "color": "#CBA6F7" - }, - "embedded": { - "color": "#CACCCA" - }, - "emphasis": { - "font_style": "italic" - }, - "emphasis.strong": { - "font_weight": 700 - }, - "function": { - "color": "#B3C5F3" - }, - "keyword": { - "color": "#87B1F6" - }, - "link_text": { - "color": "#419CFF", - "font_style": "normal" - }, - "link_uri": { - "color": "#7faef9", - "font_style": "italic" - }, - "number": { - "color": "#CC9E00" - }, - "string": { - "color": "#A3E09F" - }, - "string.escape": { - "color": "#68DC7C" - }, - "string.regex": { - "color": "#68DC7C" - }, - "string.special": { - "color": "#A3E09F" - }, - "string.special.symbol": { - "color": "#A3E09F" - }, - "tag": { - "color": "#419CFF" - }, - "text.literal": { - "color": "#A3E09F" - }, - "text.code.span": { - "color": "#A3E09F" - }, - "title": { - "color": "#CC9E00", - "font_weight": 600 - }, - "type": { - "color": "#CBA6F7" - }, - "property": { - "color": "#BCC4E0" - }, - "variable.special": { - "color": "#419CFF" - } - } - } - } - ] -} diff --git a/crates/assets/src/lib.rs b/crates/assets/src/lib.rs index 82dd078..224451a 100644 --- a/crates/assets/src/lib.rs +++ b/crates/assets/src/lib.rs @@ -1,12 +1,10 @@ -use anyhow::Context; use gpui::{AssetSource, Result, SharedString}; -use gpui_component::IconNamed; +use gpui_native_kit::icons::IconNamed; use rust_embed::RustEmbed; #[derive(RustEmbed)] #[folder = "assets"] #[include = "icons/**/*.svg"] -#[include = "themes/**/*.json"] #[include = "backgrounds/**/*.jpg"] #[include = "backgrounds/**/*.png"] #[exclude = "*.DS_Store"] @@ -14,35 +12,19 @@ pub struct Assets; impl AssetSource for Assets { fn load(&self, path: &str) -> Result>> { - Self::get(path) - .map(|f| Some(f.data)) - .with_context(|| format!("loading asset at path {path:?}")) + if let Some(file) = Self::get(path) { + return Ok(Some(file.data)); + } + gpui_native_kit::icons::IconAssets.load(path) } fn list(&self, path: &str) -> Result> { - Ok(Self::iter() - .filter_map(|p| { - if p.starts_with(path) { - Some(p.into()) - } else { - None - } - }) - .collect()) - } -} - -impl Assets { - pub fn themes(&self) -> Vec<(String, String)> { - Self::iter() - .filter(|path| path.starts_with("themes/")) - .filter_map(|path| { - let data = Self::get(path.as_ref())?; - let name = path.strip_prefix("themes/").unwrap_or(path.as_ref()); - let content = std::str::from_utf8(data.data.as_ref()).ok()?.to_owned(); - Some((name.to_owned(), content)) - }) - .collect() + let mut paths: Vec = Self::iter() + .filter(|p| p.starts_with(path)) + .map(Into::into) + .collect(); + paths.extend(gpui_native_kit::icons::IconAssets.list(path)?); + Ok(paths) } } diff --git a/crates/settings/Cargo.toml b/crates/settings/Cargo.toml index 1ed7ef0..2a41458 100644 --- a/crates/settings/Cargo.toml +++ b/crates/settings/Cargo.toml @@ -13,6 +13,3 @@ serde.workspace = true serde_json.workspace = true anyhow.workspace = true log.workspace = true - -[dev-dependencies] -gpui = { workspace = true, features = ["test-support"] } diff --git a/crates/settings/src/settings.rs b/crates/settings/src/settings.rs index faa452d..199b3f7 100644 --- a/crates/settings/src/settings.rs +++ b/crates/settings/src/settings.rs @@ -28,58 +28,6 @@ pub enum EventFetchingStrategy { Uncensored, } -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(default)] -pub struct ThemeSettings { - /// Name of the light theme in the theme registry. - pub light_theme: String, - /// Name of the dark theme in the theme registry. - pub dark_theme: String, - /// The base font size in pixels. - pub font_size: f32, - /// The monospace font size in pixels. - pub mono_font_size: f32, - /// Corner radius for general elements in pixels. - pub radius: f32, - /// Corner radius for large elements, dialogs and notifications, in pixels. - pub radius_lg: f32, - /// Whether focused controls draw a ring outside their border. - pub focus_ring: bool, - /// Whether to apply a shadow to elements. - pub shadow: bool, -} - -impl Default for ThemeSettings { - fn default() -> Self { - Self { - light_theme: "Signed Light".into(), - dark_theme: "Signed Dark".into(), - font_size: 16.0, - mono_font_size: 13.0, - radius: 4.0, - radius_lg: 8.0, - focus_ring: false, - shadow: false, - } - } -} - -/// Tab bar chrome. -#[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] -#[serde(default)] -pub struct TabBarSettings { - /// Hide the previous and next tab buttons. - pub hide_navigation_buttons: bool, -} - -impl Default for TabBarSettings { - fn default() -> Self { - Self { - hide_navigation_buttons: true, - } - } -} - #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] #[serde(default)] pub struct GraspServersSettings { @@ -151,8 +99,6 @@ pub struct CreateRepositorySettings { pub struct Settings { pub appearance: AppearanceMode, pub event_fetching: EventFetchingStrategy, - pub theme: ThemeSettings, - pub tab_bar: TabBarSettings, pub grasp_servers: GraspServersSettings, pub local_repos: LocalReposSettings, pub checkouts: CheckoutsSettings, @@ -168,10 +114,6 @@ mod tests { let settings = Settings { appearance: AppearanceMode::Dark, event_fetching: EventFetchingStrategy::Curated, - theme: ThemeSettings { - radius: 8.0, - ..Default::default() - }, create_repository: CreateRepositorySettings { default_folder: Some(PathBuf::from("/tmp/repos")), }, @@ -185,18 +127,34 @@ mod tests { #[test] fn partial_json_merges_with_defaults() { - let settings: Settings = - serde_json::from_str(r#"{"appearance": "dark", "theme": {"radius": 4.0}}"#).unwrap(); + let settings: Settings = serde_json::from_str( + r#"{"appearance": "dark", "grasp_servers": {"default_servers": []}}"#, + ) + .unwrap(); assert_eq!(settings.appearance, AppearanceMode::Dark); - assert_eq!(settings.theme.radius, 4.0); + assert_eq!(settings.grasp_servers.default_servers, Vec::::new()); // Unset fields fall back to their defaults, including the fetching strategy. assert_eq!(settings.event_fetching, EventFetchingStrategy::Uncensored); - // The rest of the theme and the other groups keep their defaults. - assert_eq!(settings.theme.light_theme, "Signed Light"); - assert_eq!(settings.grasp_servers, GraspServersSettings::default()); + assert_eq!(settings.local_repos, LocalReposSettings::default()); assert_eq!(settings.create_repository.default_folder, None); } + #[test] + fn legacy_theme_keys_are_ignored() { + let settings: Settings = serde_json::from_str( + r#"{"appearance": "light", "theme": {"radius": 8.0}, "tab_bar": {"hide_navigation_buttons": false}}"#, + ) + .unwrap(); + assert_eq!(settings.appearance, AppearanceMode::Light); + assert_eq!( + settings, + Settings { + appearance: AppearanceMode::Light, + ..Default::default() + } + ); + } + #[test] fn event_fetching_uses_snake_case() { let json = serde_json::to_string(&EventFetchingStrategy::Curated).unwrap(); diff --git a/crates/signed_app/Cargo.toml b/crates/signed_app/Cargo.toml new file mode 100644 index 0000000..2407490 --- /dev/null +++ b/crates/signed_app/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "signed_app" +version.workspace = true +edition.workspace = true +publish.workspace = true + +[dependencies] +assets = { path = "../assets" } +metadata = { path = "../metadata" } +paths = { path = "../paths" } +settings = { path = "../settings" } +signed_core = { path = "../signed_core" } +signed_git = { path = "../signed_git" } +signed_nostr = { path = "../signed_nostr" } +signed_state = { path = "../signed_state" } +utils = { path = "../utils" } + +gpui.workspace = true +gpui-native-kit.workspace = true +anyhow.workspace = true +futures.workspace = true +log.workspace = true diff --git a/crates/signed_app/src/app.rs b/crates/signed_app/src/app.rs new file mode 100644 index 0000000..3eef175 --- /dev/null +++ b/crates/signed_app/src/app.rs @@ -0,0 +1,55 @@ +use gpui::{ + App, AppContext as _, Context, Entity, IntoElement, ParentElement as _, Render, Styled as _, + Window, div, +}; +use gpui_native_kit::empty_state::EmptyState; +use gpui_native_kit::layout::dock::DockState; +use gpui_native_kit::layout::shell::{LayoutState, Shell}; +use gpui_native_kit::theme::{ActiveTheme as _, ThemeVariant, follow_system, set_mode_override}; +use settings::{AppearanceMode, Settings}; + +use crate::dialogs::DialogHost; + +pub struct AppRoot { + layout: Entity, + dock: Entity, + dialogs: Entity, +} + +impl AppRoot { + pub fn new(_window: &mut Window, cx: &mut App) -> Self { + let layout = LayoutState::new(cx); + let dock = DockState::new(cx); + let dialogs = cx.new(DialogHost::new); + DialogHost::set_global(dialogs.clone(), cx); + + Self { + layout, + dock, + dialogs, + } + } +} + +impl Render for AppRoot { + fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let theme = cx.theme(); + div() + .size_full() + .font_family(".SystemUIFont") + .text_color(theme.colors.foreground) + .child( + Shell::new("signed-shell", self.layout.clone()) + .center(EmptyState::new("Signed").hint("UI migration in progress")), + ) + .child(self.dialogs.clone()) + } +} + +pub fn apply_appearance(settings: &Settings, cx: &mut App) { + match settings.appearance { + AppearanceMode::System => follow_system(cx), + AppearanceMode::Light => set_mode_override(Some(ThemeVariant::Light), cx), + AppearanceMode::Dark => set_mode_override(Some(ThemeVariant::Dark), cx), + } +} diff --git a/crates/signed_app/src/dialogs/mod.rs b/crates/signed_app/src/dialogs/mod.rs new file mode 100644 index 0000000..342bf45 --- /dev/null +++ b/crates/signed_app/src/dialogs/mod.rs @@ -0,0 +1,47 @@ +use gpui::prelude::FluentBuilder as _; +use gpui::{ + AnyView, App, Context, Entity, Global, IntoElement, ParentElement as _, Render, Styled as _, + Window, div, +}; + +struct GlobalDialogHost(Entity); + +impl Global for GlobalDialogHost {} + +/// Owns the modal currently mounted at the window root. +pub struct DialogHost { + open: Option, +} + +impl DialogHost { + pub fn new(_cx: &mut Context) -> Self { + Self { open: None } + } + + pub fn set_global(entity: Entity, cx: &mut App) { + cx.set_global(GlobalDialogHost(entity)); + } + + pub fn global(cx: &App) -> Entity { + cx.global::().0.clone() + } + + pub fn open(&mut self, view: AnyView, cx: &mut Context) { + self.open = Some(view); + cx.notify(); + } + + pub fn close(&mut self, cx: &mut Context) { + self.open = None; + cx.notify(); + } +} + +impl Render for DialogHost { + fn render(&mut self, _window: &mut Window, _cx: &mut Context) -> impl IntoElement { + div() + .absolute() + .inset_0() + .when_some(self.open.clone(), |host, view| host.child(view)) + } +} diff --git a/crates/signed_app/src/lib.rs b/crates/signed_app/src/lib.rs new file mode 100644 index 0000000..09369fc --- /dev/null +++ b/crates/signed_app/src/lib.rs @@ -0,0 +1,12 @@ +mod app; +mod dialogs; +mod panels; +mod views; + +pub use app::{AppRoot, apply_appearance}; + +use gpui::{App, AppContext as _, Entity, Window}; + +pub fn root(window: &mut Window, cx: &mut App) -> Entity { + cx.new(|cx| AppRoot::new(window, cx)) +} diff --git a/crates/signed_app/src/panels.rs b/crates/signed_app/src/panels.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/crates/signed_app/src/panels.rs @@ -0,0 +1 @@ + diff --git a/crates/signed_app/src/views/mod.rs b/crates/signed_app/src/views/mod.rs new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/crates/signed_app/src/views/mod.rs @@ -0,0 +1 @@ + diff --git a/desktop/Cargo.toml b/desktop/Cargo.toml index 8c13d5a..48ce876 100644 --- a/desktop/Cargo.toml +++ b/desktop/Cargo.toml @@ -31,16 +31,12 @@ assets = { path = "../crates/assets" } metadata = { path = "../crates/metadata" } paths = { path = "../crates/paths" } settings = { path = "../crates/settings" } +signed_app = { path = "../crates/signed_app" } signed_state = { path = "../crates/signed_state" } -workspace = { path = "../crates/workspace" } gpui.workspace = true gpui_platform.workspace = true -dock = { workspace = true } -gpui-component.workspace = true -native-theme.workspace = true -native-theme-gpui.workspace = true -flume.workspace = true +gpui-native-kit.workspace = true reqwest_client.workspace = true tracing.workspace = true tracing-subscriber.workspace = true diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 5606dec..e5ba880 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -1,13 +1,10 @@ use std::sync::Arc; use assets::Assets; -use dock::TAB_BAR_HEIGHT; use gpui::*; -use gpui_component::{Theme, ThemeMode, ThemeRegistry, theme}; +use gpui_native_kit::theme::{ActiveTheme as _, Theme}; use gpui_platform::application; -use native_theme::watch::ThemeSubscription; -use native_theme_gpui::{SystemTheme, apply_system_theme}; -use settings::{AppearanceMode, Settings, SettingsStore}; +use settings::SettingsStore; actions!(signed, [Quit]); @@ -18,168 +15,66 @@ fn main() { .with_assets(Assets) .with_http_client(Arc::new(reqwest_client::ReqwestClient::new())) .run(move |cx| { - gpui_component::init(cx); - theme::init(cx); + gpui_native_kit::init(cx); + gpui_native_kit::editor::code::bind_code_view_keys(cx); + gpui_native_kit::editor::markdown::bind_text_view_keys(cx); - cx.bind_keys([KeyBinding::new("secondary-q", Quit, None)]); + cx.bind_keys([ + KeyBinding::new("cmd-q", Quit, None), + KeyBinding::new("ctrl-q", Quit, None), + ]); cx.on_action(|_: &Quit, cx| cx.quit()); - // The persisted settings must load before the theme is applied. let store = cx.new(|cx| SettingsStore::new(paths::settings_file(), cx)); SettingsStore::set_global(store.clone(), cx); - let settings = store.read(cx).settings().clone(); - { - let registry = ThemeRegistry::global_mut(cx); - for (name, content) in Assets.themes() { - if let Err(err) = registry.load_themes_from_str(&content) { - tracing::error!("Failed to load theme {name}: {err}"); - } - } + signed_app::apply_appearance(&settings, cx); + + if let Err(error) = std::fs::create_dir_all(paths::nostr_dir()) { + tracing::warn!("failed to create nostr dir: {error}"); } - - match apply_native_theme(&settings, cx) { - Ok(()) => start_theme_watcher(cx), - Err(error) => { - tracing::warn!("native theme unavailable ({error})"); - - let registry = ThemeRegistry::global_mut(cx); - let light_theme = registry - .themes() - .get(settings.theme.light_theme.as_str()) - .cloned(); - - let dark_theme = registry - .themes() - .get(settings.theme.dark_theme.as_str()) - .cloned(); - - let theme = Theme::global_mut(cx); - theme.radius = px(settings.theme.radius); - theme.radius_lg = px(settings.theme.radius_lg); - theme.focus_ring = settings.theme.focus_ring; - theme.shadow = settings.theme.shadow; - theme.font_size = px(settings.theme.font_size); - theme.mono_font_size = px(settings.theme.mono_font_size); - - if let Some(light) = light_theme { - theme.light_theme = light; - } else { - tracing::warn!("{} theme is missing", settings.theme.light_theme); - } - - if let Some(dark) = dark_theme { - theme.dark_theme = dark; - } else { - tracing::warn!("{} theme is missing", settings.theme.dark_theme); - } - - match settings.appearance { - AppearanceMode::System => Theme::sync_system_appearance(None, cx), - AppearanceMode::Light => Theme::change(ThemeMode::Light, None, cx), - AppearanceMode::Dark => Theme::change(ThemeMode::Dark, None, cx), - } - } + if let Err(error) = std::fs::create_dir_all(paths::repos_dir()) { + tracing::warn!("failed to create repos dir: {error}"); } - - std::fs::create_dir_all(paths::nostr_dir()).ok(); - std::fs::create_dir_all(paths::repos_dir()).ok(); - signed_state::init( paths::nostr_dir(), paths::repos_dir().clone(), - settings.local_repos.scan_paths, + settings.local_repos.scan_paths.clone(), cx, ); metadata::init(cx); - cx.set_app_identity("info.reya.signed", "Signed"); + let theme = cx.theme(); let bounds = Bounds::centered(None, size(px(1120.0), px(750.0)), cx); - let opts = WindowOptions { - window_background: WindowBackgroundAppearance::Opaque, - window_decorations: Some(WindowDecorations::Client), + let options = WindowOptions { window_bounds: Some(WindowBounds::Windowed(bounds)), window_min_size: Some(size(px(960.0), px(640.0))), - kind: WindowKind::Normal, - app_id: Some("Signed".to_owned()), titlebar: Some(TitlebarOptions { - title: Some(SharedString::new_static("Signed")), - // Center the 14pt traffic-light buttons on the tab bar. - traffic_light_position: Some(point( - px(9.0), - px(TAB_BAR_HEIGHT / px(2.) - 14. / 2.), - )), + title: Some("Signed".into()), appears_transparent: true, + ..Default::default() }), app_owns_titlebar_drag: true, + window_background: theme.window_background, + app_id: Some("Signed".to_owned()), ..Default::default() }; - cx.spawn(async move |cx| { - cx.open_window(opts, workspace::root).ok(); - }) - .detach(); - + if let Err(error) = cx.open_window(options, |window, cx| { + Theme::sync_from_window(window, cx); + Theme::sync_window_rem_size(window, cx); + window + .observe_window_appearance(|window, cx| { + Theme::sync_from_window(window, cx); + Theme::sync_window_rem_size(window, cx); + cx.refresh_windows(); + }) + .detach(); + signed_app::root(window, cx) + }) { + tracing::error!("failed to open window: {error}"); + } cx.activate(true); }); } - -/// Apply the OS theme to the app, scaling the font size to match the system font size. -fn apply_native_theme(settings: &Settings, cx: &mut App) -> native_theme::Result<()> { - let mut system = SystemTheme::from_system()?; - let native = system.light.defaults.font.size; - if native > 0.0 { - let scaling = settings.theme.font_size / native; - system.accessibility.text_scaling_factor *= scaling; - } - - apply_system_theme(&system, cx); - - match settings.appearance { - AppearanceMode::System => Theme::sync_system_appearance(None, cx), - AppearanceMode::Light => Theme::change(ThemeMode::Light, None, cx), - AppearanceMode::Dark => Theme::change(ThemeMode::Dark, None, cx), - } - - Ok(()) -} - -/// Holds the watcher subscription so it lives as long as the app. -struct ThemeWatcher { - _subscription: ThemeSubscription, -} - -impl Global for ThemeWatcher {} - -/// Re-apply the OS theme whenever it changes at runtime. -fn start_theme_watcher(cx: &mut App) { - let (sender, receiver) = flume::unbounded(); - match native_theme::watch::on_theme_change(move |event| { - if let Err(error) = sender.send(event) { - tracing::warn!("theme change dropped ({error})"); - } - }) { - Ok(subscription) => { - cx.set_global(ThemeWatcher { - _subscription: subscription, - }); - cx.spawn(async move |cx| { - while receiver.recv_async().await.is_ok() { - tracing::info!("OS theme changed; re-applying"); - cx.update(|cx| { - let store = SettingsStore::global(cx); - let settings = store.read(cx).settings().clone(); - if let Err(error) = apply_native_theme(&settings, cx) { - tracing::warn!("failed to apply updated OS theme ({error})"); - } - }); - } - }) - .detach(); - } - Err(error) => { - tracing::warn!("OS theme watching unavailable ({error})") - } - } -} diff --git a/docs/gpui-native-kit-gaps.md b/docs/gpui-native-kit-gaps.md new file mode 100644 index 0000000..b09db63 --- /dev/null +++ b/docs/gpui-native-kit-gaps.md @@ -0,0 +1,39 @@ +# gpui-native-kit gaps + +Known Signed features the kit does not currently support. Recorded instead of +modifying the kit or reimplementing a parallel mechanism. + +1. **Custom themes.** `Signed Light`/`Signed Dark`, theme registry names, font + sizes, radii, focus ring, and shadows are removed. The kit derives colors, + radii, fonts, and chrome from the OS; `AppearanceMode` is preserved through + `set_mode_override`/`follow_system`. +2. **Tab bar navigation.** The previous/next tab buttons and + `tab_bar.hide_navigation_buttons` are removed; the kit tab strip has none. +3. **Traffic-light placement.** Custom macOS traffic-light position and the 44px + tab bar are removed. The kit uses `theme.titlebar_height` and a fixed 78px + traffic-light pad. +4. **Virtual list.** The kit has no data-driven virtual list. Screens keep + `gpui::uniform_list` for fixed-height lists and `ScrollArea` for the Inbox. +5. **Editable code field.** The kit code view is read-only and supports four + grammars. Signed only previews files read-only; other extensions render as + plain text. +6. **Hunk-only diffs.** Kit `DiffViewState` needs the full old and new texts; + `CommitDiff` carries hunks only. The custom hunk rows are retained. +7. **Tree data.** The kit tree is flat with caller-managed expansion, and has no + file glyph; folders use the folder role. +8. **Dynamic dock panels.** `DockState` has no unregister or `open_view` API. + Per-repository/per-entity panels register a builder keyed by a unique id and + stay in the builder map. No dock persistence, zoom, or bottom/right + placement; splits only. +9. **Dialogs.** Dialogs are elements mounted at the window root; there is no + `window.open_dialog`, dialog stack, or non-dismissible option. A single-slot + `DialogHost` is used, and the passphrase dialog ignores dismiss requests. +10. **Notifications.** The kit toast shows one toast at a time; backend errors + queue but only the current toast is visible. +11. **Segmented badges.** `Segmented` has no badge slot; filter counts fold + into labels. +12. **Combobox trigger.** `Combobox` has no custom trigger renderer; branch/tag + selectors lose the leading git icon and custom caret. +13. **Icons.** The built-in role set is limited. App-specific glyphs remain in + `assets::CustomIconName` through `IconNamed`; kit icons are unpainted + unless given a color. diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 74544e8..ac21b00 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.96" +channel = "1.98.1" profile = "minimal" components = ["rustfmt", "clippy"] targets = [