From 792f583b97e17301232f96d79e58ca512f44ed8c Mon Sep 17 00:00:00 2001
From: Piotr Osiewicz <24362066+osiewicz@users.noreply.github.com>
Date: Mon, 14 Oct 2024 15:19:10 +0200
Subject: [PATCH] Revert "chore: Bump taffy to 0.5.2 (#18729)" (#19189)

This reverts commit a99750fd35ef4f44409f474228285b1842c1b7d3.

@huacnlee found that commit to have a bad impact on perf and triaged it
for us in
https://github.com/zed-industries/zed/pull/18729#issuecomment-2410445980
Closes #ISSUE

Release Notes:

- N/A
---
 Cargo.lock               | 8 ++++----
 crates/gpui/Cargo.toml   | 2 +-
 crates/gpui/src/taffy.rs | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a76e7e5a6d745..db14b8c7ae431 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5110,9 +5110,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 = "group"
@@ -11430,9 +11430,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",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index 8e982da85598b..b7fafb805809d 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -103,7 +103,7 @@ smallvec.workspace = true
 smol.workspace = true
 strum.workspace = true
 sum_tree.workspace = true
-taffy = "0.5"
+taffy = "0.4.3"
 thiserror.workspace = true
 util.workspace = true
 uuid.workspace = true
diff --git a/crates/gpui/src/taffy.rs b/crates/gpui/src/taffy.rs
index 9d99078ae5fc1..84f4d73fea8ff 100644
--- a/crates/gpui/src/taffy.rs
+++ b/crates/gpui/src/taffy.rs
@@ -174,7 +174,7 @@ impl TaffyLayoutEngine {
             .compute_layout_with_measure(
                 id.into(),
                 available_space.into(),
-                |known_dimensions, available_space, _node_id, node_context, _style| {
+                |known_dimensions, available_space, _id, node_context| {
                     let Some(node_context) = node_context else {
                         return taffy::geometry::Size::default();
                     };