From a19c1114020962986576e1dd0be68d17a7274232 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 03:52:37 +0000 Subject: [PATCH] Bump gpui from `53b2f37` to `59b87d5` Bumps [gpui](https://github.com/zed-industries/zed) from `53b2f37` to `59b87d5`. - [Release notes](https://github.com/zed-industries/zed/releases) - [Commits](https://github.com/zed-industries/zed/compare/53b2f37452189870c93d4514604f903d5ed885d9...59b87d5c71a51d2b981ba86f694212a748b33120) --- updated-dependencies: - dependency-name: gpui dependency-version: 59b87d5c71a51d2b981ba86f694212a748b33120 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- Cargo.lock | 510 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 321 insertions(+), 189 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a448a74..c73ca90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -313,6 +313,9 @@ dependencies = [ "serde", "serde_repr", "url", + "wayland-backend", + "wayland-client", + "wayland-protocols 0.32.9", "zbus", ] @@ -463,6 +466,21 @@ dependencies = [ "futures-lite 2.6.1", ] +[[package]] +name = "async-global-executor" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c" +dependencies = [ + "async-channel 2.5.0", + "async-executor", + "async-io 2.5.0", + "async-lock 3.4.1", + "blocking", + "futures-lite 2.6.1", + "once_cell", +] + [[package]] name = "async-io" version = "1.13.0" @@ -607,6 +625,47 @@ dependencies = [ "windows-sys 0.60.2", ] +[[package]] +name = "async-std" +version = "1.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b" +dependencies = [ + "async-channel 1.9.0", + "async-global-executor", + "async-io 2.5.0", + "async-lock 3.4.1", + "async-process 2.4.0", + "crossbeam-utils", + "futures-channel", + "futures-core", + "futures-io", + "futures-lite 2.6.1", + "gloo-timers", + "kv-log-macro", + "log", + "memchr", + "once_cell", + "pin-project-lite", + "pin-utils", + "slab", + "wasm-bindgen-futures", +] + +[[package]] +name = "async-tar" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a42f905d4f623faf634bbd1e001e84e0efc24694afa64be9ad239bf6ca49e1f8" +dependencies = [ + "async-std", + "filetime", + "libc", + "pin-project", + "redox_syscall 0.2.16", + "xattr 0.2.3", +] + [[package]] name = "async-task" version = "4.7.1" @@ -811,7 +870,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.11.0", "lazy_static", "lazycell", "log", @@ -822,7 +881,7 @@ dependencies = [ "rustc-hash 1.1.0", "shlex", "syn 2.0.105", - "which", + "which 4.4.2", ] [[package]] @@ -834,7 +893,7 @@ dependencies = [ "bitflags 2.9.1", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.11.0", "log", "prettyplease", "proc-macro2", @@ -913,15 +972,16 @@ dependencies = [ [[package]] name = "blade-graphics" -version = "0.6.0" -source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4deb8f595ce7f00dee3543ebf6fd9a20ea86fc421ab79600dac30876250bdae" dependencies = [ "ash 0.38.0+1.3.281", "ash-window", "bitflags 2.9.1", "bytemuck", - "codespan-reporting 0.11.1", - "glow 0.14.2", + "codespan-reporting 0.12.0", + "glow 0.16.0", "gpu-alloc", "gpu-alloc-ash", "hidden-trait", @@ -938,6 +998,7 @@ dependencies = [ "objc2-metal 0.3.1", "objc2-quartz-core 0.3.1", "objc2-ui-kit 0.3.1", + "once_cell", "raw-window-handle", "slab", "wasm-bindgen", @@ -947,7 +1008,8 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.3.0" -source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27142319e2f4c264581067eaccb9f80acccdde60d8b4bf57cc50cd3152f109ca" dependencies = [ "proc-macro2", "quote", @@ -956,8 +1018,9 @@ dependencies = [ [[package]] name = "blade-util" -version = "0.2.0" -source = "git+https://github.com/kvark/blade?rev=bfa594ea697d4b6326ea29f747525c85ecf933b9#bfa594ea697d4b6326ea29f747525c85ecf933b9" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6be3a82c001ba7a17b6f8e413ede5d1004e6047213f8efaf0ffc15b5c4904c" dependencies = [ "blade-graphics", "bytemuck", @@ -1289,7 +1352,7 @@ dependencies = [ "image", "indicatif", "plist", - "reqwest 0.12.23", + "reqwest", "serde", "serde_json", "tar", @@ -1514,14 +1577,14 @@ dependencies = [ [[package]] name = "cocoa" -version = "0.26.1" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c" +checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2" dependencies = [ "bitflags 2.9.1", "block", - "cocoa-foundation 0.2.1", - "core-foundation 0.10.1", + "cocoa-foundation 0.2.0", + "core-foundation 0.10.0", "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", @@ -1544,14 +1607,15 @@ dependencies = [ [[package]] name = "cocoa-foundation" -version = "0.2.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d" +checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d" dependencies = [ "bitflags 2.9.1", "block", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-graphics-types 0.2.0", + "libc", "objc", ] @@ -1579,11 +1643,10 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "indexmap 2.10.0", "rustc-hash 2.1.1", - "workspace-hack", ] [[package]] @@ -1719,9 +1782,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6" +checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63" dependencies = [ "core-foundation-sys", "libc", @@ -1753,7 +1816,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-graphics-types 0.2.0", "foreign-types 0.5.0", "libc", @@ -1790,7 +1853,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "libc", ] @@ -1803,7 +1866,7 @@ dependencies = [ "bitflags 2.9.1", "block", "cfg-if", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "libc", ] @@ -1813,7 +1876,7 @@ version = "21.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" dependencies = [ - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-graphics 0.24.0", "foreign-types 0.5.0", "libc", @@ -1826,7 +1889,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef" dependencies = [ "block", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-graphics2", "io-surface", "libc", @@ -2005,7 +2068,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e3d747f100290a1ca24b752186f61f6637e1deffe3bf6320de6fcb29510a307" dependencies = [ "bitflags 2.9.1", - "libloading 0.8.8", + "libloading 0.7.4", "winapi", ] @@ -2016,7 +2079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b28bfe653d79bd16c77f659305b195b82bb5ce0c0eb2a4846b82ddbd77586813" dependencies = [ "bitflags 2.9.1", - "libloading 0.8.8", + "libloading 0.7.4", "winapi", ] @@ -2101,12 +2164,11 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "proc-macro2", "quote", "syn 2.0.105", - "workspace-hack", ] [[package]] @@ -2227,7 +2289,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading 0.8.8", + "libloading 0.7.4", ] [[package]] @@ -2710,30 +2772,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "font-kit" -version = "0.14.1" -source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568" -dependencies = [ - "bitflags 2.9.1", - "byteorder", - "core-foundation 0.10.1", - "core-graphics 0.24.0", - "core-text", - "dirs 5.0.1", - "dwrote", - "float-ord", - "freetype-sys", - "lazy_static", - "libc", - "log", - "pathfinder_geometry", - "pathfinder_simd", - "walkdir", - "winapi", - "yeslogic-fontconfig-sys", -] - [[package]] name = "font-types" version = "0.9.0" @@ -3284,6 +3322,18 @@ dependencies = [ "walkdir", ] +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "glow" version = "0.13.1" @@ -3298,9 +3348,9 @@ dependencies = [ [[package]] name = "glow" -version = "0.14.2" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51fa363f025f5c111e03f13eda21162faeacb6911fe8caa0c0349f9cf0c4483" +checksum = "c5e5ea60d70410161c8bf5da3fdfeaa1c72ed2c15f8bbb9d19fe3a4fad085f08" dependencies = [ "js-sys", "slotmap", @@ -3413,8 +3463,8 @@ dependencies = [ [[package]] name = "gpui" -version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +version = "0.2.1" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -3429,9 +3479,10 @@ dependencies = [ "calloop 0.13.0", "calloop-wayland-source 0.3.0", "cbindgen", - "cocoa 0.26.1", + "cocoa 0.26.0", + "cocoa-foundation 0.2.0", "collections", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys", "core-graphics 0.24.0", "core-text", @@ -3443,7 +3494,6 @@ dependencies = [ "etagere", "filedescriptor", "flume", - "font-kit", "foreign-types 0.5.0", "futures", "gpui_macros", @@ -3464,13 +3514,13 @@ dependencies = [ "parking", "parking_lot", "pathfinder_geometry", + "pin-project", "postage", "profiling", "rand 0.9.2", "raw-window-handle", "refineable", "resvg", - "scap", "schemars", "seahash", "semantic_version", @@ -3486,6 +3536,7 @@ dependencies = [ "thiserror 2.0.14", "usvg", "util", + "util_macros", "uuid", "waker-fn", "wayland-backend", @@ -3497,11 +3548,12 @@ dependencies = [ "windows-core 0.61.2", "windows-numerics", "windows-registry 0.5.3", - "workspace-hack", "x11-clipboard", "x11rb", - "xim", "xkbcommon", + "zed-font-kit", + "zed-scap", + "zed-xim", ] [[package]] @@ -3606,13 +3658,12 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.105", - "workspace-hack", ] [[package]] @@ -3740,7 +3791,7 @@ dependencies = [ "bitflags 2.9.1", "com", "libc", - "libloading 0.8.8", + "libloading 0.7.4", "thiserror 1.0.69", "widestring", "winapi", @@ -3885,9 +3936,12 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", + "async-compression", + "async-fs 2.1.3", + "async-tar", "bytes", "derive_more", "futures", @@ -3895,21 +3949,22 @@ dependencies = [ "http-body", "log", "parking_lot", - "reqwest 0.12.15", "serde", "serde_json", + "sha2", + "tempfile", "url", - "workspace-hack", + "util", + "zed-reqwest", ] [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "rustls", "rustls-platform-verifier", - "workspace-hack", ] [[package]] @@ -4015,7 +4070,7 @@ dependencies = [ "js-sys", "log", "wasm-bindgen", - "windows-core 0.61.2", + "windows-core 0.58.0", ] [[package]] @@ -4339,7 +4394,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "554b8c5d64ec09a3a520fe58e4d48a73e00ff32899cdcbe32a4877afd4968b8e" dependencies = [ "cgl", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys", "leaky-cow", ] @@ -4587,6 +4642,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "kv-log-macro" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" +dependencies = [ + "log", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -4924,17 +4988,16 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", "bindgen 0.71.1", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-video", "ctor", "foreign-types 0.5.0", "metal 0.29.0", "objc", - "workspace-hack", ] [[package]] @@ -5465,7 +5528,7 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d" dependencies = [ - "proc-macro-crate 3.3.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.105", @@ -6100,6 +6163,16 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "perf" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" +dependencies = [ + "collections", + "serde", + "serde_json", +] + [[package]] name = "pest" version = "2.8.1" @@ -7060,6 +7133,15 @@ dependencies = [ "font-types", ] +[[package]] +name = "redox_syscall" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_syscall" version = "0.3.5" @@ -7132,10 +7214,9 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "derive_refineable", - "workspace-hack", ] [[package]] @@ -7197,55 +7278,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832" -[[package]] -name = "reqwest" -version = "0.12.15" -source = "git+https://github.com/zed-industries/reqwest.git?rev=951c770a32f1998d6e999cef3e59e0013e6c4415#951c770a32f1998d6e999cef3e59e0013e6c4415" -dependencies = [ - "base64", - "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 = "reqwest" version = "0.12.23" @@ -7291,7 +7323,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", "bytes", @@ -7300,10 +7332,9 @@ dependencies = [ "http_client_tls", "log", "regex", - "reqwest 0.12.15", "serde", "tokio", - "workspace-hack", + "zed-reqwest", ] [[package]] @@ -7375,7 +7406,7 @@ dependencies = [ [[package]] name = "rope" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "arrayvec", "log", @@ -7384,7 +7415,6 @@ dependencies = [ "sum_tree", "unicode-segmentation", "util", - "workspace-hack", ] [[package]] @@ -7618,7 +7648,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1" dependencies = [ - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys", "jni", "log", @@ -7716,27 +7746,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scap" -version = "0.0.8" -source = "git+https://github.com/zed-industries/scap?rev=808aa5c45b41e8f44729d02e38fd00a2fe2722e7#808aa5c45b41e8f44729d02e38fd00a2fe2722e7" -dependencies = [ - "anyhow", - "cocoa 0.25.0", - "core-graphics-helmer-fork", - "log", - "objc", - "rand 0.8.5", - "screencapturekit", - "screencapturekit-sys", - "sysinfo", - "tao-core-video-sys", - "windows 0.61.3", - "windows-capture", - "x11", - "xcb", -] - [[package]] name = "schannel" version = "0.1.27" @@ -7859,7 +7868,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c" dependencies = [ "bitflags 2.9.1", - "core-foundation 0.10.1", + "core-foundation 0.10.0", "core-foundation-sys", "libc", "security-framework-sys", @@ -7904,11 +7913,10 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", "serde", - "workspace-hack", ] [[package]] @@ -8566,12 +8574,11 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "arrayvec", "log", "rayon", - "workspace-hack", ] [[package]] @@ -8833,7 +8840,7 @@ checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", - "xattr", + "xattr 1.5.1", ] [[package]] @@ -9905,7 +9912,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed.git#53b2f37452189870c93d4514604f903d5ed885d9" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" dependencies = [ "anyhow", "async-fs 2.1.3", @@ -9934,7 +9941,17 @@ dependencies = [ "tendril", "unicase", "walkdir", - "workspace-hack", + "which 6.0.3", +] + +[[package]] +name = "util_macros" +version = "0.1.0" +source = "git+https://github.com/zed-industries/zed.git#59b87d5c71a51d2b981ba86f694212a748b33120" +dependencies = [ + "perf", + "quote", + "syn 2.0.105", ] [[package]] @@ -10623,7 +10640,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.8", + "libloading 0.7.4", "log", "metal 0.27.0", "naga 0.19.2", @@ -10668,7 +10685,7 @@ dependencies = [ "js-sys", "khronos-egl", "libc", - "libloading 0.8.8", + "libloading 0.7.4", "log", "metal 0.28.0", "naga 0.20.0", @@ -10723,6 +10740,18 @@ dependencies = [ "rustix 0.38.44", ] +[[package]] +name = "which" +version = "6.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f" +dependencies = [ + "either", + "home", + "rustix 0.38.44", + "winsafe", +] + [[package]] name = "wide" version = "0.7.33" @@ -11486,6 +11515,12 @@ dependencies = [ "windows-sys 0.59.0", ] +[[package]] +name = "winsafe" +version = "0.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d135d17ab770252ad95e9a872d365cf3090e3be864a34ab46f48555993efc904" + [[package]] name = "wio" version = "0.2.2" @@ -11504,12 +11539,6 @@ dependencies = [ "bitflags 2.9.1", ] -[[package]] -name = "workspace-hack" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beffa227304dbaea3ad6a06ac674f9bc83a3dec3b7f63eeb442de37e7cb6bb01" - [[package]] name = "writeable" version = "0.6.1" @@ -11620,6 +11649,15 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d" +[[package]] +name = "xattr" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" +dependencies = [ + "libc", +] + [[package]] name = "xattr" version = "1.5.1" @@ -11648,23 +11686,10 @@ version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" -[[package]] -name = "xim" -version = "0.4.0" -source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d" -dependencies = [ - "ahash 0.8.12", - "hashbrown 0.14.5", - "log", - "x11rb", - "xim-ctext", - "xim-parser", -] - [[package]] name = "xim-ctext" version = "0.3.0" -source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d" +source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" dependencies = [ "encoding_rs", ] @@ -11672,7 +11697,7 @@ dependencies = [ [[package]] name = "xim-parser" version = "0.2.1" -source = "git+https://github.com/zed-industries/xim-rs?rev=c0a70c1bd2ce197364216e5e818a2cb3adb99a8d#c0a70c1bd2ce197364216e5e818a2cb3adb99a8d" +source = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" dependencies = [ "bitflags 2.9.1", ] @@ -11832,6 +11857,113 @@ dependencies = [ "zvariant", ] +[[package]] +name = "zed-font-kit" +version = "0.14.1-zed" +source = "git+https://github.com/zed-industries/font-kit?rev=110523127440aefb11ce0cf280ae7c5071337ec5#110523127440aefb11ce0cf280ae7c5071337ec5" +dependencies = [ + "bitflags 2.9.1", + "byteorder", + "core-foundation 0.10.0", + "core-graphics 0.24.0", + "core-text", + "dirs 5.0.1", + "dwrote", + "float-ord", + "freetype-sys", + "lazy_static", + "libc", + "log", + "pathfinder_geometry", + "pathfinder_simd", + "walkdir", + "winapi", + "yeslogic-fontconfig-sys", +] + +[[package]] +name = "zed-reqwest" +version = "0.12.15-zed" +source = "git+https://github.com/zed-industries/reqwest.git?rev=c15662463bda39148ba154100dd44d3fba5873a4#c15662463bda39148ba154100dd44d3fba5873a4" +dependencies = [ + "base64", + "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 = "zed-scap" +version = "0.0.8-zed" +source = "git+https://github.com/zed-industries/scap?rev=4afea48c3b002197176fb19cd0f9b180dd36eaac#4afea48c3b002197176fb19cd0f9b180dd36eaac" +dependencies = [ + "anyhow", + "cocoa 0.25.0", + "core-graphics-helmer-fork", + "log", + "objc", + "rand 0.8.5", + "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 = "git+https://github.com/zed-industries/xim-rs.git?rev=16f35a2c881b815a2b6cdfd6687988e84f8447d8#16f35a2c881b815a2b6cdfd6687988e84f8447d8" +dependencies = [ + "ahash 0.8.12", + "hashbrown 0.14.5", + "log", + "x11rb", + "xim-ctext", + "xim-parser", +] + [[package]] name = "zeno" version = "0.3.3"