From 54bc3900a280ddc24e85f6bf7817e58771d5efe5 Mon Sep 17 00:00:00 2001 From: Jason Lee Date: Mon, 14 Oct 2024 22:16:51 +0800 Subject: [PATCH] Update GPUI to revert `taffy` for performance. (#344) Ref: - https://github.com/zed-industries/zed/pull/19189 - https://github.com/zed-industries/zed/pull/18729#issuecomment-2410445980 --- Cargo.lock | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 19a8e53e..350c842b 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", @@ -938,7 +938,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "rustc-hash", ] @@ -1273,7 +1273,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "proc-macro2", "quote", @@ -2214,7 +2214,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2314,7 +2314,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "proc-macro2", "quote", @@ -2323,9 +2323,9 @@ dependencies = [ [[package]] name = "grid" -version = "0.14.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82" +checksum = "d196ffc1627db18a531359249b2bf8416178d84b729f3cebeb278f285fb9b58c" [[package]] name = "gtk" @@ -2498,7 +2498,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "anyhow", "bytes", @@ -3015,7 +3015,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "anyhow", "bindgen", @@ -4081,7 +4081,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "derive_refineable", ] @@ -4384,7 +4384,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "anyhow", "serde", @@ -4801,7 +4801,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "arrayvec", "log", @@ -4959,9 +4959,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.5.2" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cb893bff0f80ae17d3a57e030622a967b8dbc90e38284d9b4b1442e23873c94" +checksum = "9ec17858c2d465b2f734b798b920818a974faf0babb15d7fef81818a4b2d16f1" dependencies = [ "arrayvec", "grid", @@ -5409,7 +5409,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#fa2a06028cc472e3a4b7e5c46722dc377dcdf8bf" +source = "git+https://github.com/huacnlee/zed.git?branch=export-platform-window#e681a4bad2503f0cd8dec16d29591318a344a06a" dependencies = [ "anyhow", "async-fs 1.6.0",