Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "chore: Bump taffy to 0.8.3" (#34938)

Browse source 
Reverts zed-industries/zed#34876

From our Slack:
<img width="1694" height="1610" alt="image"
src="https://github.com/user-attachments/assets/c7b8f02a-8609-4ed3-9cd5-7d05d152e40e"
/>


https://github.com/user-attachments/assets/828964be-9b6e-4496-9361-9e3a2e9aa208

Release Notes:
- N/A
This commit is contained in:
Piotr Osiewicz 2025-07-23 10:28:06 +02:00 • committed by GitHub
parent 7db110f48d
commit 6cd3726a5a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -7401,9 +7401,9 @@ dependencies = [
[[package]] [[package]]
name = "grid" name = "grid"
version = "0.17.0" version = "0.14.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71b01d27060ad58be4663b9e4ac9e2d4806918e8876af8912afbddd1a91d5eaa" checksum = "be136d9dacc2a13cc70bb6c8f902b414fb2641f8db1314637c6b7933411a8f82"
[[package]] [[package]]
name = "group" name = "group"
@ -15958,12 +15958,13 @@ dependencies = [
[[package]] [[package]]
name = "taffy" name = "taffy"
version = "0.8.3" version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7aaef0ac998e6527d6d0d5582f7e43953bb17221ac75bb8eb2fcc2db3396db1c" checksum = "e8b61630cba2afd2c851821add2e1bb1b7851a2436e839ab73b56558b009035e"
dependencies = [ dependencies = [
"arrayvec", "arrayvec",
"grid", "grid",
"num-traits",
"serde", "serde",
"slotmap", "slotmap",
] ]

2
crates/gpui/Cargo.toml
View file

@ -121,7 +121,7 @@ smallvec.workspace = true
smol.workspace = true smol.workspace = true
strum.workspace = true strum.workspace = true
sum_tree.workspace = true sum_tree.workspace = true
taffy = "=0.8.3" taffy = "=0.5.1"
thiserror.workspace = true thiserror.workspace = true
util.workspace = true util.workspace = true
uuid.workspace = true uuid.workspace = true

26
crates/gpui/src/taffy.rs
View file

@ -283,7 +283,7 @@ impl ToTaffy<taffy::style::LengthPercentageAuto> for Length {
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::LengthPercentageAuto { fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::LengthPercentageAuto {
match self { match self {
Length::Definite(length) => length.to_taffy(rem_size), Length::Definite(length) => length.to_taffy(rem_size),
Length::Auto => taffy::prelude::LengthPercentageAuto::auto(), Length::Auto => taffy::prelude::LengthPercentageAuto::Auto,
} }
} }
} }
@ -292,7 +292,7 @@ impl ToTaffy<taffy::style::Dimension> for Length {
fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::Dimension { fn to_taffy(&self, rem_size: Pixels) -> taffy::prelude::Dimension {
match self { match self {
Length::Definite(length) => length.to_taffy(rem_size), Length::Definite(length) => length.to_taffy(rem_size),
Length::Auto => taffy::prelude::Dimension::auto(), Length::Auto => taffy::prelude::Dimension::Auto,
} }
} }
} }
@ -302,14 +302,14 @@ impl ToTaffy<taffy::style::LengthPercentage> for DefiniteLength {
match self { match self {
DefiniteLength::Absolute(length) => match length { DefiniteLength::Absolute(length) => match length {
AbsoluteLength::Pixels(pixels) => { AbsoluteLength::Pixels(pixels) => {
taffy::style::LengthPercentage::length(pixels.into()) taffy::style::LengthPercentage::Length(pixels.into())
} }
AbsoluteLength::Rems(rems) => { AbsoluteLength::Rems(rems) => {
taffy::style::LengthPercentage::length((*rems * rem_size).into()) taffy::style::LengthPercentage::Length((*rems * rem_size).into())
} }
}, },
DefiniteLength::Fraction(fraction) => { DefiniteLength::Fraction(fraction) => {
taffy::style::LengthPercentage::percent(*fraction) taffy::style::LengthPercentage::Percent(*fraction)
} }
} }
} }
@ -320,14 +320,14 @@ impl ToTaffy<taffy::style::LengthPercentageAuto> for DefiniteLength {
match self { match self {
DefiniteLength::Absolute(length) => match length { DefiniteLength::Absolute(length) => match length {
AbsoluteLength::Pixels(pixels) => { AbsoluteLength::Pixels(pixels) => {
taffy::style::LengthPercentageAuto::length(pixels.into()) taffy::style::LengthPercentageAuto::Length(pixels.into())
} }
AbsoluteLength::Rems(rems) => { AbsoluteLength::Rems(rems) => {
taffy::style::LengthPercentageAuto::length((*rems * rem_size).into()) taffy::style::LengthPercentageAuto::Length((*rems * rem_size).into())
} }
}, },
DefiniteLength::Fraction(fraction) => { DefiniteLength::Fraction(fraction) => {
taffy::style::LengthPercentageAuto::percent(*fraction) taffy::style::LengthPercentageAuto::Percent(*fraction)
} }
} }
} }
@ -337,12 +337,12 @@ impl ToTaffy<taffy::style::Dimension> for DefiniteLength {
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::Dimension { fn to_taffy(&self, rem_size: Pixels) -> taffy::style::Dimension {
match self { match self {
DefiniteLength::Absolute(length) => match length { DefiniteLength::Absolute(length) => match length {
AbsoluteLength::Pixels(pixels) => taffy::style::Dimension::length(pixels.into()), AbsoluteLength::Pixels(pixels) => taffy::style::Dimension::Length(pixels.into()),
AbsoluteLength::Rems(rems) => { AbsoluteLength::Rems(rems) => {
taffy::style::Dimension::length((*rems * rem_size).into()) taffy::style::Dimension::Length((*rems * rem_size).into())
} }
}, },
DefiniteLength::Fraction(fraction) => taffy::style::Dimension::percent(*fraction), DefiniteLength::Fraction(fraction) => taffy::style::Dimension::Percent(*fraction),
} }
} }
} }
@ -350,9 +350,9 @@ impl ToTaffy<taffy::style::Dimension> for DefiniteLength {
impl ToTaffy<taffy::style::LengthPercentage> for AbsoluteLength { impl ToTaffy<taffy::style::LengthPercentage> for AbsoluteLength {
fn to_taffy(&self, rem_size: Pixels) -> taffy::style::LengthPercentage { fn to_taffy(&self, rem_size: Pixels) -> taffy::style::LengthPercentage {
match self { match self {
AbsoluteLength::Pixels(pixels) => taffy::style::LengthPercentage::length(pixels.into()), AbsoluteLength::Pixels(pixels) => taffy::style::LengthPercentage::Length(pixels.into()),
AbsoluteLength::Rems(rems) => { AbsoluteLength::Rems(rems) => {
taffy::style::LengthPercentage::length((*rems * rem_size).into()) taffy::style::LengthPercentage::Length((*rems * rem_size).into())
} }
} }
} }