From 2274337de3e48a45042d362174ad7d817dca9fc6 Mon Sep 17 00:00:00 2001 From: Floyd Wang Date: Mon, 31 Mar 2025 16:49:10 +0800 Subject: [PATCH] chore: Update GPUI 2025/03/31 2 (#754) Reupdate because https://github.com/zed-industries/zed/issues/27767. --- Cargo.lock | 120 ++++++++++++----------------------------------------- 1 file changed, 26 insertions(+), 94 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 142328a2..b5d2e315 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -561,7 +561,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.11.0", "lazy_static", "lazycell", "log", @@ -584,7 +584,7 @@ dependencies = [ "bitflags 2.6.0", "cexpr", "clang-sys", - "itertools 0.10.5", + "itertools 0.11.0", "log", "prettyplease", "proc-macro2", @@ -959,15 +959,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cgl" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ced0551234e87afee12411d535648dd89d2e7f34c78b753395567aff3d447ff" -dependencies = [ - "libc", -] - [[package]] name = "charts-rs" version = "0.3.19" @@ -1114,7 +1105,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "indexmap 2.7.1", "rustc-hash 2.1.0", @@ -1284,45 +1275,18 @@ dependencies = [ "libc", ] -[[package]] -name = "core-graphics2" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4583956b9806b69f73fcb23aee05eb3620efc282972f08f6a6db7504f8334d" -dependencies = [ - "bitflags 2.6.0", - "block", - "cfg-if", - "core-foundation 0.10.0", - "libc", -] - [[package]] name = "core-text" -version = "21.0.0" +version = "20.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a593227b66cbd4007b2a050dfdd9e1d1318311409c8d600dc82ba1b15ca9c130" +checksum = "c9d2790b5c08465d49f8dc05c8bcae9fea467855947db39b0f8145c091aaced5" dependencies = [ - "core-foundation 0.10.0", - "core-graphics 0.24.0", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "foreign-types", "libc", ] -[[package]] -name = "core-video" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d45e71d5be22206bed53c3c3cb99315fc4c3d31b8963808c6bc4538168c4f8ef" -dependencies = [ - "block", - "core-foundation 0.10.0", - "core-graphics2", - "io-surface", - "libc", - "metal", -] - [[package]] name = "core_maths" version = "0.1.0" @@ -1591,7 +1555,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "proc-macro2", "quote", @@ -2002,12 +1966,12 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "font-kit" version = "0.14.1" -source = "git+https://github.com/zed-industries/font-kit?rev=5474cfad4b719a72ec8ed2cb7327b2b01fd10568#5474cfad4b719a72ec8ed2cb7327b2b01fd10568" +source = "git+https://github.com/zed-industries/font-kit?rev=40391b7#40391b7c0041d8a8572af2afa3de32ae088f0120" dependencies = [ "bitflags 2.6.0", "byteorder", - "core-foundation 0.10.0", - "core-graphics 0.24.0", + "core-foundation 0.9.4", + "core-graphics 0.23.2", "core-text", "dirs 5.0.1", "dwrote", @@ -2596,7 +2560,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2613,11 +2577,10 @@ dependencies = [ "cbindgen", "cocoa 0.26.0", "collections", - "core-foundation 0.10.0", + "core-foundation 0.9.4", "core-foundation-sys", - "core-graphics 0.24.0", + "core-graphics 0.23.2", "core-text", - "core-video", "cosmic-text", "ctor", "derive_more", @@ -2640,8 +2603,6 @@ dependencies = [ "naga", "num_cpus", "objc", - "objc2", - "objc2-metal", "oo7", "open", "parking", @@ -2717,7 +2678,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "proc-macro2", "quote", @@ -2985,7 +2946,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "bytes", @@ -3001,7 +2962,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3247,19 +3208,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "io-surface" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8283575d5f0b2e7447ec0840363879d71c0fa325d4c699d5b45208ea4a51f45e" -dependencies = [ - "cgl", - "core-foundation 0.10.0", - "core-foundation-sys", - "leaky-cow", - "libc", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -3459,21 +3407,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[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.2" @@ -3759,12 +3692,11 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "bindgen 0.70.1", - "core-foundation 0.10.0", - "core-video", + "core-foundation 0.9.4", "ctor", "foreign-types", "metal", @@ -3797,9 +3729,9 @@ dependencies = [ [[package]] name = "metal" -version = "0.29.0" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ecfd3296f8c56b7c1f6fbac3c71cefa9d78ce009850c45000015f206dc7fa21" +checksum = "f569fb946490b5743ad69813cb19629130ce9374034abe31614a36402d18f99e" dependencies = [ "bitflags 2.6.0", "block", @@ -5369,7 +5301,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "derive_refineable", ] @@ -5462,7 +5394,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "bytes", @@ -5937,7 +5869,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "serde", @@ -6410,7 +6342,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "arrayvec", "log", @@ -7208,7 +7140,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=webview#d4bae24bd52ae832e7d80f4a59d68c98782009e2" +source = "git+https://github.com/huacnlee/zed.git?branch=webview#236d6f902eabf5e3de7e8f07952cd0d438063a9d" dependencies = [ "anyhow", "async-fs 2.1.2",