From d265ba76679a0503887c496584898254cbb31e45 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 30 Dec 2024 17:12:38 +0800 Subject: [PATCH] chore: Update GPUI 2024/11/30 --- Cargo.lock | 60 +++++++++++++++++++++++++++++------------------------- 1 file changed, 32 insertions(+), 28 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 57c7eb44..1b8a25ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -474,7 +474,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.11.0", + "itertools 0.13.0", "log", "prettyplease", "proc-macro2", @@ -487,18 +487,18 @@ dependencies = [ [[package]] name = "bit-set" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bit_field" @@ -526,16 +526,14 @@ checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "blade-graphics" -version = "0.5.0" -source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" +version = "0.6.0" +source = "git+https://github.com/kvark/blade?rev=091a8401033847bb9b6ace3fcf70448d069621c5#091a8401033847bb9b6ace3fcf70448d069621c5" dependencies = [ "ash", "ash-window", "bitflags 2.6.0", - "block", "bytemuck", "codespan-reporting", - "core-graphics-types 0.1.3", "glow", "gpu-alloc", "gpu-alloc-ash", @@ -544,10 +542,14 @@ dependencies = [ "khronos-egl", "libloading", "log", - "metal", "mint", "naga", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", + "objc2-metal", + "objc2-quartz-core", + "objc2-ui-kit", "raw-window-handle", "slab", "wasm-bindgen", @@ -557,7 +559,7 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.3.0" -source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" +source = "git+https://github.com/kvark/blade?rev=091a8401033847bb9b6ace3fcf70448d069621c5#091a8401033847bb9b6ace3fcf70448d069621c5" dependencies = [ "proc-macro2", "quote", @@ -566,8 +568,8 @@ dependencies = [ [[package]] name = "blade-util" -version = "0.1.0" -source = "git+https://github.com/kvark/blade?rev=e142a3a5e678eb6a13e642ad8401b1f3aa38e969#e142a3a5e678eb6a13e642ad8401b1f3aa38e969" +version = "0.2.0" +source = "git+https://github.com/kvark/blade?rev=091a8401033847bb9b6ace3fcf70448d069621c5#091a8401033847bb9b6ace3fcf70448d069621c5" dependencies = [ "blade-graphics", "bytemuck", @@ -950,7 +952,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "rustc-hash", ] @@ -1313,7 +1315,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "proc-macro2", "quote", @@ -2266,7 +2268,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2351,7 +2353,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "proc-macro2", "quote", @@ -2541,7 +2543,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "anyhow", "bytes", @@ -3057,7 +3059,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "anyhow", "bindgen", @@ -3094,9 +3096,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.29.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +checksum = "9c3572083504c43e14aec05447f8a3d57cce0f66d7a3c1b9058572eca4d70ab9" dependencies = [ "bitflags 2.6.0", "block", @@ -3131,9 +3133,9 @@ checksum = "e53debba6bda7a793e5f99b8dacf19e626084f525f7829104ba9898f367d85ff" [[package]] name = "naga" -version = "22.1.0" +version = "23.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bd5a652b6faf21496f2cfd88fc49989c8db0825d1f6746b1a71a6ede24a63ad" +checksum = "364f94bc34f61332abebe8cad6f6cd82a5b65cff22c828d05d0968911462ca4f" dependencies = [ "arrayvec", "bit-set", @@ -4337,7 +4339,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "derive_refineable", ] @@ -4658,7 +4660,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "anyhow", "serde", @@ -5080,7 +5082,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "arrayvec", "log", @@ -5745,7 +5747,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#65da76c2df8887f2ff699365c95ea8205bf65861" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#04c0cf74867255a5658a8a9ae534d0f659e2c15b" dependencies = [ "anyhow", "async-fs 1.6.0", @@ -5755,6 +5757,8 @@ dependencies = [ "futures", "futures-lite 1.13.0", "globset", + "itertools 0.13.0", + "libc", "log", "regex", "rust-embed",