Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

gpui: Bump taffy from 0.10.1 to 0.12.1 (#60721)

Mikayla Maki91fdd55889ab
diff --git a/Cargo.lock b/Cargo.lock
index 76d35e51a5f..56b62212f48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -18274,9 +18274,9 @@ dependencies = [
[[package]]
name = "taffy"
-version = "0.10.1"
+version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aea22054047c16c3f34d3ac473a2170be1424b1115b2a3adcf28cfb067c88859"
+checksum = "73afc801dd6bd47529eaa7c7e90557f107527d1b7c9c7ed7d7803c7b8d0c357f"
dependencies = [
"arrayvec",
"grid",
diff --git a/crates/gpui/Cargo.toml b/crates/gpui/Cargo.toml
index bcf992a5316..63e1814b505 100644
--- a/crates/gpui/Cargo.toml
+++ b/crates/gpui/Cargo.toml
@@ -91,7 +91,7 @@ async-channel.workspace = true
stacksafe.workspace = true
strum.workspace = true
sum_tree.workspace = true
-taffy = "=0.10.1"
+taffy = "=0.12.1"
thiserror.workspace = true
gpui_util.workspace = true
hdrhistogram = { workspace = true, optional = true }
diff --git a/crates/gpui/src/style.rs b/crates/gpui/src/style.rs
index 292b8063479..0908a7ea4d3 100644
--- a/crates/gpui/src/style.rs
+++ b/crates/gpui/src/style.rs
@@ -1245,13 +1245,13 @@ pub enum Position {
impl From<AlignItems> for taffy::style::AlignItems {
fn from(value: AlignItems) -> Self {
match value {
- AlignItems::Start => Self::Start,
- AlignItems::End => Self::End,
- AlignItems::FlexStart => Self::FlexStart,
- AlignItems::FlexEnd => Self::FlexEnd,
- AlignItems::Center => Self::Center,
- AlignItems::Baseline => Self::Baseline,
- AlignItems::Stretch => Self::Stretch,
+ AlignItems::Start => Self::START,
+ AlignItems::End => Self::END,
+ AlignItems::FlexStart => Self::FLEX_START,
+ AlignItems::FlexEnd => Self::FLEX_END,
+ AlignItems::Center => Self::CENTER,
+ AlignItems::Baseline => Self::BASELINE,
+ AlignItems::Stretch => Self::STRETCH,
}
}
}
@@ -1259,15 +1259,15 @@ impl From<AlignItems> for taffy::style::AlignItems {
impl From<AlignContent> for taffy::style::AlignContent {
fn from(value: AlignContent) -> Self {
match value {
- AlignContent::Start => Self::Start,
- AlignContent::End => Self::End,
- AlignContent::FlexStart => Self::FlexStart,
- AlignContent::FlexEnd => Self::FlexEnd,
- AlignContent::Center => Self::Center,
- AlignContent::Stretch => Self::Stretch,
- AlignContent::SpaceBetween => Self::SpaceBetween,
- AlignContent::SpaceEvenly => Self::SpaceEvenly,
- AlignContent::SpaceAround => Self::SpaceAround,
+ AlignContent::Start => Self::START,
+ AlignContent::End => Self::END,
+ AlignContent::FlexStart => Self::FLEX_START,
+ AlignContent::FlexEnd => Self::FLEX_END,
+ AlignContent::Center => Self::CENTER,
+ AlignContent::Stretch => Self::STRETCH,
+ AlignContent::SpaceBetween => Self::SPACE_BETWEEN,
+ AlignContent::SpaceEvenly => Self::SPACE_EVENLY,
+ AlignContent::SpaceAround => Self::SPACE_AROUND,
}
}
}