From f8a9300ef65aabf2a1f95601e0a244f9bed3a753 Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:33 +0200 Subject: [PATCH 1/7] New approach, less in scope --- src/flexbox.rs | 2 +- src/geometry.rs | 23 +++++++++++++++++++++-- src/style.rs | 31 ++++++++++++++++++++++--------- tests/simple_child.rs | 27 +++++++++++++++++++++------ 4 files changed, 65 insertions(+), 18 deletions(-) diff --git a/src/flexbox.rs b/src/flexbox.rs index a56526a92..239e40932 100644 --- a/src/flexbox.rs +++ b/src/flexbox.rs @@ -4,7 +4,7 @@ use core::f32; use crate::forest::{Forest, NodeData}; -use crate::geometry::{Point, Rect, Size}; +use crate::geometry::{Point, Rect, Resolve, Size}; use crate::layout::{Cache, Layout}; use crate::math::MaybeMath; use crate::node::{MeasureFunc, NodeId}; diff --git a/src/geometry.rs b/src/geometry.rs index 3c6abd1fe..d3aed6a2a 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -167,6 +167,12 @@ impl Size<()> { } } +impl Default for Size> { + fn default() -> Self { + Self { width: Default::default(), height: Default::default() } + } +} + impl Size { /// Applies the function `f` to both the width and height /// @@ -231,13 +237,26 @@ impl Size { } } -impl Size { +pub(crate) trait Resolve { + fn resolve(&self, parent: T) -> T; +} + +impl Resolve>> for Size { /// Converts any `parent`-relative values for size into an absolute size - pub(crate) fn resolve(&self, parent: Size>) -> Size> { + fn resolve(&self, parent: Size>) -> Size> { Size { width: self.width.resolve(parent.width), height: self.height.resolve(parent.height) } } } +impl Resolve>> for Size> { + fn resolve(&self, parent: Size>) -> Size> { + Size { + width: self.width.and_then(|w| w.resolve(parent.width)), + height: self.height.and_then(|h| h.resolve(parent.height)), + } + } +} + /// A 2-dimensional coordinate. /// /// When used in association with a [`Rect`], represents the bottom-left corner. diff --git a/src/style.rs b/src/style.rs index 2db95c15b..2041002c0 100644 --- a/src/style.rs +++ b/src/style.rs @@ -1,6 +1,6 @@ //! A representation of [CSS layout properties](https://css-tricks.com/snippets/css/a-guide-to-flexbox/) in Rust, used for flexbox layout -use crate::geometry::{Rect, Size}; +use crate::geometry::{Rect, Resolve, Size}; /// How [`Nodes`](crate::node::Node) are aligned relative to the cross axis /// @@ -247,12 +247,10 @@ impl Default for FlexWrap { /// A unit of linear measurement /// /// This is commonly combined with [`Rect`], [`Point`](crate::geometry::Point) and [`Size`]. -/// The default value is [`Dimension::Undefined`]. +/// The default value is [`Dimension::Auto`]. #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum Dimension { - /// The dimension is not given - Undefined, /// The dimension should be automatically computed Auto, /// The dimension is stored in [points](https://en.wikipedia.org/wiki/Point_(typography)) @@ -265,22 +263,37 @@ pub enum Dimension { impl Default for Dimension { fn default() -> Self { - Self::Undefined + Self::Auto } } -impl Dimension { +impl Resolve> for Dimension { /// Converts the given [`Dimension`] into a concrete value of points - pub(crate) fn resolve(self, parent_dim: Option) -> Option { + fn resolve(&self, parent_dim: Option) -> Option { match self { - Dimension::Points(points) => Some(points), + Dimension::Points(points) => Some(*points), // parent_dim * percent Dimension::Percent(percent) => parent_dim.map(|dim| dim * percent), _ => None, } } +} + +// impl Resolve for Option + +impl Dimension { + /// Converts the given [`Dimension`] into a concrete value of points + // pub(crate) fn resolve(self, parent_dim: Option) -> Option { + // match self { + // Dimension::Points(points) => Some(points), + // // parent_dim * percent + // Dimension::Percent(percent) => parent_dim.map(|dim| dim * percent), + // _ => None, + // } + // } /// Is this value defined? + /// TODO: Auto does not count as defined in that case? pub(crate) fn is_defined(self) -> bool { matches!(self, Dimension::Points(_) | Dimension::Percent(_)) } @@ -352,7 +365,7 @@ pub struct FlexboxLayout { pub flex_basis: Dimension, /// Sets the initial size of the item // TODO: why does this exist as distinct from flex_basis? How do they interact? - pub size: Size, + pub size: Size>, /// Controls the minimum size of the item pub min_size: Size, /// Controls the maximum size of the item diff --git a/tests/simple_child.rs b/tests/simple_child.rs index 61a4f9fb9..38bac94fb 100644 --- a/tests/simple_child.rs +++ b/tests/simple_child.rs @@ -7,7 +7,10 @@ fn simple_child() { .new_with_children( taffy::style::FlexboxLayout { align_self: taffy::prelude::AlignSelf::Center, - size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Points(10f32)), + height: Some(Dimension::Points(10f32)), + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn simple_child() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Points(10f32)), + height: Some(Dimension::Points(10f32)), + }, ..Default::default() }, &[node0_0], @@ -26,7 +32,10 @@ fn simple_child() { .new_with_children( taffy::style::FlexboxLayout { align_self: taffy::prelude::AlignSelf::Center, - size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Points(10f32)), + height: Some(Dimension::Points(10f32)), + }, ..Default::default() }, &[], @@ -36,7 +45,10 @@ fn simple_child() { .new_with_children( taffy::style::FlexboxLayout { align_self: taffy::prelude::AlignSelf::Center, - size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Points(10f32)), + height: Some(Dimension::Points(10f32)), + }, ..Default::default() }, &[], @@ -45,7 +57,7 @@ fn simple_child() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Dimension::Undefined, height: Dimension::Undefined }, + size: taffy::geometry::Size { width: None, height: None }, ..Default::default() }, &[node1_0, node1_1], @@ -54,7 +66,10 @@ fn simple_child() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Dimension::Percent(100.0), height: Dimension::Percent(100.0) }, + size: taffy::geometry::Size { + width: Some(Dimension::Percent(100.0)), + height: Some(Dimension::Percent(100.0)), + }, ..Default::default() }, &[node0, node1], From 7a7cf7c502566214c5810c7ad3bafe35df97d9d7 Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:33 +0200 Subject: [PATCH 2/7] More work --- benches/complex.rs | 32 ++++++++++++++++---------------- src/flexbox.rs | 9 +++++---- src/style.rs | 2 +- tests/measure.rs | 5 ++++- tests/simple_child.rs | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/benches/complex.rs b/benches/complex.rs index a375b586e..82e328ff4 100644 --- a/benches/complex.rs +++ b/benches/complex.rs @@ -5,8 +5,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -17,8 +17,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -30,8 +30,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -42,8 +42,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -62,8 +62,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -74,8 +74,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -87,8 +87,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, @@ -99,8 +99,8 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10.0), - height: taffy::style::Dimension::Points(10.0), + width: Some(taffy::style::Dimension::Points(10.0)), + height: Some(taffy::style::Dimension::Points(10.0)), }, ..Default::default() }, diff --git a/src/flexbox.rs b/src/flexbox.rs index 239e40932..55918be34 100644 --- a/src/flexbox.rs +++ b/src/flexbox.rs @@ -928,7 +928,7 @@ impl Forest { if child_style.align_self(&self.nodes[node].style) == AlignSelf::Baseline && child_style.cross_margin_start(constants.dir) != Dimension::Auto && child_style.cross_margin_end(constants.dir) != Dimension::Auto - && child_style.cross_size(constants.dir) == Dimension::Auto + && child_style.cross_size(constants.dir) == Some(Dimension::Auto) { max_baseline - child.baseline + child.hypothetical_outer_size.cross(constants.dir) } else { @@ -992,7 +992,7 @@ impl Forest { if child_style.align_self(&self.nodes[node].style) == AlignSelf::Stretch && child_style.cross_margin_start(constants.dir) != Dimension::Auto && child_style.cross_margin_end(constants.dir) != Dimension::Auto - && child_style.cross_size(constants.dir) == Dimension::Auto + && child_style.cross_size(constants.dir) == Some(Dimension::Auto) { (line_cross_size - child.margin.cross_axis_sum(constants.dir)) .maybe_max(child.min_size.cross(constants.dir)) @@ -1439,7 +1439,8 @@ impl Forest { let mut width = child_style .size .width - .resolve(container_width) + .and_then(|w| w.resolve(container_width)) + // .resolve(container_width) .maybe_max(child_style.min_size.width.resolve(container_width)) .maybe_min(child_style.max_size.width.resolve(container_width)); @@ -1450,7 +1451,7 @@ impl Forest { let mut height: Option = child_style .size .height - .resolve(container_height) + .and_then(|h| h.resolve(container_height)) .maybe_max(child_style.min_size.height.resolve(container_height)) .maybe_min(child_style.max_size.height.resolve(container_height)); diff --git a/src/style.rs b/src/style.rs index 2041002c0..57f38a0a2 100644 --- a/src/style.rs +++ b/src/style.rs @@ -440,7 +440,7 @@ impl FlexboxLayout { } /// If the `direction` is row-oriented, the height. Otherwise the width - pub(crate) fn cross_size(&self, direction: FlexDirection) -> Dimension { + pub(crate) fn cross_size(&self, direction: FlexDirection) -> Option { if direction.is_row() { self.size.height } else { diff --git a/tests/measure.rs b/tests/measure.rs index 1dfea23b6..0716eb1ae 100644 --- a/tests/measure.rs +++ b/tests/measure.rs @@ -61,7 +61,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50.0)), + ..Default::default() + }, ..Default::default() }, &[child], diff --git a/tests/simple_child.rs b/tests/simple_child.rs index 38bac94fb..930a9aee3 100644 --- a/tests/simple_child.rs +++ b/tests/simple_child.rs @@ -57,7 +57,7 @@ fn simple_child() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: None, height: None }, + size: taffy::geometry::Size { width: Some(Dimension::Auto), height: Some(Dimension::Auto) }, ..Default::default() }, &[node1_0, node1_1], From d1b9f7519ce79cb11df1de9e46073361eac5ae3d Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:34 +0200 Subject: [PATCH 3/7] Generating new tests --- ..._align_items_and_justify_content_center.rs | 8 ++--- ...tify_content_center_and_bottom_position.rs | 8 ++--- ...ustify_content_center_and_left_position.rs | 8 ++--- ...stify_content_center_and_right_position.rs | 8 ++--- ...justify_content_center_and_top_position.rs | 8 ++--- ...lign_items_and_justify_content_flex_end.rs | 8 ++--- .../absolute_layout_align_items_center.rs | 8 ++--- ...layout_align_items_center_on_child_only.rs | 8 ++--- .../generated/absolute_layout_child_order.rs | 16 +++++----- ...layout_in_wrap_reverse_column_container.rs | 8 ++--- ..._wrap_reverse_column_container_flex_end.rs | 8 ++--- ...te_layout_in_wrap_reverse_row_container.rs | 8 ++--- ..._in_wrap_reverse_row_container_flex_end.rs | 8 ++--- .../absolute_layout_justify_content_center.rs | 8 ++--- benches/generated/absolute_layout_no_size.rs | 4 +-- ...ercentage_bottom_based_on_parent_height.rs | 17 ++++++----- .../absolute_layout_start_top_end_bottom.rs | 4 +-- ...absolute_layout_width_height_end_bottom.rs | 8 ++--- .../absolute_layout_width_height_start_top.rs | 8 ++--- ...ayout_width_height_start_top_end_bottom.rs | 8 ++--- .../absolute_layout_within_border.rs | 20 ++++++------- benches/generated/align_baseline.rs | 12 ++++---- .../align_baseline_child_multiline.rs | 30 +++++++++++-------- .../generated/align_baseline_nested_child.rs | 16 +++++----- ...ign_center_should_size_based_on_content.rs | 8 ++--- ...lign_flex_start_with_shrinking_children.rs | 4 +-- ...rt_with_shrinking_children_with_stretch.rs | 4 +-- ...ign_flex_start_with_stretching_children.rs | 4 +-- benches/generated/align_items_center.rs | 8 ++--- ...er_child_with_margin_bigger_than_parent.rs | 8 ++--- ...child_without_margin_bigger_than_parent.rs | 8 ++--- .../align_items_center_with_child_margin.rs | 8 ++--- .../align_items_center_with_child_top.rs | 8 ++--- benches/generated/align_items_flex_end.rs | 8 ++--- ...nd_child_with_margin_bigger_than_parent.rs | 8 ++--- ...child_without_margin_bigger_than_parent.rs | 8 ++--- benches/generated/align_items_flex_start.rs | 8 ++--- benches/generated/align_items_min_max.rs | 9 ++++-- benches/generated/align_items_stretch.rs | 9 ++++-- benches/generated/align_self_baseline.rs | 16 +++++----- benches/generated/align_self_center.rs | 8 ++--- benches/generated/align_self_flex_end.rs | 8 ++--- ...align_self_flex_end_override_flex_start.rs | 8 ++--- benches/generated/align_self_flex_start.rs | 8 ++--- ...lign_strech_should_size_based_on_parent.rs | 8 ++--- benches/generated/border_center_child.rs | 8 ++--- benches/generated/border_flex_child.rs | 9 ++++-- benches/generated/border_stretch_child.rs | 9 ++++-- .../generated/child_min_max_width_flexing.rs | 4 +-- .../generated/container_with_unsized_child.rs | 4 +-- benches/generated/display_none.rs | 4 +-- benches/generated/display_none_fixed_size.rs | 8 ++--- benches/generated/display_none_with_child.rs | 9 ++++-- benches/generated/display_none_with_margin.rs | 8 ++--- .../generated/display_none_with_position.rs | 4 +-- ...x_basis_and_main_dimen_set_when_flexing.rs | 13 ++++---- .../generated/flex_basis_flex_grow_column.rs | 4 +-- benches/generated/flex_basis_flex_grow_row.rs | 4 +-- .../flex_basis_flex_shrink_column.rs | 4 +-- .../generated/flex_basis_flex_shrink_row.rs | 4 +-- .../flex_basis_larger_than_content_column.rs | 9 ++++-- .../flex_basis_larger_than_content_row.rs | 9 ++++-- .../flex_basis_overrides_main_size.rs | 19 ++++++++---- ..._then_content_with_flex_grow_large_size.rs | 13 ++++---- .../flex_basis_smaller_than_content_column.rs | 9 ++++-- .../flex_basis_smaller_than_content_row.rs | 9 ++++-- ...ex_basis_smaller_than_main_dimen_column.rs | 9 ++++-- .../flex_basis_smaller_than_main_dimen_row.rs | 9 ++++-- ..._then_content_with_flex_grow_large_size.rs | 13 ++++---- ..._then_content_with_flex_grow_small_size.rs | 13 ++++---- ...ontent_with_flex_grow_unconstraint_size.rs | 8 ++--- ..._content_with_flex_grow_very_large_size.rs | 13 ++++---- .../flex_basis_unconstraint_column.rs | 5 +++- .../generated/flex_basis_unconstraint_row.rs | 5 +++- benches/generated/flex_direction_column.rs | 19 ++++++++---- .../flex_direction_column_no_height.rs | 20 ++++++++++--- .../flex_direction_column_reverse.rs | 19 ++++++++---- benches/generated/flex_direction_row.rs | 19 ++++++++---- .../generated/flex_direction_row_no_width.rs | 20 ++++++++++--- .../generated/flex_direction_row_reverse.rs | 19 ++++++++---- benches/generated/flex_grow_child.rs | 5 +++- .../flex_grow_flex_basis_percent_min_max.rs | 14 ++++++--- .../generated/flex_grow_height_maximized.rs | 9 ++++-- .../flex_grow_in_at_most_container.rs | 4 +-- .../flex_grow_less_than_factor_one.rs | 4 +-- benches/generated/flex_grow_root_minimized.rs | 10 +++++-- benches/generated/flex_grow_shrink_at_most.rs | 4 +-- benches/generated/flex_grow_to_min.rs | 10 +++++-- ...flex_grow_within_constrained_max_column.rs | 10 +++++-- .../flex_grow_within_constrained_max_row.rs | 15 ++++++++-- .../flex_grow_within_constrained_max_width.rs | 9 ++++-- ...flex_grow_within_constrained_min_column.rs | 5 +++- ..._grow_within_constrained_min_max_column.rs | 5 +++- .../flex_grow_within_constrained_min_row.rs | 10 +++++-- .../generated/flex_grow_within_max_width.rs | 9 ++++-- benches/generated/flex_root_ignored.rs | 10 +++++-- ...ex_shrink_by_outer_margin_with_max_size.rs | 9 ++++-- ...flex_grow_child_flex_shrink_other_child.rs | 12 ++++---- .../generated/flex_shrink_flex_grow_row.rs | 12 ++++---- benches/generated/flex_shrink_to_zero.rs | 17 ++++++----- .../flex_wrap_align_stretch_fits_one_row.rs | 14 ++++++--- ...ren_with_min_main_overriding_flex_basis.rs | 15 ++++++++-- .../flex_wrap_wrap_to_child_height.rs | 13 ++++---- .../justify_content_column_center.rs | 19 ++++++++---- .../justify_content_column_flex_end.rs | 19 ++++++++---- .../justify_content_column_flex_start.rs | 19 ++++++++---- ...ent_column_min_height_and_margin_bottom.rs | 4 +-- ...ontent_column_min_height_and_margin_top.rs | 4 +-- .../justify_content_column_space_around.rs | 19 ++++++++---- .../justify_content_column_space_between.rs | 19 ++++++++---- .../justify_content_column_space_evenly.rs | 19 ++++++++---- benches/generated/justify_content_min_max.rs | 9 ++++-- ...padding_child_width_greater_than_parent.rs | 8 ++--- ...h_padding_child_width_lower_than_parent.rs | 8 ++--- .../justify_content_overflow_min_max.rs | 12 ++++---- .../generated/justify_content_row_center.rs | 19 ++++++++---- .../generated/justify_content_row_flex_end.rs | 19 ++++++++---- .../justify_content_row_flex_start.rs | 19 ++++++++---- ...ustify_content_row_max_width_and_margin.rs | 9 ++++-- ...ustify_content_row_min_width_and_margin.rs | 4 +-- .../justify_content_row_space_around.rs | 19 ++++++++---- .../justify_content_row_space_between.rs | 19 ++++++++---- .../justify_content_row_space_evenly.rs | 19 ++++++++---- benches/generated/margin_and_flex_column.rs | 4 +-- benches/generated/margin_and_flex_row.rs | 4 +-- .../generated/margin_and_stretch_column.rs | 4 +-- benches/generated/margin_and_stretch_row.rs | 4 +-- benches/generated/margin_auto_bottom.rs | 12 ++++---- .../generated/margin_auto_bottom_and_top.rs | 12 ++++---- ...rgin_auto_bottom_and_top_justify_center.rs | 12 ++++---- benches/generated/margin_auto_left.rs | 12 ++++---- .../generated/margin_auto_left_and_right.rs | 12 ++++---- .../margin_auto_left_and_right_column.rs | 12 ++++---- ...n_auto_left_and_right_column_and_center.rs | 12 ++++---- .../margin_auto_left_and_right_strech.rs | 12 ++++---- ...rgin_auto_left_child_bigger_than_parent.rs | 8 ++--- ...left_fix_right_child_bigger_than_parent.rs | 8 ++--- ...uto_left_right_child_bigger_than_parent.rs | 8 ++--- .../margin_auto_left_stretching_child.rs | 8 ++--- .../margin_auto_mutiple_children_column.rs | 16 +++++----- .../margin_auto_mutiple_children_row.rs | 16 +++++----- benches/generated/margin_auto_right.rs | 12 ++++---- benches/generated/margin_auto_top.rs | 12 ++++---- .../margin_auto_top_and_bottom_strech.rs | 12 ++++---- .../margin_auto_top_stretching_child.rs | 8 ++--- benches/generated/margin_bottom.rs | 9 ++++-- ...eft_auto_right_child_bigger_than_parent.rs | 8 ++--- benches/generated/margin_left.rs | 9 ++++-- benches/generated/margin_right.rs | 9 ++++-- ...margin_should_not_be_part_of_max_height.rs | 8 ++--- .../margin_should_not_be_part_of_max_width.rs | 8 ++--- benches/generated/margin_top.rs | 9 ++++-- .../generated/margin_with_sibling_column.rs | 4 +-- benches/generated/margin_with_sibling_row.rs | 4 +-- benches/generated/max_height.rs | 9 ++++-- .../generated/max_height_overrides_height.rs | 5 +++- .../max_height_overrides_height_on_root.rs | 5 +++- benches/generated/max_width.rs | 9 ++++-- .../generated/max_width_overrides_width.rs | 5 +++- .../max_width_overrides_width_on_root.rs | 5 +++- benches/generated/min_height.rs | 4 +-- .../generated/min_height_overrides_height.rs | 5 +++- .../min_height_overrides_height_on_root.rs | 5 +++- .../min_max_percent_no_width_height.rs | 4 +-- benches/generated/min_width.rs | 4 +-- .../generated/min_width_overrides_width.rs | 5 +++- .../min_width_overrides_width_on_root.rs | 5 +++- benches/generated/nested_overflowing_child.rs | 8 ++--- ..._overflowing_child_in_constraint_parent.rs | 12 ++++---- benches/generated/overflow_cross_axis.rs | 8 ++--- benches/generated/overflow_main_axis.rs | 9 ++++-- benches/generated/padding_align_end_child.rs | 8 ++--- benches/generated/padding_center_child.rs | 8 ++--- benches/generated/padding_flex_child.rs | 9 ++++-- benches/generated/padding_stretch_child.rs | 9 ++++-- ...rent_wrap_child_size_overflowing_parent.rs | 13 ++++---- .../generated/percent_absolute_position.rs | 18 +++++++---- benches/generated/percent_within_flex_grow.rs | 19 ++++++++---- .../generated/percentage_absolute_position.rs | 8 ++--- ...centage_container_in_wrapping_container.rs | 17 ++++++----- benches/generated/percentage_flex_basis.rs | 4 +-- .../generated/percentage_flex_basis_cross.rs | 4 +-- .../percentage_flex_basis_cross_max_height.rs | 4 +-- .../percentage_flex_basis_cross_max_width.rs | 4 +-- .../percentage_flex_basis_cross_min_height.rs | 4 +-- .../percentage_flex_basis_cross_min_width.rs | 4 +-- .../percentage_flex_basis_main_max_height.rs | 4 +-- .../percentage_flex_basis_main_max_width.rs | 4 +-- .../percentage_flex_basis_main_min_width.rs | 4 +-- ...in_should_calculate_based_only_on_width.rs | 8 ++--- ...th_padding_margin_and_percentage_values.rs | 14 ++++++--- ...ng_should_calculate_based_only_on_width.rs | 8 ++--- .../percentage_position_bottom_right.rs | 8 ++--- .../generated/percentage_position_left_top.rs | 8 ++--- ...centage_size_based_on_parent_inner_size.rs | 8 ++--- .../percentage_size_of_flex_basis.rs | 9 ++++-- benches/generated/percentage_width_height.rs | 8 ++--- ...tage_width_height_undefined_parent_size.rs | 4 +-- ...tive_position_should_not_nudge_siblings.rs | 14 ++++++--- ..._basis_flex_grow_row_prime_number_width.rs | 4 +-- ...g_flex_basis_flex_grow_row_width_of_100.rs | 4 +-- .../rounding_flex_basis_flex_shrink_row.rs | 4 +-- ...rounding_flex_basis_overrides_main_size.rs | 19 ++++++++---- .../generated/rounding_fractial_input_1.rs | 19 ++++++++---- .../generated/rounding_fractial_input_2.rs | 19 ++++++++---- .../generated/rounding_fractial_input_3.rs | 19 ++++++++---- .../generated/rounding_fractial_input_4.rs | 19 ++++++++---- benches/generated/rounding_total_fractial.rs | 19 ++++++++---- .../rounding_total_fractial_nested.rs | 29 +++++++++++++----- benches/generated/size_defined_by_child.rs | 4 +-- .../size_defined_by_child_with_border.rs | 4 +-- .../size_defined_by_child_with_padding.rs | 4 +-- .../generated/size_defined_by_grand_child.rs | 4 +-- ..._then_content_with_flex_grow_large_size.rs | 23 +++++++++----- ..._then_content_with_flex_grow_small_size.rs | 23 +++++++++----- ...ontent_with_flex_grow_unconstraint_size.rs | 18 +++++++---- ..._content_with_flex_grow_very_large_size.rs | 23 +++++++++----- benches/generated/wrap_column.rs | 20 ++++++------- ..._nodes_with_content_sizing_margin_cross.rs | 17 ++++++----- ..._with_content_sizing_overflowing_margin.rs | 17 ++++++----- benches/generated/wrap_reverse_column.rs | 20 ++++++------- .../wrap_reverse_column_fixed_size.rs | 24 +++++++-------- benches/generated/wrap_reverse_row.rs | 21 +++++++------ .../wrap_reverse_row_align_content_center.rs | 25 +++++++++------- ...ap_reverse_row_align_content_flex_start.rs | 25 +++++++++------- ..._reverse_row_align_content_space_around.rs | 25 +++++++++------- .../wrap_reverse_row_align_content_stretch.rs | 25 +++++++++------- ..._reverse_row_single_line_different_size.rs | 25 +++++++++------- benches/generated/wrap_row.rs | 21 +++++++------ .../generated/wrap_row_align_items_center.rs | 21 +++++++------ .../wrap_row_align_items_flex_end.rs | 21 +++++++------ .../generated/wrapped_column_max_height.rs | 16 +++++----- .../wrapped_column_max_height_flex.rs | 16 +++++----- .../wrapped_row_within_align_items_center.rs | 12 ++++---- ...wrapped_row_within_align_items_flex_end.rs | 12 ++++---- ...apped_row_within_align_items_flex_start.rs | 12 ++++---- ..._align_items_and_justify_content_center.rs | 8 ++--- ...tify_content_center_and_bottom_position.rs | 8 ++--- ...ustify_content_center_and_left_position.rs | 8 ++--- ...stify_content_center_and_right_position.rs | 8 ++--- ...justify_content_center_and_top_position.rs | 8 ++--- ...lign_items_and_justify_content_flex_end.rs | 8 ++--- .../absolute_layout_align_items_center.rs | 8 ++--- ...layout_align_items_center_on_child_only.rs | 8 ++--- .../generated/absolute_layout_child_order.rs | 16 +++++----- ...layout_in_wrap_reverse_column_container.rs | 8 ++--- ..._wrap_reverse_column_container_flex_end.rs | 8 ++--- ...te_layout_in_wrap_reverse_row_container.rs | 8 ++--- ..._in_wrap_reverse_row_container_flex_end.rs | 8 ++--- .../absolute_layout_justify_content_center.rs | 8 ++--- tests/generated/absolute_layout_no_size.rs | 4 +-- ...ercentage_bottom_based_on_parent_height.rs | 17 ++++++----- .../absolute_layout_start_top_end_bottom.rs | 4 +-- ...absolute_layout_width_height_end_bottom.rs | 8 ++--- .../absolute_layout_width_height_start_top.rs | 8 ++--- ...ayout_width_height_start_top_end_bottom.rs | 8 ++--- .../absolute_layout_within_border.rs | 20 ++++++------- tests/generated/align_baseline.rs | 12 ++++---- .../align_baseline_child_multiline.rs | 30 +++++++++++-------- .../generated/align_baseline_nested_child.rs | 16 +++++----- ...ign_center_should_size_based_on_content.rs | 8 ++--- ...lign_flex_start_with_shrinking_children.rs | 4 +-- ...rt_with_shrinking_children_with_stretch.rs | 4 +-- ...ign_flex_start_with_stretching_children.rs | 4 +-- tests/generated/align_items_center.rs | 8 ++--- ...er_child_with_margin_bigger_than_parent.rs | 8 ++--- ...child_without_margin_bigger_than_parent.rs | 8 ++--- .../align_items_center_with_child_margin.rs | 8 ++--- .../align_items_center_with_child_top.rs | 8 ++--- tests/generated/align_items_flex_end.rs | 8 ++--- ...nd_child_with_margin_bigger_than_parent.rs | 8 ++--- ...child_without_margin_bigger_than_parent.rs | 8 ++--- tests/generated/align_items_flex_start.rs | 8 ++--- tests/generated/align_items_min_max.rs | 9 ++++-- tests/generated/align_items_stretch.rs | 9 ++++-- tests/generated/align_self_baseline.rs | 16 +++++----- tests/generated/align_self_center.rs | 8 ++--- tests/generated/align_self_flex_end.rs | 8 ++--- ...align_self_flex_end_override_flex_start.rs | 8 ++--- tests/generated/align_self_flex_start.rs | 8 ++--- ...lign_strech_should_size_based_on_parent.rs | 8 ++--- tests/generated/border_center_child.rs | 8 ++--- tests/generated/border_flex_child.rs | 9 ++++-- tests/generated/border_stretch_child.rs | 9 ++++-- .../generated/child_min_max_width_flexing.rs | 4 +-- .../generated/container_with_unsized_child.rs | 4 +-- tests/generated/display_none.rs | 4 +-- tests/generated/display_none_fixed_size.rs | 8 ++--- tests/generated/display_none_with_child.rs | 9 ++++-- tests/generated/display_none_with_margin.rs | 8 ++--- tests/generated/display_none_with_position.rs | 4 +-- ...x_basis_and_main_dimen_set_when_flexing.rs | 13 ++++---- .../generated/flex_basis_flex_grow_column.rs | 4 +-- tests/generated/flex_basis_flex_grow_row.rs | 4 +-- .../flex_basis_flex_shrink_column.rs | 4 +-- tests/generated/flex_basis_flex_shrink_row.rs | 4 +-- .../flex_basis_larger_than_content_column.rs | 9 ++++-- .../flex_basis_larger_than_content_row.rs | 9 ++++-- .../flex_basis_overrides_main_size.rs | 19 ++++++++---- ..._then_content_with_flex_grow_large_size.rs | 13 ++++---- .../flex_basis_smaller_than_content_column.rs | 9 ++++-- .../flex_basis_smaller_than_content_row.rs | 9 ++++-- ...ex_basis_smaller_than_main_dimen_column.rs | 9 ++++-- .../flex_basis_smaller_than_main_dimen_row.rs | 9 ++++-- ..._then_content_with_flex_grow_large_size.rs | 13 ++++---- ..._then_content_with_flex_grow_small_size.rs | 13 ++++---- ...ontent_with_flex_grow_unconstraint_size.rs | 8 ++--- ..._content_with_flex_grow_very_large_size.rs | 13 ++++---- .../flex_basis_unconstraint_column.rs | 5 +++- .../generated/flex_basis_unconstraint_row.rs | 5 +++- tests/generated/flex_direction_column.rs | 19 ++++++++---- .../flex_direction_column_no_height.rs | 20 ++++++++++--- .../flex_direction_column_reverse.rs | 19 ++++++++---- tests/generated/flex_direction_row.rs | 19 ++++++++---- .../generated/flex_direction_row_no_width.rs | 20 ++++++++++--- tests/generated/flex_direction_row_reverse.rs | 19 ++++++++---- tests/generated/flex_grow_child.rs | 5 +++- .../flex_grow_flex_basis_percent_min_max.rs | 14 ++++++--- tests/generated/flex_grow_height_maximized.rs | 9 ++++-- .../flex_grow_in_at_most_container.rs | 4 +-- .../flex_grow_less_than_factor_one.rs | 4 +-- tests/generated/flex_grow_root_minimized.rs | 10 +++++-- tests/generated/flex_grow_shrink_at_most.rs | 4 +-- tests/generated/flex_grow_to_min.rs | 10 +++++-- ...flex_grow_within_constrained_max_column.rs | 10 +++++-- .../flex_grow_within_constrained_max_row.rs | 15 ++++++++-- .../flex_grow_within_constrained_max_width.rs | 9 ++++-- ...flex_grow_within_constrained_min_column.rs | 5 +++- ..._grow_within_constrained_min_max_column.rs | 5 +++- .../flex_grow_within_constrained_min_row.rs | 10 +++++-- tests/generated/flex_grow_within_max_width.rs | 9 ++++-- tests/generated/flex_root_ignored.rs | 10 +++++-- ...ex_shrink_by_outer_margin_with_max_size.rs | 9 ++++-- ...flex_grow_child_flex_shrink_other_child.rs | 12 ++++---- tests/generated/flex_shrink_flex_grow_row.rs | 12 ++++---- tests/generated/flex_shrink_to_zero.rs | 17 ++++++----- .../flex_wrap_align_stretch_fits_one_row.rs | 14 ++++++--- ...ren_with_min_main_overriding_flex_basis.rs | 15 ++++++++-- .../flex_wrap_wrap_to_child_height.rs | 13 ++++---- .../justify_content_column_center.rs | 19 ++++++++---- .../justify_content_column_flex_end.rs | 19 ++++++++---- .../justify_content_column_flex_start.rs | 19 ++++++++---- ...ent_column_min_height_and_margin_bottom.rs | 4 +-- ...ontent_column_min_height_and_margin_top.rs | 4 +-- .../justify_content_column_space_around.rs | 19 ++++++++---- .../justify_content_column_space_between.rs | 19 ++++++++---- .../justify_content_column_space_evenly.rs | 19 ++++++++---- tests/generated/justify_content_min_max.rs | 9 ++++-- ...padding_child_width_greater_than_parent.rs | 8 ++--- ...h_padding_child_width_lower_than_parent.rs | 8 ++--- .../justify_content_overflow_min_max.rs | 12 ++++---- tests/generated/justify_content_row_center.rs | 19 ++++++++---- .../generated/justify_content_row_flex_end.rs | 19 ++++++++---- .../justify_content_row_flex_start.rs | 19 ++++++++---- ...ustify_content_row_max_width_and_margin.rs | 9 ++++-- ...ustify_content_row_min_width_and_margin.rs | 4 +-- .../justify_content_row_space_around.rs | 19 ++++++++---- .../justify_content_row_space_between.rs | 19 ++++++++---- .../justify_content_row_space_evenly.rs | 19 ++++++++---- tests/generated/margin_and_flex_column.rs | 4 +-- tests/generated/margin_and_flex_row.rs | 4 +-- tests/generated/margin_and_stretch_column.rs | 4 +-- tests/generated/margin_and_stretch_row.rs | 4 +-- tests/generated/margin_auto_bottom.rs | 12 ++++---- tests/generated/margin_auto_bottom_and_top.rs | 12 ++++---- ...rgin_auto_bottom_and_top_justify_center.rs | 12 ++++---- tests/generated/margin_auto_left.rs | 12 ++++---- tests/generated/margin_auto_left_and_right.rs | 12 ++++---- .../margin_auto_left_and_right_column.rs | 12 ++++---- ...n_auto_left_and_right_column_and_center.rs | 12 ++++---- .../margin_auto_left_and_right_strech.rs | 12 ++++---- ...rgin_auto_left_child_bigger_than_parent.rs | 8 ++--- ...left_fix_right_child_bigger_than_parent.rs | 8 ++--- ...uto_left_right_child_bigger_than_parent.rs | 8 ++--- .../margin_auto_left_stretching_child.rs | 8 ++--- .../margin_auto_mutiple_children_column.rs | 16 +++++----- .../margin_auto_mutiple_children_row.rs | 16 +++++----- tests/generated/margin_auto_right.rs | 12 ++++---- tests/generated/margin_auto_top.rs | 12 ++++---- .../margin_auto_top_and_bottom_strech.rs | 12 ++++---- .../margin_auto_top_stretching_child.rs | 8 ++--- tests/generated/margin_bottom.rs | 9 ++++-- ...eft_auto_right_child_bigger_than_parent.rs | 8 ++--- tests/generated/margin_left.rs | 9 ++++-- tests/generated/margin_right.rs | 9 ++++-- ...margin_should_not_be_part_of_max_height.rs | 8 ++--- .../margin_should_not_be_part_of_max_width.rs | 8 ++--- tests/generated/margin_top.rs | 9 ++++-- tests/generated/margin_with_sibling_column.rs | 4 +-- tests/generated/margin_with_sibling_row.rs | 4 +-- tests/generated/max_height.rs | 9 ++++-- .../generated/max_height_overrides_height.rs | 5 +++- .../max_height_overrides_height_on_root.rs | 5 +++- tests/generated/max_width.rs | 9 ++++-- tests/generated/max_width_overrides_width.rs | 5 +++- .../max_width_overrides_width_on_root.rs | 5 +++- tests/generated/min_height.rs | 4 +-- .../generated/min_height_overrides_height.rs | 5 +++- .../min_height_overrides_height_on_root.rs | 5 +++- .../min_max_percent_no_width_height.rs | 4 +-- tests/generated/min_width.rs | 4 +-- tests/generated/min_width_overrides_width.rs | 5 +++- .../min_width_overrides_width_on_root.rs | 5 +++- tests/generated/nested_overflowing_child.rs | 8 ++--- ..._overflowing_child_in_constraint_parent.rs | 12 ++++---- tests/generated/overflow_cross_axis.rs | 8 ++--- tests/generated/overflow_main_axis.rs | 9 ++++-- tests/generated/padding_align_end_child.rs | 8 ++--- tests/generated/padding_center_child.rs | 8 ++--- tests/generated/padding_flex_child.rs | 9 ++++-- tests/generated/padding_stretch_child.rs | 9 ++++-- ...rent_wrap_child_size_overflowing_parent.rs | 13 ++++---- tests/generated/percent_absolute_position.rs | 18 +++++++---- tests/generated/percent_within_flex_grow.rs | 19 ++++++++---- .../generated/percentage_absolute_position.rs | 8 ++--- ...centage_container_in_wrapping_container.rs | 17 ++++++----- tests/generated/percentage_flex_basis.rs | 4 +-- .../generated/percentage_flex_basis_cross.rs | 4 +-- .../percentage_flex_basis_cross_max_height.rs | 4 +-- .../percentage_flex_basis_cross_max_width.rs | 4 +-- .../percentage_flex_basis_cross_min_height.rs | 4 +-- .../percentage_flex_basis_cross_min_width.rs | 4 +-- .../percentage_flex_basis_main_max_height.rs | 4 +-- .../percentage_flex_basis_main_max_width.rs | 4 +-- .../percentage_flex_basis_main_min_width.rs | 4 +-- ...in_should_calculate_based_only_on_width.rs | 8 ++--- ...th_padding_margin_and_percentage_values.rs | 14 ++++++--- ...ng_should_calculate_based_only_on_width.rs | 8 ++--- .../percentage_position_bottom_right.rs | 8 ++--- .../generated/percentage_position_left_top.rs | 8 ++--- ...centage_size_based_on_parent_inner_size.rs | 8 ++--- .../percentage_size_of_flex_basis.rs | 9 ++++-- tests/generated/percentage_width_height.rs | 8 ++--- ...tage_width_height_undefined_parent_size.rs | 4 +-- ...tive_position_should_not_nudge_siblings.rs | 14 ++++++--- ..._basis_flex_grow_row_prime_number_width.rs | 4 +-- ...g_flex_basis_flex_grow_row_width_of_100.rs | 4 +-- .../rounding_flex_basis_flex_shrink_row.rs | 4 +-- ...rounding_flex_basis_overrides_main_size.rs | 19 ++++++++---- tests/generated/rounding_fractial_input_1.rs | 19 ++++++++---- tests/generated/rounding_fractial_input_2.rs | 19 ++++++++---- tests/generated/rounding_fractial_input_3.rs | 19 ++++++++---- tests/generated/rounding_fractial_input_4.rs | 19 ++++++++---- tests/generated/rounding_total_fractial.rs | 19 ++++++++---- .../rounding_total_fractial_nested.rs | 29 +++++++++++++----- tests/generated/size_defined_by_child.rs | 4 +-- .../size_defined_by_child_with_border.rs | 4 +-- .../size_defined_by_child_with_padding.rs | 4 +-- .../generated/size_defined_by_grand_child.rs | 4 +-- ..._then_content_with_flex_grow_large_size.rs | 23 +++++++++----- ..._then_content_with_flex_grow_small_size.rs | 23 +++++++++----- ...ontent_with_flex_grow_unconstraint_size.rs | 18 +++++++---- ..._content_with_flex_grow_very_large_size.rs | 23 +++++++++----- tests/generated/wrap_column.rs | 20 ++++++------- ..._nodes_with_content_sizing_margin_cross.rs | 17 ++++++----- ..._with_content_sizing_overflowing_margin.rs | 17 ++++++----- tests/generated/wrap_reverse_column.rs | 20 ++++++------- .../wrap_reverse_column_fixed_size.rs | 24 +++++++-------- tests/generated/wrap_reverse_row.rs | 21 +++++++------ .../wrap_reverse_row_align_content_center.rs | 25 +++++++++------- ...ap_reverse_row_align_content_flex_start.rs | 25 +++++++++------- ..._reverse_row_align_content_space_around.rs | 25 +++++++++------- .../wrap_reverse_row_align_content_stretch.rs | 25 +++++++++------- ..._reverse_row_single_line_different_size.rs | 25 +++++++++------- tests/generated/wrap_row.rs | 21 +++++++------ .../generated/wrap_row_align_items_center.rs | 21 +++++++------ .../wrap_row_align_items_flex_end.rs | 21 +++++++------ tests/generated/wrapped_column_max_height.rs | 16 +++++----- .../wrapped_column_max_height_flex.rs | 16 +++++----- .../wrapped_row_within_align_items_center.rs | 12 ++++---- ...wrapped_row_within_align_items_flex_end.rs | 12 ++++---- ...apped_row_within_align_items_flex_start.rs | 12 ++++---- 472 files changed, 3096 insertions(+), 1986 deletions(-) diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center.rs index e1fe4b3c0..6f5458b51 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs index 1d935b71c..7edb906de 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -24,8 +24,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs index 4a1349862..80041cb3a 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), ..Default::default() }, @@ -21,8 +21,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs index 2af8e462a..3a52a4c98 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { end: taffy::style::Dimension::Points(5f32), ..Default::default() }, @@ -21,8 +21,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs index 0061986a0..799ab90a4 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -21,8 +21,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs b/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs index 589f664c8..eee292275 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_center.rs b/benches/generated/absolute_layout_align_items_center.rs index 7f4c0e867..2648f422d 100644 --- a/benches/generated/absolute_layout_align_items_center.rs +++ b/benches/generated/absolute_layout_align_items_center.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_align_items_center_on_child_only.rs b/benches/generated/absolute_layout_align_items_center_on_child_only.rs index 28da3478a..5acd00a27 100644 --- a/benches/generated/absolute_layout_align_items_center_on_child_only.rs +++ b/benches/generated/absolute_layout_align_items_center_on_child_only.rs @@ -6,8 +6,8 @@ pub fn compute() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_child_order.rs b/benches/generated/absolute_layout_child_order.rs index dd473c440..f89526728 100644 --- a/benches/generated/absolute_layout_child_order.rs +++ b/benches/generated/absolute_layout_child_order.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -46,8 +46,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs b/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs index 05bdbc67c..820f68c25 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs b/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs index 4bdd27338..8092eb9ee 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs @@ -6,8 +6,8 @@ pub fn compute() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs b/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs index 31e27ad22..ccaa8c036 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs b/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs index 2c4d2883c..f42cf16c6 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs @@ -6,8 +6,8 @@ pub fn compute() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_justify_content_center.rs b/benches/generated/absolute_layout_justify_content_center.rs index ea2fceb51..c31ba96df 100644 --- a/benches/generated/absolute_layout_justify_content_center.rs +++ b/benches/generated/absolute_layout_justify_content_center.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_no_size.rs b/benches/generated/absolute_layout_no_size.rs index 8423fe9fd..3b0055da7 100644 --- a/benches/generated/absolute_layout_no_size.rs +++ b/benches/generated/absolute_layout_no_size.rs @@ -10,8 +10,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs b/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs index 85b21ebe3..e11a1efca 100644 --- a/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs +++ b/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, @@ -20,8 +20,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -37,7 +37,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), @@ -52,8 +55,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_start_top_end_bottom.rs b/benches/generated/absolute_layout_start_top_end_bottom.rs index 31eb20376..53dae4ca2 100644 --- a/benches/generated/absolute_layout_start_top_end_bottom.rs +++ b/benches/generated/absolute_layout_start_top_end_bottom.rs @@ -20,8 +20,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_width_height_end_bottom.rs b/benches/generated/absolute_layout_width_height_end_bottom.rs index d2b4aa616..886c5cf8a 100644 --- a/benches/generated/absolute_layout_width_height_end_bottom.rs +++ b/benches/generated/absolute_layout_width_height_end_bottom.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -23,8 +23,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_width_height_start_top.rs b/benches/generated/absolute_layout_width_height_start_top.rs index b6213cb72..3494dde7c 100644 --- a/benches/generated/absolute_layout_width_height_start_top.rs +++ b/benches/generated/absolute_layout_width_height_start_top.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -23,8 +23,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_width_height_start_top_end_bottom.rs b/benches/generated/absolute_layout_width_height_start_top_end_bottom.rs index 8b3edd78e..ca1d958ba 100644 --- a/benches/generated/absolute_layout_width_height_start_top_end_bottom.rs +++ b/benches/generated/absolute_layout_width_height_start_top_end_bottom.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -25,8 +25,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/absolute_layout_within_border.rs b/benches/generated/absolute_layout_within_border.rs index 785567712..94a3d0558 100644 --- a/benches/generated/absolute_layout_within_border.rs +++ b/benches/generated/absolute_layout_within_border.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -24,8 +24,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -43,8 +43,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -69,8 +69,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -94,8 +94,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/benches/generated/align_baseline.rs b/benches/generated/align_baseline.rs index a5a4187c6..27712738c 100644 --- a/benches/generated/align_baseline.rs +++ b/benches/generated/align_baseline.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_baseline_child_multiline.rs b/benches/generated/align_baseline_child_multiline.rs index 13dee7286..1cd26739f 100644 --- a/benches/generated/align_baseline_child_multiline.rs +++ b/benches/generated/align_baseline_child_multiline.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -69,7 +69,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[node10, node11, node12, node13], @@ -79,7 +82,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/align_baseline_nested_child.rs b/benches/generated/align_baseline_nested_child.rs index c6d70b18c..099fec5c4 100644 --- a/benches/generated/align_baseline_nested_child.rs +++ b/benches/generated/align_baseline_nested_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -45,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_center_should_size_based_on_content.rs b/benches/generated/align_center_should_size_based_on_content.rs index b16d6488c..adee3a502 100644 --- a/benches/generated/align_center_should_size_based_on_content.rs +++ b/benches/generated/align_center_should_size_based_on_content.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_flex_start_with_shrinking_children.rs b/benches/generated/align_flex_start_with_shrinking_children.rs index 50206ee6a..a62df0815 100644 --- a/benches/generated/align_flex_start_with_shrinking_children.rs +++ b/benches/generated/align_flex_start_with_shrinking_children.rs @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs b/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs index 50206ee6a..a62df0815 100644 --- a/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs +++ b/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_flex_start_with_stretching_children.rs b/benches/generated/align_flex_start_with_stretching_children.rs index 480033286..96e966f45 100644 --- a/benches/generated/align_flex_start_with_stretching_children.rs +++ b/benches/generated/align_flex_start_with_stretching_children.rs @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_center.rs b/benches/generated/align_items_center.rs index c9b3d2468..61f2da4e0 100644 --- a/benches/generated/align_items_center.rs +++ b/benches/generated/align_items_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_center_child_with_margin_bigger_than_parent.rs b/benches/generated/align_items_center_child_with_margin_bigger_than_parent.rs index 560002e96..ddc6787f5 100644 --- a/benches/generated/align_items_center_child_with_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_center_child_with_margin_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -30,8 +30,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs b/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs index 865935f92..54eadcb25 100644 --- a/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(70f32)), ..Default::default() }, ..Default::default() @@ -25,8 +25,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_center_with_child_margin.rs b/benches/generated/align_items_center_with_child_margin.rs index 5def29f5a..f5800f37c 100644 --- a/benches/generated/align_items_center_with_child_margin.rs +++ b/benches/generated/align_items_center_with_child_margin.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_center_with_child_top.rs b/benches/generated/align_items_center_with_child_top.rs index 92a89630b..5c87c72d4 100644 --- a/benches/generated/align_items_center_with_child_top.rs +++ b/benches/generated/align_items_center_with_child_top.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_flex_end.rs b/benches/generated/align_items_flex_end.rs index 0a9adad85..52d28edb5 100644 --- a/benches/generated/align_items_flex_end.rs +++ b/benches/generated/align_items_flex_end.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs b/benches/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs index 69ff987e8..9bc3158cd 100644 --- a/benches/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -30,8 +30,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs b/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs index 63f9f16d5..8f7e41d7d 100644 --- a/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(70f32)), ..Default::default() }, ..Default::default() @@ -25,8 +25,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_flex_start.rs b/benches/generated/align_items_flex_start.rs index db8166b3b..ebebc03c7 100644 --- a/benches/generated/align_items_flex_start.rs +++ b/benches/generated/align_items_flex_start.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_items_min_max.rs b/benches/generated/align_items_min_max.rs index 4938dd39f..dc8131acd 100644 --- a/benches/generated/align_items_min_max.rs +++ b/benches/generated/align_items_min_max.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/align_items_stretch.rs b/benches/generated/align_items_stretch.rs index a45d2f566..3c18b9949 100644 --- a/benches/generated/align_items_stretch.rs +++ b/benches/generated/align_items_stretch.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_self_baseline.rs b/benches/generated/align_self_baseline.rs index f1c6f2ca3..3b604f5c1 100644 --- a/benches/generated/align_self_baseline.rs +++ b/benches/generated/align_self_baseline.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -45,8 +45,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_self_center.rs b/benches/generated/align_self_center.rs index baab76860..7f060f260 100644 --- a/benches/generated/align_self_center.rs +++ b/benches/generated/align_self_center.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_self_flex_end.rs b/benches/generated/align_self_flex_end.rs index ef541d323..b49c2ce21 100644 --- a/benches/generated/align_self_flex_end.rs +++ b/benches/generated/align_self_flex_end.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_self_flex_end_override_flex_start.rs b/benches/generated/align_self_flex_end_override_flex_start.rs index 7c813b88b..40a4fa7e4 100644 --- a/benches/generated/align_self_flex_end_override_flex_start.rs +++ b/benches/generated/align_self_flex_end_override_flex_start.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_self_flex_start.rs b/benches/generated/align_self_flex_start.rs index c62df4ebb..c3c37ab4e 100644 --- a/benches/generated/align_self_flex_start.rs +++ b/benches/generated/align_self_flex_start.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_strech_should_size_based_on_parent.rs b/benches/generated/align_strech_should_size_based_on_parent.rs index 6728c4fa2..77dee756d 100644 --- a/benches/generated/align_strech_should_size_based_on_parent.rs +++ b/benches/generated/align_strech_should_size_based_on_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -34,8 +34,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/border_center_child.rs b/benches/generated/border_center_child.rs index c1244f623..55629c41e 100644 --- a/benches/generated/border_center_child.rs +++ b/benches/generated/border_center_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/benches/generated/border_flex_child.rs b/benches/generated/border_flex_child.rs index 6cada747d..e23e8e3a2 100644 --- a/benches/generated/border_flex_child.rs +++ b/benches/generated/border_flex_child.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/benches/generated/border_stretch_child.rs b/benches/generated/border_stretch_child.rs index 837bc8832..fbf7be195 100644 --- a/benches/generated/border_stretch_child.rs +++ b/benches/generated/border_stretch_child.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/benches/generated/child_min_max_width_flexing.rs b/benches/generated/child_min_max_width_flexing.rs index 0ca098406..4e06ee724 100644 --- a/benches/generated/child_min_max_width_flexing.rs +++ b/benches/generated/child_min_max_width_flexing.rs @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(120f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/container_with_unsized_child.rs b/benches/generated/container_with_unsized_child.rs index 7f5791e3b..e17f6aca7 100644 --- a/benches/generated/container_with_unsized_child.rs +++ b/benches/generated/container_with_unsized_child.rs @@ -5,8 +5,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/display_none.rs b/benches/generated/display_none.rs index 7a1b4c755..6c4546c50 100644 --- a/benches/generated/display_none.rs +++ b/benches/generated/display_none.rs @@ -12,8 +12,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/display_none_fixed_size.rs b/benches/generated/display_none_fixed_size.rs index 7703fe7b2..b020a4401 100644 --- a/benches/generated/display_none_fixed_size.rs +++ b/benches/generated/display_none_fixed_size.rs @@ -7,8 +7,8 @@ pub fn compute() { taffy::style::FlexboxLayout { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/display_none_with_child.rs b/benches/generated/display_none_with_child.rs index 0d5f3fb93..c1ddfcc07 100644 --- a/benches/generated/display_none_with_child.rs +++ b/benches/generated/display_none_with_child.rs @@ -17,7 +17,10 @@ pub fn compute() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -51,8 +54,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/display_none_with_margin.rs b/benches/generated/display_none_with_margin.rs index cb57920af..37d45ad73 100644 --- a/benches/generated/display_none_with_margin.rs +++ b/benches/generated/display_none_with_margin.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -27,8 +27,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/display_none_with_position.rs b/benches/generated/display_none_with_position.rs index 01c8657a8..f5ae407c1 100644 --- a/benches/generated/display_none_with_position.rs +++ b/benches/generated/display_none_with_position.rs @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs b/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs index edd877a69..b85130972 100644 --- a/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs +++ b/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs @@ -6,8 +6,8 @@ pub fn compute() { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ pub fn compute() { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(0f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,7 +33,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_basis_flex_grow_column.rs b/benches/generated/flex_basis_flex_grow_column.rs index 18d9672f2..d9d59d315 100644 --- a/benches/generated/flex_basis_flex_grow_column.rs +++ b/benches/generated/flex_basis_flex_grow_column.rs @@ -17,8 +17,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_flex_grow_row.rs b/benches/generated/flex_basis_flex_grow_row.rs index b69013fd4..c5fb905dc 100644 --- a/benches/generated/flex_basis_flex_grow_row.rs +++ b/benches/generated/flex_basis_flex_grow_row.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_flex_shrink_column.rs b/benches/generated/flex_basis_flex_shrink_column.rs index 726700dfd..8d116d2dd 100644 --- a/benches/generated/flex_basis_flex_shrink_column.rs +++ b/benches/generated/flex_basis_flex_shrink_column.rs @@ -17,8 +17,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_flex_shrink_row.rs b/benches/generated/flex_basis_flex_shrink_row.rs index 5256a55b9..bb76a72fb 100644 --- a/benches/generated/flex_basis_flex_shrink_row.rs +++ b/benches/generated/flex_basis_flex_shrink_row.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_larger_than_content_column.rs b/benches/generated/flex_basis_larger_than_content_column.rs index 2063adcff..bc94d1bba 100644 --- a/benches/generated/flex_basis_larger_than_content_column.rs +++ b/benches/generated/flex_basis_larger_than_content_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -27,7 +27,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_larger_than_content_row.rs b/benches/generated/flex_basis_larger_than_content_row.rs index c8cac2b92..122005ac0 100644 --- a/benches/generated/flex_basis_larger_than_content_row.rs +++ b/benches/generated/flex_basis_larger_than_content_row.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -26,7 +26,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_overrides_main_size.rs b/benches/generated/flex_basis_overrides_main_size.rs index 300769645..0c5865120 100644 --- a/benches/generated/flex_basis_overrides_main_size.rs +++ b/benches/generated/flex_basis_overrides_main_size.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -35,8 +44,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs index 57e0961e6..e31d1e9c7 100644 --- a/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -51,7 +51,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_basis_smaller_than_content_column.rs b/benches/generated/flex_basis_smaller_than_content_column.rs index fa7bfb587..a091df62e 100644 --- a/benches/generated/flex_basis_smaller_than_content_column.rs +++ b/benches/generated/flex_basis_smaller_than_content_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -27,7 +27,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_smaller_than_content_row.rs b/benches/generated/flex_basis_smaller_than_content_row.rs index 8a4913216..62f4e18f7 100644 --- a/benches/generated/flex_basis_smaller_than_content_row.rs +++ b/benches/generated/flex_basis_smaller_than_content_row.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -26,7 +26,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_smaller_than_main_dimen_column.rs b/benches/generated/flex_basis_smaller_than_main_dimen_column.rs index bcd4f8fe2..dc07f0238 100644 --- a/benches/generated/flex_basis_smaller_than_main_dimen_column.rs +++ b/benches/generated/flex_basis_smaller_than_main_dimen_column.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_smaller_than_main_dimen_row.rs b/benches/generated/flex_basis_smaller_than_main_dimen_row.rs index 5aa5d6e01..5e5ef4d0c 100644 --- a/benches/generated/flex_basis_smaller_than_main_dimen_row.rs +++ b/benches/generated/flex_basis_smaller_than_main_dimen_row.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -17,7 +17,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs index 06a8cc3a5..78660fd92 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -51,7 +51,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs index c55c32cd8..684ec649f 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -51,7 +51,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs index 645f570f5..636160042 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs index 2af9ae9d7..b3a37a24e 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,8 +28,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -51,7 +51,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_basis_unconstraint_column.rs b/benches/generated/flex_basis_unconstraint_column.rs index 68a1a18e1..7a95864f8 100644 --- a/benches/generated/flex_basis_unconstraint_column.rs +++ b/benches/generated/flex_basis_unconstraint_column.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/benches/generated/flex_basis_unconstraint_row.rs b/benches/generated/flex_basis_unconstraint_row.rs index c9787039f..8cdcffd8a 100644 --- a/benches/generated/flex_basis_unconstraint_row.rs +++ b/benches/generated/flex_basis_unconstraint_row.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/benches/generated/flex_direction_column.rs b/benches/generated/flex_direction_column.rs index 849217abe..1c3e7e1c0 100644 --- a/benches/generated/flex_direction_column.rs +++ b/benches/generated/flex_direction_column.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_direction_column_no_height.rs b/benches/generated/flex_direction_column_no_height.rs index 4a0362b79..5a361cc33 100644 --- a/benches/generated/flex_direction_column_no_height.rs +++ b/benches/generated/flex_direction_column_no_height.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -31,7 +40,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/benches/generated/flex_direction_column_reverse.rs b/benches/generated/flex_direction_column_reverse.rs index 5b6b36ac3..88ae0005c 100644 --- a/benches/generated/flex_direction_column_reverse.rs +++ b/benches/generated/flex_direction_column_reverse.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::ColumnReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_direction_row.rs b/benches/generated/flex_direction_row.rs index a82cc92ad..6b514930f 100644 --- a/benches/generated/flex_direction_row.rs +++ b/benches/generated/flex_direction_row.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -31,8 +40,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_direction_row_no_width.rs b/benches/generated/flex_direction_row_no_width.rs index 6c7566987..d2004a7bb 100644 --- a/benches/generated/flex_direction_row_no_width.rs +++ b/benches/generated/flex_direction_row_no_width.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -30,7 +39,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/benches/generated/flex_direction_row_reverse.rs b/benches/generated/flex_direction_row_reverse.rs index a5510f55f..5b84b66eb 100644 --- a/benches/generated/flex_direction_row_reverse.rs +++ b/benches/generated/flex_direction_row_reverse.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::RowReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_child.rs b/benches/generated/flex_grow_child.rs index 1ff31c391..fc7035066 100644 --- a/benches/generated/flex_grow_child.rs +++ b/benches/generated/flex_grow_child.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/benches/generated/flex_grow_flex_basis_percent_min_max.rs b/benches/generated/flex_grow_flex_basis_percent_min_max.rs index d4c077ac6..a9acc4753 100644 --- a/benches/generated/flex_grow_flex_basis_percent_min_max.rs +++ b/benches/generated/flex_grow_flex_basis_percent_min_max.rs @@ -6,7 +6,10 @@ pub fn compute() { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() }, @@ -20,8 +23,8 @@ pub fn compute() { flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -33,7 +36,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(120f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_grow_height_maximized.rs b/benches/generated/flex_grow_height_maximized.rs index dfe9c4bf6..9899e4c13 100644 --- a/benches/generated/flex_grow_height_maximized.rs +++ b/benches/generated/flex_grow_height_maximized.rs @@ -13,7 +13,10 @@ pub fn compute() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -42,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_in_at_most_container.rs b/benches/generated/flex_grow_in_at_most_container.rs index 6640c251a..3d9b2252f 100644 --- a/benches/generated/flex_grow_in_at_most_container.rs +++ b/benches/generated/flex_grow_in_at_most_container.rs @@ -16,8 +16,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_less_than_factor_one.rs b/benches/generated/flex_grow_less_than_factor_one.rs index 7641060f4..e6ed7ad80 100644 --- a/benches/generated/flex_grow_less_than_factor_one.rs +++ b/benches/generated/flex_grow_less_than_factor_one.rs @@ -27,8 +27,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_root_minimized.rs b/benches/generated/flex_grow_root_minimized.rs index b9f59f10f..4d9bd7183 100644 --- a/benches/generated/flex_grow_root_minimized.rs +++ b/benches/generated/flex_grow_root_minimized.rs @@ -13,7 +13,10 @@ pub fn compute() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -41,7 +44,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_grow_shrink_at_most.rs b/benches/generated/flex_grow_shrink_at_most.rs index 3d4f2f075..56b6cf32f 100644 --- a/benches/generated/flex_grow_shrink_at_most.rs +++ b/benches/generated/flex_grow_shrink_at_most.rs @@ -11,8 +11,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_to_min.rs b/benches/generated/flex_grow_to_min.rs index c360f0eb9..593d64cb1 100644 --- a/benches/generated/flex_grow_to_min.rs +++ b/benches/generated/flex_grow_to_min.rs @@ -9,7 +9,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -19,7 +22,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_grow_within_constrained_max_column.rs b/benches/generated/flex_grow_within_constrained_max_column.rs index 8d2e7e572..745e6ae81 100644 --- a/benches/generated/flex_grow_within_constrained_max_column.rs +++ b/benches/generated/flex_grow_within_constrained_max_column.rs @@ -13,7 +13,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -23,7 +26,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_grow_within_constrained_max_row.rs b/benches/generated/flex_grow_within_constrained_max_row.rs index 00d86b6c6..eace77e51 100644 --- a/benches/generated/flex_grow_within_constrained_max_row.rs +++ b/benches/generated/flex_grow_within_constrained_max_row.rs @@ -13,7 +13,10 @@ pub fn compute() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +25,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -36,7 +42,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/flex_grow_within_constrained_max_width.rs b/benches/generated/flex_grow_within_constrained_max_width.rs index 41aad7c9d..dcf6e4e93 100644 --- a/benches/generated/flex_grow_within_constrained_max_width.rs +++ b/benches/generated/flex_grow_within_constrained_max_width.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -27,8 +30,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_within_constrained_min_column.rs b/benches/generated/flex_grow_within_constrained_min_column.rs index c1104a7a9..05da01f8e 100644 --- a/benches/generated/flex_grow_within_constrained_min_column.rs +++ b/benches/generated/flex_grow_within_constrained_min_column.rs @@ -5,7 +5,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/benches/generated/flex_grow_within_constrained_min_max_column.rs b/benches/generated/flex_grow_within_constrained_min_max_column.rs index 1c40314a7..a34f53a84 100644 --- a/benches/generated/flex_grow_within_constrained_min_max_column.rs +++ b/benches/generated/flex_grow_within_constrained_min_max_column.rs @@ -5,7 +5,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/benches/generated/flex_grow_within_constrained_min_row.rs b/benches/generated/flex_grow_within_constrained_min_row.rs index 6d64bdf10..af441de55 100644 --- a/benches/generated/flex_grow_within_constrained_min_row.rs +++ b/benches/generated/flex_grow_within_constrained_min_row.rs @@ -5,7 +5,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,7 +17,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_grow_within_max_width.rs b/benches/generated/flex_grow_within_max_width.rs index c7e7d6127..4ac29f4f2 100644 --- a/benches/generated/flex_grow_within_max_width.rs +++ b/benches/generated/flex_grow_within_max_width.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -27,8 +30,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_root_ignored.rs b/benches/generated/flex_root_ignored.rs index 17f1d924f..39fcdb0bc 100644 --- a/benches/generated/flex_root_ignored.rs +++ b/benches/generated/flex_root_ignored.rs @@ -13,7 +13,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -23,7 +26,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs b/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs index 01f73c571..dd77327cc 100644 --- a/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs +++ b/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -18,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(80f32), ..Default::default() diff --git a/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs b/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs index e6e4fd18e..6bd9c1deb 100644 --- a/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs +++ b/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs @@ -6,8 +6,8 @@ pub fn compute() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ pub fn compute() { flex_grow: 1f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -34,8 +34,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_shrink_flex_grow_row.rs b/benches/generated/flex_shrink_flex_grow_row.rs index 548cadab3..a315de34a 100644 --- a/benches/generated/flex_shrink_flex_grow_row.rs +++ b/benches/generated/flex_shrink_flex_grow_row.rs @@ -6,8 +6,8 @@ pub fn compute() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ pub fn compute() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -34,8 +34,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_shrink_to_zero.rs b/benches/generated/flex_shrink_to_zero.rs index 81b0a9da9..4eac9c97b 100644 --- a/benches/generated/flex_shrink_to_zero.rs +++ b/benches/generated/flex_shrink_to_zero.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -45,7 +45,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(75f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(75f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/benches/generated/flex_wrap_align_stretch_fits_one_row.rs b/benches/generated/flex_wrap_align_stretch_fits_one_row.rs index a2443b2bd..81b6ad427 100644 --- a/benches/generated/flex_wrap_align_stretch_fits_one_row.rs +++ b/benches/generated/flex_wrap_align_stretch_fits_one_row.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -23,8 +29,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs b/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs index 0666c127d..95379a6c7 100644 --- a/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs +++ b/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, ..Default::default() }, @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, ..Default::default() }, @@ -26,7 +32,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/flex_wrap_wrap_to_child_height.rs b/benches/generated/flex_wrap_wrap_to_child_height.rs index 3efbb6dc5..fbe7dfcba 100644 --- a/benches/generated/flex_wrap_wrap_to_child_height.rs +++ b/benches/generated/flex_wrap_wrap_to_child_height.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -17,7 +17,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node000], @@ -37,8 +40,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_center.rs b/benches/generated/justify_content_column_center.rs index e9c384279..9ec83c2bb 100644 --- a/benches/generated/justify_content_column_center.rs +++ b/benches/generated/justify_content_column_center.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_flex_end.rs b/benches/generated/justify_content_column_flex_end.rs index 3b239ebf4..ab8667beb 100644 --- a/benches/generated/justify_content_column_flex_end.rs +++ b/benches/generated/justify_content_column_flex_end.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_flex_start.rs b/benches/generated/justify_content_column_flex_start.rs index 849217abe..1c3e7e1c0 100644 --- a/benches/generated/justify_content_column_flex_start.rs +++ b/benches/generated/justify_content_column_flex_start.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_min_height_and_margin_bottom.rs b/benches/generated/justify_content_column_min_height_and_margin_bottom.rs index 706e3e43a..e83ce078b 100644 --- a/benches/generated/justify_content_column_min_height_and_margin_bottom.rs +++ b/benches/generated/justify_content_column_min_height_and_margin_bottom.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/benches/generated/justify_content_column_min_height_and_margin_top.rs b/benches/generated/justify_content_column_min_height_and_margin_top.rs index f8788e993..7d81a5714 100644 --- a/benches/generated/justify_content_column_min_height_and_margin_top.rs +++ b/benches/generated/justify_content_column_min_height_and_margin_top.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/benches/generated/justify_content_column_space_around.rs b/benches/generated/justify_content_column_space_around.rs index fd6947674..756547222 100644 --- a/benches/generated/justify_content_column_space_around.rs +++ b/benches/generated/justify_content_column_space_around.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_space_between.rs b/benches/generated/justify_content_column_space_between.rs index d6d49e1ac..34a2e8062 100644 --- a/benches/generated/justify_content_column_space_between.rs +++ b/benches/generated/justify_content_column_space_between.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_column_space_evenly.rs b/benches/generated/justify_content_column_space_evenly.rs index 46ca3a3f1..8fbd0b06e 100644 --- a/benches/generated/justify_content_column_space_evenly.rs +++ b/benches/generated/justify_content_column_space_evenly.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_min_max.rs b/benches/generated/justify_content_min_max.rs index b05df0f81..0fafdd880 100644 --- a/benches/generated/justify_content_min_max.rs +++ b/benches/generated/justify_content_min_max.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs b/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs index acad54843..3f6da2568 100644 --- a/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs +++ b/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(300f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(300f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1000f32), - height: taffy::style::Dimension::Points(1584f32), + width: Some(taffy::style::Dimension::Points(1000f32)), + height: Some(taffy::style::Dimension::Points(1584f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs b/benches/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs index 1206e4121..3a03dcebc 100644 --- a/benches/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs +++ b/benches/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(199f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(199f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1080f32), - height: taffy::style::Dimension::Points(1584f32), + width: Some(taffy::style::Dimension::Points(1080f32)), + height: Some(taffy::style::Dimension::Points(1584f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_overflow_min_max.rs b/benches/generated/justify_content_overflow_min_max.rs index 4d2cb93cc..6e388e236 100644 --- a/benches/generated/justify_content_overflow_min_max.rs +++ b/benches/generated/justify_content_overflow_min_max.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_center.rs b/benches/generated/justify_content_row_center.rs index 0cb6dcb05..ce4d0eb7f 100644 --- a/benches/generated/justify_content_row_center.rs +++ b/benches/generated/justify_content_row_center.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_flex_end.rs b/benches/generated/justify_content_row_flex_end.rs index 60e3790cc..da7ff0109 100644 --- a/benches/generated/justify_content_row_flex_end.rs +++ b/benches/generated/justify_content_row_flex_end.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_flex_start.rs b/benches/generated/justify_content_row_flex_start.rs index a82cc92ad..6b514930f 100644 --- a/benches/generated/justify_content_row_flex_start.rs +++ b/benches/generated/justify_content_row_flex_start.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -31,8 +40,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_max_width_and_margin.rs b/benches/generated/justify_content_row_max_width_and_margin.rs index acba6f4b7..a27b564dc 100644 --- a/benches/generated/justify_content_row_max_width_and_margin.rs +++ b/benches/generated/justify_content_row_max_width_and_margin.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -18,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/justify_content_row_min_width_and_margin.rs b/benches/generated/justify_content_row_min_width_and_margin.rs index 07e8cfde8..dc0d17d8c 100644 --- a/benches/generated/justify_content_row_min_width_and_margin.rs +++ b/benches/generated/justify_content_row_min_width_and_margin.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/benches/generated/justify_content_row_space_around.rs b/benches/generated/justify_content_row_space_around.rs index c16bfe776..1be23e521 100644 --- a/benches/generated/justify_content_row_space_around.rs +++ b/benches/generated/justify_content_row_space_around.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_space_between.rs b/benches/generated/justify_content_row_space_between.rs index 1deb7955a..243d40ee4 100644 --- a/benches/generated/justify_content_row_space_between.rs +++ b/benches/generated/justify_content_row_space_between.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_space_evenly.rs b/benches/generated/justify_content_row_space_evenly.rs index 4e3a0c4fc..7cfba44cc 100644 --- a/benches/generated/justify_content_row_space_evenly.rs +++ b/benches/generated/justify_content_row_space_evenly.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -21,7 +27,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_and_flex_column.rs b/benches/generated/margin_and_flex_column.rs index 37e10ff6e..0c8d6b776 100644 --- a/benches/generated/margin_and_flex_column.rs +++ b/benches/generated/margin_and_flex_column.rs @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_and_flex_row.rs b/benches/generated/margin_and_flex_row.rs index 65c29918d..6c7b2f4e9 100644 --- a/benches/generated/margin_and_flex_row.rs +++ b/benches/generated/margin_and_flex_row.rs @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_and_stretch_column.rs b/benches/generated/margin_and_stretch_column.rs index 25fc95f4c..9f858f777 100644 --- a/benches/generated/margin_and_stretch_column.rs +++ b/benches/generated/margin_and_stretch_column.rs @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_and_stretch_row.rs b/benches/generated/margin_and_stretch_row.rs index 648ff6291..f7ad2de8b 100644 --- a/benches/generated/margin_and_stretch_row.rs +++ b/benches/generated/margin_and_stretch_row.rs @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_bottom.rs b/benches/generated/margin_auto_bottom.rs index 9505bbe6b..247095e87 100644 --- a/benches/generated/margin_auto_bottom.rs +++ b/benches/generated/margin_auto_bottom.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_bottom_and_top.rs b/benches/generated/margin_auto_bottom_and_top.rs index f7fcaab1a..d740fa46c 100644 --- a/benches/generated/margin_auto_bottom_and_top.rs +++ b/benches/generated/margin_auto_bottom_and_top.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_bottom_and_top_justify_center.rs b/benches/generated/margin_auto_bottom_and_top_justify_center.rs index 0440c2b34..07ac49374 100644 --- a/benches/generated/margin_auto_bottom_and_top_justify_center.rs +++ b/benches/generated/margin_auto_bottom_and_top_justify_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left.rs b/benches/generated/margin_auto_left.rs index f3c75baca..88dfa88b4 100644 --- a/benches/generated/margin_auto_left.rs +++ b/benches/generated/margin_auto_left.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_and_right.rs b/benches/generated/margin_auto_left_and_right.rs index 7e518b75b..d7a18efa1 100644 --- a/benches/generated/margin_auto_left_and_right.rs +++ b/benches/generated/margin_auto_left_and_right.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_and_right_column.rs b/benches/generated/margin_auto_left_and_right_column.rs index 02aa00194..e06f15132 100644 --- a/benches/generated/margin_auto_left_and_right_column.rs +++ b/benches/generated/margin_auto_left_and_right_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_and_right_column_and_center.rs b/benches/generated/margin_auto_left_and_right_column_and_center.rs index 02aa00194..e06f15132 100644 --- a/benches/generated/margin_auto_left_and_right_column_and_center.rs +++ b/benches/generated/margin_auto_left_and_right_column_and_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_and_right_strech.rs b/benches/generated/margin_auto_left_and_right_strech.rs index 7e518b75b..d7a18efa1 100644 --- a/benches/generated/margin_auto_left_and_right_strech.rs +++ b/benches/generated/margin_auto_left_and_right_strech.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_child_bigger_than_parent.rs b/benches/generated/margin_auto_left_child_bigger_than_parent.rs index db10950f2..38d81429d 100644 --- a/benches/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/benches/generated/margin_auto_left_child_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs b/benches/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs index 2aa082102..fba9c5ba5 100644 --- a/benches/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs +++ b/benches/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_right_child_bigger_than_parent.rs b/benches/generated/margin_auto_left_right_child_bigger_than_parent.rs index b11b6ba06..7c8a944d2 100644 --- a/benches/generated/margin_auto_left_right_child_bigger_than_parent.rs +++ b/benches/generated/margin_auto_left_right_child_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left_stretching_child.rs b/benches/generated/margin_auto_left_stretching_child.rs index 169168067..4ac949bdf 100644 --- a/benches/generated/margin_auto_left_stretching_child.rs +++ b/benches/generated/margin_auto_left_stretching_child.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_mutiple_children_column.rs b/benches/generated/margin_auto_mutiple_children_column.rs index 0596295c4..8d84443e4 100644 --- a/benches/generated/margin_auto_mutiple_children_column.rs +++ b/benches/generated/margin_auto_mutiple_children_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -32,8 +32,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -47,8 +47,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_mutiple_children_row.rs b/benches/generated/margin_auto_mutiple_children_row.rs index 3659e9044..d6c1329d8 100644 --- a/benches/generated/margin_auto_mutiple_children_row.rs +++ b/benches/generated/margin_auto_mutiple_children_row.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -32,8 +32,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -46,8 +46,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_right.rs b/benches/generated/margin_auto_right.rs index 390701e15..9bb585ac8 100644 --- a/benches/generated/margin_auto_right.rs +++ b/benches/generated/margin_auto_right.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_top.rs b/benches/generated/margin_auto_top.rs index f2d445cce..b52af3496 100644 --- a/benches/generated/margin_auto_top.rs +++ b/benches/generated/margin_auto_top.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_top_and_bottom_strech.rs b/benches/generated/margin_auto_top_and_bottom_strech.rs index e7940492a..dbe361cb2 100644 --- a/benches/generated/margin_auto_top_and_bottom_strech.rs +++ b/benches/generated/margin_auto_top_and_bottom_strech.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_top_stretching_child.rs b/benches/generated/margin_auto_top_stretching_child.rs index 4649a19fa..e4f7f8b8c 100644 --- a/benches/generated/margin_auto_top_stretching_child.rs +++ b/benches/generated/margin_auto_top_stretching_child.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_bottom.rs b/benches/generated/margin_bottom.rs index 768b8b51a..76b4896a2 100644 --- a/benches/generated/margin_bottom.rs +++ b/benches/generated/margin_bottom.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -16,8 +19,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs b/benches/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs index f2e76da8b..0a2f1daeb 100644 --- a/benches/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs +++ b/benches/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_left.rs b/benches/generated/margin_left.rs index 07400cae1..483b49596 100644 --- a/benches/generated/margin_left.rs +++ b/benches/generated/margin_left.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -14,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_right.rs b/benches/generated/margin_right.rs index 00ed840d8..88c4c60ff 100644 --- a/benches/generated/margin_right.rs +++ b/benches/generated/margin_right.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -15,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_should_not_be_part_of_max_height.rs b/benches/generated/margin_should_not_be_part_of_max_height.rs index e66471cd9..0bfee3a45 100644 --- a/benches/generated/margin_should_not_be_part_of_max_height.rs +++ b/benches/generated/margin_should_not_be_part_of_max_height.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: Some(taffy::style::Dimension::Points(250f32)), + height: Some(taffy::style::Dimension::Points(250f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_should_not_be_part_of_max_width.rs b/benches/generated/margin_should_not_be_part_of_max_width.rs index 55f6167a9..b5396c2be 100644 --- a/benches/generated/margin_should_not_be_part_of_max_width.rs +++ b/benches/generated/margin_should_not_be_part_of_max_width.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: Some(taffy::style::Dimension::Points(250f32)), + height: Some(taffy::style::Dimension::Points(250f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_top.rs b/benches/generated/margin_top.rs index 7f2f6ca81..bc634132b 100644 --- a/benches/generated/margin_top.rs +++ b/benches/generated/margin_top.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -15,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_with_sibling_column.rs b/benches/generated/margin_with_sibling_column.rs index 61fffdaf4..b3fa2c29b 100644 --- a/benches/generated/margin_with_sibling_column.rs +++ b/benches/generated/margin_with_sibling_column.rs @@ -17,8 +17,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_with_sibling_row.rs b/benches/generated/margin_with_sibling_row.rs index 3f8296fad..4913a3022 100644 --- a/benches/generated/margin_with_sibling_row.rs +++ b/benches/generated/margin_with_sibling_row.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/max_height.rs b/benches/generated/max_height.rs index 9457d75b9..ce9c6f850 100644 --- a/benches/generated/max_height.rs +++ b/benches/generated/max_height.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -17,8 +20,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/max_height_overrides_height.rs b/benches/generated/max_height_overrides_height.rs index 8874c05c8..c1c976eb1 100644 --- a/benches/generated/max_height_overrides_height.rs +++ b/benches/generated/max_height_overrides_height.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/max_height_overrides_height_on_root.rs b/benches/generated/max_height_overrides_height_on_root.rs index 7caa6c006..552adeb37 100644 --- a/benches/generated/max_height_overrides_height_on_root.rs +++ b/benches/generated/max_height_overrides_height_on_root.rs @@ -3,7 +3,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/max_width.rs b/benches/generated/max_width.rs index dba2a51a0..03e08cfa7 100644 --- a/benches/generated/max_width.rs +++ b/benches/generated/max_width.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -15,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/max_width_overrides_width.rs b/benches/generated/max_width_overrides_width.rs index 0e1cd77ba..86d5937ab 100644 --- a/benches/generated/max_width_overrides_width.rs +++ b/benches/generated/max_width_overrides_width.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/max_width_overrides_width_on_root.rs b/benches/generated/max_width_overrides_width_on_root.rs index 470eac9c5..d6fcd0efe 100644 --- a/benches/generated/max_width_overrides_width_on_root.rs +++ b/benches/generated/max_width_overrides_width_on_root.rs @@ -3,7 +3,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/min_height.rs b/benches/generated/min_height.rs index a9e4320fb..d3c133907 100644 --- a/benches/generated/min_height.rs +++ b/benches/generated/min_height.rs @@ -20,8 +20,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/min_height_overrides_height.rs b/benches/generated/min_height_overrides_height.rs index 82b61cb8c..b150b125b 100644 --- a/benches/generated/min_height_overrides_height.rs +++ b/benches/generated/min_height_overrides_height.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/min_height_overrides_height_on_root.rs b/benches/generated/min_height_overrides_height_on_root.rs index 3dac0c5ea..7904c6e03 100644 --- a/benches/generated/min_height_overrides_height_on_root.rs +++ b/benches/generated/min_height_overrides_height_on_root.rs @@ -3,7 +3,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/min_max_percent_no_width_height.rs b/benches/generated/min_max_percent_no_width_height.rs index 6d1245865..feb952fc5 100644 --- a/benches/generated/min_max_percent_no_width_height.rs +++ b/benches/generated/min_max_percent_no_width_height.rs @@ -24,8 +24,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/min_width.rs b/benches/generated/min_width.rs index 90a5de04d..627ec05b6 100644 --- a/benches/generated/min_width.rs +++ b/benches/generated/min_width.rs @@ -16,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/min_width_overrides_width.rs b/benches/generated/min_width_overrides_width.rs index da5229c26..ad869a411 100644 --- a/benches/generated/min_width_overrides_width.rs +++ b/benches/generated/min_width_overrides_width.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/min_width_overrides_width_on_root.rs b/benches/generated/min_width_overrides_width_on_root.rs index a01813c1d..51a736b5e 100644 --- a/benches/generated/min_width_overrides_width_on_root.rs +++ b/benches/generated/min_width_overrides_width_on_root.rs @@ -3,7 +3,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/nested_overflowing_child.rs b/benches/generated/nested_overflowing_child.rs index 4b50c8d7b..8fd0e72f9 100644 --- a/benches/generated/nested_overflowing_child.rs +++ b/benches/generated/nested_overflowing_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/nested_overflowing_child_in_constraint_parent.rs b/benches/generated/nested_overflowing_child_in_constraint_parent.rs index 0b2ad7c0c..9d5beec43 100644 --- a/benches/generated/nested_overflowing_child_in_constraint_parent.rs +++ b/benches/generated/nested_overflowing_child_in_constraint_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/overflow_cross_axis.rs b/benches/generated/overflow_cross_axis.rs index 01530cf71..8db44ae2e 100644 --- a/benches/generated/overflow_cross_axis.rs +++ b/benches/generated/overflow_cross_axis.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/overflow_main_axis.rs b/benches/generated/overflow_main_axis.rs index 65e2e1676..90682a7b4 100644 --- a/benches/generated/overflow_main_axis.rs +++ b/benches/generated/overflow_main_axis.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_shrink: 0f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/padding_align_end_child.rs b/benches/generated/padding_align_end_child.rs index d669ef626..4ca72c49e 100644 --- a/benches/generated/padding_align_end_child.rs +++ b/benches/generated/padding_align_end_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { @@ -26,8 +26,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/padding_center_child.rs b/benches/generated/padding_center_child.rs index 7aa9246ca..7bb1ea1c0 100644 --- a/benches/generated/padding_center_child.rs +++ b/benches/generated/padding_center_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/benches/generated/padding_flex_child.rs b/benches/generated/padding_flex_child.rs index 39e7820b8..24984330b 100644 --- a/benches/generated/padding_flex_child.rs +++ b/benches/generated/padding_flex_child.rs @@ -4,7 +4,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/benches/generated/padding_stretch_child.rs b/benches/generated/padding_stretch_child.rs index f5f25c0d9..b1984c42e 100644 --- a/benches/generated/padding_stretch_child.rs +++ b/benches/generated/padding_stretch_child.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,8 +16,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/benches/generated/parent_wrap_child_size_overflowing_parent.rs b/benches/generated/parent_wrap_child_size_overflowing_parent.rs index cd099407d..99564f6e6 100644 --- a/benches/generated/parent_wrap_child_size_overflowing_parent.rs +++ b/benches/generated/parent_wrap_child_size_overflowing_parent.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -16,7 +16,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -26,8 +29,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percent_absolute_position.rs b/benches/generated/percent_absolute_position.rs index 619f73281..72a03a41f 100644 --- a/benches/generated/percent_absolute_position.rs +++ b/benches/generated/percent_absolute_position.rs @@ -3,7 +3,10 @@ pub fn compute() { let node00 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -23,8 +29,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Percent(1f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -41,8 +47,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percent_within_flex_grow.rs b/benches/generated/percent_within_flex_grow.rs index fc473387b..2b14c9d83 100644 --- a/benches/generated/percent_within_flex_grow.rs +++ b/benches/generated/percent_within_flex_grow.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -12,7 +15,10 @@ pub fn compute() { let node10 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -31,7 +37,10 @@ pub fn compute() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -41,8 +50,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(350f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(350f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_absolute_position.rs b/benches/generated/percentage_absolute_position.rs index c14a32794..2ddb0ffec 100644 --- a/benches/generated/percentage_absolute_position.rs +++ b/benches/generated/percentage_absolute_position.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -24,8 +24,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_container_in_wrapping_container.rs b/benches/generated/percentage_container_in_wrapping_container.rs index 33dd189e7..c06936cc8 100644 --- a/benches/generated/percentage_container_in_wrapping_container.rs +++ b/benches/generated/percentage_container_in_wrapping_container.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -30,7 +30,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[node000, node001], @@ -49,8 +52,8 @@ pub fn compute() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis.rs b/benches/generated/percentage_flex_basis.rs index 018119bdc..1bf68005c 100644 --- a/benches/generated/percentage_flex_basis.rs +++ b/benches/generated/percentage_flex_basis.rs @@ -24,8 +24,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_cross.rs b/benches/generated/percentage_flex_basis_cross.rs index 70860d3b9..3bc4e0303 100644 --- a/benches/generated/percentage_flex_basis_cross.rs +++ b/benches/generated/percentage_flex_basis_cross.rs @@ -25,8 +25,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_cross_max_height.rs b/benches/generated/percentage_flex_basis_cross_max_height.rs index f466969c2..1c9b327ec 100644 --- a/benches/generated/percentage_flex_basis_cross_max_height.rs +++ b/benches/generated/percentage_flex_basis_cross_max_height.rs @@ -33,8 +33,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_cross_max_width.rs b/benches/generated/percentage_flex_basis_cross_max_width.rs index 83a52937b..b9c0d25b7 100644 --- a/benches/generated/percentage_flex_basis_cross_max_width.rs +++ b/benches/generated/percentage_flex_basis_cross_max_width.rs @@ -33,8 +33,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_cross_min_height.rs b/benches/generated/percentage_flex_basis_cross_min_height.rs index 7185d1241..cfc05ccfb 100644 --- a/benches/generated/percentage_flex_basis_cross_min_height.rs +++ b/benches/generated/percentage_flex_basis_cross_min_height.rs @@ -31,8 +31,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_cross_min_width.rs b/benches/generated/percentage_flex_basis_cross_min_width.rs index 190298c37..49365d20c 100644 --- a/benches/generated/percentage_flex_basis_cross_min_width.rs +++ b/benches/generated/percentage_flex_basis_cross_min_width.rs @@ -33,8 +33,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_main_max_height.rs b/benches/generated/percentage_flex_basis_main_max_height.rs index dbe76527f..72232016e 100644 --- a/benches/generated/percentage_flex_basis_main_max_height.rs +++ b/benches/generated/percentage_flex_basis_main_max_height.rs @@ -32,8 +32,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_main_max_width.rs b/benches/generated/percentage_flex_basis_main_max_width.rs index 2d7f8c2b2..60c66a16d 100644 --- a/benches/generated/percentage_flex_basis_main_max_width.rs +++ b/benches/generated/percentage_flex_basis_main_max_width.rs @@ -32,8 +32,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_flex_basis_main_min_width.rs b/benches/generated/percentage_flex_basis_main_min_width.rs index 253e6d719..bd6934c50 100644 --- a/benches/generated/percentage_flex_basis_main_min_width.rs +++ b/benches/generated/percentage_flex_basis_main_min_width.rs @@ -32,8 +32,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_margin_should_calculate_based_only_on_width.rs b/benches/generated/percentage_margin_should_calculate_based_only_on_width.rs index 4f88d2e37..6f90338ec 100644 --- a/benches/generated/percentage_margin_should_calculate_based_only_on_width.rs +++ b/benches/generated/percentage_margin_should_calculate_based_only_on_width.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs b/benches/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs index a05fa43f8..5b16ce58a 100644 --- a/benches/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs +++ b/benches/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs @@ -3,7 +3,10 @@ pub fn compute() { let node000 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.45f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(0.45f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Percent(0.05f32), end: taffy::style::Dimension::Percent(0.05f32), @@ -27,7 +30,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(0.5f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), end: taffy::style::Dimension::Points(5f32), @@ -95,8 +101,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_padding_should_calculate_based_only_on_width.rs b/benches/generated/percentage_padding_should_calculate_based_only_on_width.rs index 1d6466b53..15f5f3598 100644 --- a/benches/generated/percentage_padding_should_calculate_based_only_on_width.rs +++ b/benches/generated/percentage_padding_should_calculate_based_only_on_width.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_position_bottom_right.rs b/benches/generated/percentage_position_bottom_right.rs index 1a112b918..5e183a5dd 100644 --- a/benches/generated/percentage_position_bottom_right.rs +++ b/benches/generated/percentage_position_bottom_right.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.55f32), - height: taffy::style::Dimension::Percent(0.15f32), + width: Some(taffy::style::Dimension::Percent(0.55f32)), + height: Some(taffy::style::Dimension::Percent(0.15f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_position_left_top.rs b/benches/generated/percentage_position_left_top.rs index 3944f4ae0..747924f5d 100644 --- a/benches/generated/percentage_position_left_top.rs +++ b/benches/generated/percentage_position_left_top.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.45f32), - height: taffy::style::Dimension::Percent(0.55f32), + width: Some(taffy::style::Dimension::Percent(0.45f32)), + height: Some(taffy::style::Dimension::Percent(0.55f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -22,8 +22,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(400f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_size_based_on_parent_inner_size.rs b/benches/generated/percentage_size_based_on_parent_inner_size.rs index f4b99dfdd..b37bd1aac 100644 --- a/benches/generated/percentage_size_based_on_parent_inner_size.rs +++ b/benches/generated/percentage_size_based_on_parent_inner_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.5f32), - height: taffy::style::Dimension::Percent(0.5f32), + width: Some(taffy::style::Dimension::Percent(0.5f32)), + height: Some(taffy::style::Dimension::Percent(0.5f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/benches/generated/percentage_size_of_flex_basis.rs b/benches/generated/percentage_size_of_flex_basis.rs index fa1ce7112..ef44427ca 100644 --- a/benches/generated/percentage_size_of_flex_basis.rs +++ b/benches/generated/percentage_size_of_flex_basis.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Percent(1f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -22,7 +22,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/benches/generated/percentage_width_height.rs b/benches/generated/percentage_width_height.rs index 517127b07..665567267 100644 --- a/benches/generated/percentage_width_height.rs +++ b/benches/generated/percentage_width_height.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.3f32), - height: taffy::style::Dimension::Percent(0.3f32), + width: Some(taffy::style::Dimension::Percent(0.3f32)), + height: Some(taffy::style::Dimension::Percent(0.3f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_width_height_undefined_parent_size.rs b/benches/generated/percentage_width_height_undefined_parent_size.rs index b24025866..ff540a786 100644 --- a/benches/generated/percentage_width_height_undefined_parent_size.rs +++ b/benches/generated/percentage_width_height_undefined_parent_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.5f32), - height: taffy::style::Dimension::Percent(0.5f32), + width: Some(taffy::style::Dimension::Percent(0.5f32)), + height: Some(taffy::style::Dimension::Percent(0.5f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/relative_position_should_not_nudge_siblings.rs b/benches/generated/relative_position_should_not_nudge_siblings.rs index 41b1f9cc3..112d75140 100644 --- a/benches/generated/relative_position_should_not_nudge_siblings.rs +++ b/benches/generated/relative_position_should_not_nudge_siblings.rs @@ -3,7 +3,10 @@ pub fn compute() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() }, @@ -13,7 +16,10 @@ pub fn compute() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() }, @@ -25,8 +31,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs b/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs index add6997c4..edd77d6af 100644 --- a/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs +++ b/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs @@ -14,8 +14,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(113f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(113f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs b/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs index 17bcbe368..935a471d1 100644 --- a/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs +++ b/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs @@ -10,8 +10,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_flex_basis_flex_shrink_row.rs b/benches/generated/rounding_flex_basis_flex_shrink_row.rs index 3ecf14460..8502f7bd8 100644 --- a/benches/generated/rounding_flex_basis_flex_shrink_row.rs +++ b/benches/generated/rounding_flex_basis_flex_shrink_row.rs @@ -26,8 +26,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(101f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(101f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_flex_basis_overrides_main_size.rs b/benches/generated/rounding_flex_basis_overrides_main_size.rs index f39f5bfdb..6fc334ece 100644 --- a/benches/generated/rounding_flex_basis_overrides_main_size.rs +++ b/benches/generated/rounding_flex_basis_overrides_main_size.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_fractial_input_1.rs b/benches/generated/rounding_fractial_input_1.rs index f8c742c1c..1b76556cc 100644 --- a/benches/generated/rounding_fractial_input_1.rs +++ b/benches/generated/rounding_fractial_input_1.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_fractial_input_2.rs b/benches/generated/rounding_fractial_input_2.rs index 93d65620c..29bf6ba84 100644 --- a/benches/generated/rounding_fractial_input_2.rs +++ b/benches/generated/rounding_fractial_input_2.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.6f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.6f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_fractial_input_3.rs b/benches/generated/rounding_fractial_input_3.rs index f8c742c1c..1b76556cc 100644 --- a/benches/generated/rounding_fractial_input_3.rs +++ b/benches/generated/rounding_fractial_input_3.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_fractial_input_4.rs b/benches/generated/rounding_fractial_input_4.rs index f8c742c1c..1b76556cc 100644 --- a/benches/generated/rounding_fractial_input_4.rs +++ b/benches/generated/rounding_fractial_input_4.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_total_fractial.rs b/benches/generated/rounding_total_fractial.rs index e11e1b797..194ecc946 100644 --- a/benches/generated/rounding_total_fractial.rs +++ b/benches/generated/rounding_total_fractial.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20.3f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.6f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -25,7 +31,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10.7f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(87.4f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/rounding_total_fractial_nested.rs b/benches/generated/rounding_total_fractial_nested.rs index af4770683..7dc1c86e2 100644 --- a/benches/generated/rounding_total_fractial_nested.rs +++ b/benches/generated/rounding_total_fractial_nested.rs @@ -5,7 +5,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(9.9f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(9.9f32)), + ..Default::default() + }, position: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(13.3f32), ..Default::default() @@ -20,7 +23,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(1.1f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(1.1f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(13.3f32), ..Default::default() }, ..Default::default() }, @@ -33,7 +39,10 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20.3f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -43,7 +52,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.6f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -53,7 +65,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10.7f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -64,8 +79,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(87.4f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/size_defined_by_child.rs b/benches/generated/size_defined_by_child.rs index 0f690f346..74b2dad65 100644 --- a/benches/generated/size_defined_by_child.rs +++ b/benches/generated/size_defined_by_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/size_defined_by_child_with_border.rs b/benches/generated/size_defined_by_child_with_border.rs index 1bae9d8aa..39be790da 100644 --- a/benches/generated/size_defined_by_child_with_border.rs +++ b/benches/generated/size_defined_by_child_with_border.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/size_defined_by_child_with_padding.rs b/benches/generated/size_defined_by_child_with_padding.rs index 4cb2728e0..55c9adb6b 100644 --- a/benches/generated/size_defined_by_child_with_padding.rs +++ b/benches/generated/size_defined_by_child_with_padding.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/size_defined_by_grand_child.rs b/benches/generated/size_defined_by_grand_child.rs index de578f019..6480d29e3 100644 --- a/benches/generated/size_defined_by_grand_child.rs +++ b/benches/generated/size_defined_by_grand_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs index 74da466b4..5522ba5bb 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -28,8 +31,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -42,7 +45,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -51,7 +57,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs index d34c5f603..344a19fe2 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -28,8 +31,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -42,7 +45,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -51,7 +57,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs index f7fb2e84f..2ca5af586 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -28,8 +31,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -42,7 +45,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs index 9a160d82d..da66c0257 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -28,8 +31,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -42,7 +45,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -51,7 +57,10 @@ pub fn compute() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/benches/generated/wrap_column.rs b/benches/generated/wrap_column.rs index 38f514406..dd84ae275 100644 --- a/benches/generated/wrap_column.rs +++ b/benches/generated/wrap_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(31f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(32f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(33f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(34f32)), ..Default::default() }, ..Default::default() @@ -58,8 +58,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs b/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs index 6363fe199..c80da5f6f 100644 --- a/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs +++ b/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -23,8 +23,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -46,7 +46,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(70f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -57,8 +60,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs b/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs index b0fbf01e2..d7568b29e 100644 --- a/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -23,8 +23,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -46,7 +46,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(85f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(85f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -57,8 +60,8 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_reverse_column.rs b/benches/generated/wrap_reverse_column.rs index ffc4d83cb..590a5ce59 100644 --- a/benches/generated/wrap_reverse_column.rs +++ b/benches/generated/wrap_reverse_column.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(31f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(32f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(33f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(34f32)), ..Default::default() }, ..Default::default() @@ -58,8 +58,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_reverse_column_fixed_size.rs b/benches/generated/wrap_reverse_column_fixed_size.rs index 1f91568a7..f1fd74596 100644 --- a/benches/generated/wrap_reverse_column_fixed_size.rs +++ b/benches/generated/wrap_reverse_column_fixed_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -72,8 +72,8 @@ pub fn compute() { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_reverse_row.rs b/benches/generated/wrap_reverse_row.rs index 35072aa24..4c79f16d4 100644 --- a/benches/generated/wrap_reverse_row.rs +++ b/benches/generated/wrap_reverse_row.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(31f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(32f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(33f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(34f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -56,7 +56,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/benches/generated/wrap_reverse_row_align_content_center.rs b/benches/generated/wrap_reverse_row_align_content_center.rs index 09c4b918b..8a3a16c85 100644 --- a/benches/generated/wrap_reverse_row_align_content_center.rs +++ b/benches/generated/wrap_reverse_row_align_content_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/benches/generated/wrap_reverse_row_align_content_flex_start.rs b/benches/generated/wrap_reverse_row_align_content_flex_start.rs index b7ba75700..5a877c1c8 100644 --- a/benches/generated/wrap_reverse_row_align_content_flex_start.rs +++ b/benches/generated/wrap_reverse_row_align_content_flex_start.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/benches/generated/wrap_reverse_row_align_content_space_around.rs b/benches/generated/wrap_reverse_row_align_content_space_around.rs index 28d0f5a5b..582f78d4c 100644 --- a/benches/generated/wrap_reverse_row_align_content_space_around.rs +++ b/benches/generated/wrap_reverse_row_align_content_space_around.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::SpaceAround, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/benches/generated/wrap_reverse_row_align_content_stretch.rs b/benches/generated/wrap_reverse_row_align_content_stretch.rs index a63187748..2719bd009 100644 --- a/benches/generated/wrap_reverse_row_align_content_stretch.rs +++ b/benches/generated/wrap_reverse_row_align_content_stretch.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -69,7 +69,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/benches/generated/wrap_reverse_row_single_line_different_size.rs b/benches/generated/wrap_reverse_row_single_line_different_size.rs index bd7d12f5b..730372884 100644 --- a/benches/generated/wrap_reverse_row_single_line_different_size.rs +++ b/benches/generated/wrap_reverse_row_single_line_different_size.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -56,8 +56,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(300f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/benches/generated/wrap_row.rs b/benches/generated/wrap_row.rs index 7063501c1..135c0dab7 100644 --- a/benches/generated/wrap_row.rs +++ b/benches/generated/wrap_row.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(31f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(32f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(33f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(34f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -56,7 +56,10 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/benches/generated/wrap_row_align_items_center.rs b/benches/generated/wrap_row_align_items_center.rs index eb06703fc..1be53d685 100644 --- a/benches/generated/wrap_row_align_items_center.rs +++ b/benches/generated/wrap_row_align_items_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -57,7 +57,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/benches/generated/wrap_row_align_items_flex_end.rs b/benches/generated/wrap_row_align_items_flex_end.rs index 53b93dc13..74f068705 100644 --- a/benches/generated/wrap_row_align_items_flex_end.rs +++ b/benches/generated/wrap_row_align_items_flex_end.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -30,8 +30,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -43,8 +43,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -57,7 +57,10 @@ pub fn compute() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/benches/generated/wrapped_column_max_height.rs b/benches/generated/wrapped_column_max_height.rs index f82e73524..8ae67be33 100644 --- a/benches/generated/wrapped_column_max_height.rs +++ b/benches/generated/wrapped_column_max_height.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -21,8 +21,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -41,8 +41,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -59,8 +59,8 @@ pub fn compute() { align_content: taffy::style::AlignContent::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(700f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrapped_column_max_height_flex.rs b/benches/generated/wrapped_column_max_height_flex.rs index 61ed42532..c7d53b82d 100644 --- a/benches/generated/wrapped_column_max_height_flex.rs +++ b/benches/generated/wrapped_column_max_height_flex.rs @@ -7,8 +7,8 @@ pub fn compute() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -27,8 +27,8 @@ pub fn compute() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -47,8 +47,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -65,8 +65,8 @@ pub fn compute() { align_content: taffy::style::AlignContent::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(700f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrapped_row_within_align_items_center.rs b/benches/generated/wrapped_row_within_align_items_center.rs index 7e79d6c47..15f3e8cb1 100644 --- a/benches/generated/wrapped_row_within_align_items_center.rs +++ b/benches/generated/wrapped_row_within_align_items_center.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -38,8 +38,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrapped_row_within_align_items_flex_end.rs b/benches/generated/wrapped_row_within_align_items_flex_end.rs index aef6576a7..74a714e11 100644 --- a/benches/generated/wrapped_row_within_align_items_flex_end.rs +++ b/benches/generated/wrapped_row_within_align_items_flex_end.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -38,8 +38,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrapped_row_within_align_items_flex_start.rs b/benches/generated/wrapped_row_within_align_items_flex_start.rs index 924a71057..ad7c22687 100644 --- a/benches/generated/wrapped_row_within_align_items_flex_start.rs +++ b/benches/generated/wrapped_row_within_align_items_flex_start.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -38,8 +38,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center.rs index 610e59536..29b8c9bb6 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_center() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ fn absolute_layout_align_items_and_justify_content_center() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs index 1546f99aa..d1f5eba49 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -25,8 +25,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs index 07a1bbe78..c85f71972 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), ..Default::default() }, @@ -22,8 +22,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs index d0f21a367..9edc6b161 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { end: taffy::style::Dimension::Points(5f32), ..Default::default() }, @@ -22,8 +22,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs index 033c2e356..57fa7b1e1 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -22,8 +22,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs b/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs index 97a234139..0c9318387 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_center.rs b/tests/generated/absolute_layout_align_items_center.rs index 7618f577a..c0db270a3 100644 --- a/tests/generated/absolute_layout_align_items_center.rs +++ b/tests/generated/absolute_layout_align_items_center.rs @@ -6,8 +6,8 @@ fn absolute_layout_align_items_center() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn absolute_layout_align_items_center() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_align_items_center_on_child_only.rs b/tests/generated/absolute_layout_align_items_center_on_child_only.rs index 5c3d39491..5b0659396 100644 --- a/tests/generated/absolute_layout_align_items_center_on_child_only.rs +++ b/tests/generated/absolute_layout_align_items_center_on_child_only.rs @@ -7,8 +7,8 @@ fn absolute_layout_align_items_center_on_child_only() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn absolute_layout_align_items_center_on_child_only() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_child_order.rs b/tests/generated/absolute_layout_child_order.rs index 8b15dbfd9..844566311 100644 --- a/tests/generated/absolute_layout_child_order.rs +++ b/tests/generated/absolute_layout_child_order.rs @@ -5,8 +5,8 @@ fn absolute_layout_child_order() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn absolute_layout_child_order() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ fn absolute_layout_child_order() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -47,8 +47,8 @@ fn absolute_layout_child_order() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs index 442dee530..35cccad83 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs @@ -6,8 +6,8 @@ fn absolute_layout_in_wrap_reverse_column_container() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ fn absolute_layout_in_wrap_reverse_column_container() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs index 60fded02e..67b0b1e18 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs @@ -7,8 +7,8 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -22,8 +22,8 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs index 0c0b044d4..0de8532eb 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs @@ -6,8 +6,8 @@ fn absolute_layout_in_wrap_reverse_row_container() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn absolute_layout_in_wrap_reverse_row_container() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs index 2d43f4f91..ed56b32f5 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs @@ -7,8 +7,8 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_justify_content_center.rs b/tests/generated/absolute_layout_justify_content_center.rs index 274aa60e4..cc823ff9a 100644 --- a/tests/generated/absolute_layout_justify_content_center.rs +++ b/tests/generated/absolute_layout_justify_content_center.rs @@ -6,8 +6,8 @@ fn absolute_layout_justify_content_center() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn absolute_layout_justify_content_center() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(110f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_no_size.rs b/tests/generated/absolute_layout_no_size.rs index c52e3f3aa..bbf1e0f07 100644 --- a/tests/generated/absolute_layout_no_size.rs +++ b/tests/generated/absolute_layout_no_size.rs @@ -11,8 +11,8 @@ fn absolute_layout_no_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs b/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs index 18c608d08..cdaad66c7 100644 --- a/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs +++ b/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs @@ -6,8 +6,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, @@ -21,8 +21,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -38,7 +38,10 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .new_with_children( taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), @@ -53,8 +56,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_start_top_end_bottom.rs b/tests/generated/absolute_layout_start_top_end_bottom.rs index e92e264cc..1fcb89f77 100644 --- a/tests/generated/absolute_layout_start_top_end_bottom.rs +++ b/tests/generated/absolute_layout_start_top_end_bottom.rs @@ -21,8 +21,8 @@ fn absolute_layout_start_top_end_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_width_height_end_bottom.rs b/tests/generated/absolute_layout_width_height_end_bottom.rs index f463030fc..a7dd2d758 100644 --- a/tests/generated/absolute_layout_width_height_end_bottom.rs +++ b/tests/generated/absolute_layout_width_height_end_bottom.rs @@ -6,8 +6,8 @@ fn absolute_layout_width_height_end_bottom() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -24,8 +24,8 @@ fn absolute_layout_width_height_end_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_width_height_start_top.rs b/tests/generated/absolute_layout_width_height_start_top.rs index 96d4e5f8f..c173f15e7 100644 --- a/tests/generated/absolute_layout_width_height_start_top.rs +++ b/tests/generated/absolute_layout_width_height_start_top.rs @@ -6,8 +6,8 @@ fn absolute_layout_width_height_start_top() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -24,8 +24,8 @@ fn absolute_layout_width_height_start_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs b/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs index f018c2e52..bf06dc1b5 100644 --- a/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs +++ b/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs @@ -6,8 +6,8 @@ fn absolute_layout_width_height_start_top_end_bottom() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -26,8 +26,8 @@ fn absolute_layout_width_height_start_top_end_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/absolute_layout_within_border.rs b/tests/generated/absolute_layout_within_border.rs index 0b8fd75dd..572242d68 100644 --- a/tests/generated/absolute_layout_within_border.rs +++ b/tests/generated/absolute_layout_within_border.rs @@ -6,8 +6,8 @@ fn absolute_layout_within_border() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -25,8 +25,8 @@ fn absolute_layout_within_border() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -44,8 +44,8 @@ fn absolute_layout_within_border() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -70,8 +70,8 @@ fn absolute_layout_within_border() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -95,8 +95,8 @@ fn absolute_layout_within_border() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/tests/generated/align_baseline.rs b/tests/generated/align_baseline.rs index 9dd10ee3b..ba64f336f 100644 --- a/tests/generated/align_baseline.rs +++ b/tests/generated/align_baseline.rs @@ -5,8 +5,8 @@ fn align_baseline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn align_baseline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ fn align_baseline() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_baseline_child_multiline.rs b/tests/generated/align_baseline_child_multiline.rs index 1029621b1..d7cc86bdf 100644 --- a/tests/generated/align_baseline_child_multiline.rs +++ b/tests/generated/align_baseline_child_multiline.rs @@ -5,8 +5,8 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(25f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[node10, node11, node12, node13], @@ -80,7 +83,10 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/align_baseline_nested_child.rs b/tests/generated/align_baseline_nested_child.rs index 22f89b98e..2d45864e7 100644 --- a/tests/generated/align_baseline_nested_child.rs +++ b/tests/generated/align_baseline_nested_child.rs @@ -5,8 +5,8 @@ fn align_baseline_nested_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn align_baseline_nested_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -32,8 +32,8 @@ fn align_baseline_nested_child() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -46,8 +46,8 @@ fn align_baseline_nested_child() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_center_should_size_based_on_content.rs b/tests/generated/align_center_should_size_based_on_content.rs index 95cd036f0..484fe0314 100644 --- a/tests/generated/align_center_should_size_based_on_content.rs +++ b/tests/generated/align_center_should_size_based_on_content.rs @@ -5,8 +5,8 @@ fn align_center_should_size_based_on_content() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ fn align_center_should_size_based_on_content() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_flex_start_with_shrinking_children.rs b/tests/generated/align_flex_start_with_shrinking_children.rs index 6541b9278..c460b09af 100644 --- a/tests/generated/align_flex_start_with_shrinking_children.rs +++ b/tests/generated/align_flex_start_with_shrinking_children.rs @@ -23,8 +23,8 @@ fn align_flex_start_with_shrinking_children() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs b/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs index 74fd444e0..77e8f845e 100644 --- a/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs +++ b/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs @@ -23,8 +23,8 @@ fn align_flex_start_with_shrinking_children_with_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_flex_start_with_stretching_children.rs b/tests/generated/align_flex_start_with_stretching_children.rs index 752f842d1..d5f1163e2 100644 --- a/tests/generated/align_flex_start_with_stretching_children.rs +++ b/tests/generated/align_flex_start_with_stretching_children.rs @@ -18,8 +18,8 @@ fn align_flex_start_with_stretching_children() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_center.rs b/tests/generated/align_items_center.rs index 134208baa..97fec1d5c 100644 --- a/tests/generated/align_items_center.rs +++ b/tests/generated/align_items_center.rs @@ -5,8 +5,8 @@ fn align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_items_center() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs b/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs index efced6fc2..f9663c446 100644 --- a/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn align_items_center_child_with_margin_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -31,8 +31,8 @@ fn align_items_center_child_with_margin_bigger_than_parent() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs index e5ad6a021..c66070a6c 100644 --- a/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn align_items_center_child_without_margin_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(70f32)), ..Default::default() }, ..Default::default() @@ -26,8 +26,8 @@ fn align_items_center_child_without_margin_bigger_than_parent() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_center_with_child_margin.rs b/tests/generated/align_items_center_with_child_margin.rs index 6b988c5fa..abe9e8b04 100644 --- a/tests/generated/align_items_center_with_child_margin.rs +++ b/tests/generated/align_items_center_with_child_margin.rs @@ -5,8 +5,8 @@ fn align_items_center_with_child_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -20,8 +20,8 @@ fn align_items_center_with_child_margin() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_center_with_child_top.rs b/tests/generated/align_items_center_with_child_top.rs index 93c91bbff..51ac29589 100644 --- a/tests/generated/align_items_center_with_child_top.rs +++ b/tests/generated/align_items_center_with_child_top.rs @@ -5,8 +5,8 @@ fn align_items_center_with_child_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -20,8 +20,8 @@ fn align_items_center_with_child_top() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_flex_end.rs b/tests/generated/align_items_flex_end.rs index 8afd08847..23cbfee6f 100644 --- a/tests/generated/align_items_flex_end.rs +++ b/tests/generated/align_items_flex_end.rs @@ -5,8 +5,8 @@ fn align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_items_flex_end() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs b/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs index f831dd474..c15acea0d 100644 --- a/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -31,8 +31,8 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs index ce0a63026..a905955f4 100644 --- a/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(70f32)), ..Default::default() }, ..Default::default() @@ -26,8 +26,8 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_flex_start.rs b/tests/generated/align_items_flex_start.rs index d18a55592..9be1b54e2 100644 --- a/tests/generated/align_items_flex_start.rs +++ b/tests/generated/align_items_flex_start.rs @@ -5,8 +5,8 @@ fn align_items_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_items_flex_start() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_items_min_max.rs b/tests/generated/align_items_min_max.rs index 1c2f0e753..2ddf99f85 100644 --- a/tests/generated/align_items_min_max.rs +++ b/tests/generated/align_items_min_max.rs @@ -5,8 +5,8 @@ fn align_items_min_max() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn align_items_min_max() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/align_items_stretch.rs b/tests/generated/align_items_stretch.rs index 73295c76c..880de3e37 100644 --- a/tests/generated/align_items_stretch.rs +++ b/tests/generated/align_items_stretch.rs @@ -4,7 +4,10 @@ fn align_items_stretch() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ fn align_items_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_self_baseline.rs b/tests/generated/align_self_baseline.rs index e9ebe2584..76e36846b 100644 --- a/tests/generated/align_self_baseline.rs +++ b/tests/generated/align_self_baseline.rs @@ -6,8 +6,8 @@ fn align_self_baseline() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_self_baseline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ fn align_self_baseline() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -46,8 +46,8 @@ fn align_self_baseline() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_self_center.rs b/tests/generated/align_self_center.rs index 177cc8a62..a0276139c 100644 --- a/tests/generated/align_self_center.rs +++ b/tests/generated/align_self_center.rs @@ -6,8 +6,8 @@ fn align_self_center() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_self_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_self_flex_end.rs b/tests/generated/align_self_flex_end.rs index 1d7e5fb74..9351bb510 100644 --- a/tests/generated/align_self_flex_end.rs +++ b/tests/generated/align_self_flex_end.rs @@ -6,8 +6,8 @@ fn align_self_flex_end() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_self_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_self_flex_end_override_flex_start.rs b/tests/generated/align_self_flex_end_override_flex_start.rs index fa14df87c..fd1041b14 100644 --- a/tests/generated/align_self_flex_end_override_flex_start.rs +++ b/tests/generated/align_self_flex_end_override_flex_start.rs @@ -6,8 +6,8 @@ fn align_self_flex_end_override_flex_start() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn align_self_flex_end_override_flex_start() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_self_flex_start.rs b/tests/generated/align_self_flex_start.rs index f1de33f4d..87a3eea49 100644 --- a/tests/generated/align_self_flex_start.rs +++ b/tests/generated/align_self_flex_start.rs @@ -6,8 +6,8 @@ fn align_self_flex_start() { taffy::style::FlexboxLayout { align_self: taffy::style::AlignSelf::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn align_self_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_strech_should_size_based_on_parent.rs b/tests/generated/align_strech_should_size_based_on_parent.rs index 6661165e5..b29c25280 100644 --- a/tests/generated/align_strech_should_size_based_on_parent.rs +++ b/tests/generated/align_strech_should_size_based_on_parent.rs @@ -5,8 +5,8 @@ fn align_strech_should_size_based_on_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ fn align_strech_should_size_based_on_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/border_center_child.rs b/tests/generated/border_center_child.rs index 71c04986a..28c26c5f5 100644 --- a/tests/generated/border_center_child.rs +++ b/tests/generated/border_center_child.rs @@ -5,8 +5,8 @@ fn border_center_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn border_center_child() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/tests/generated/border_flex_child.rs b/tests/generated/border_flex_child.rs index 46afe3e2d..e75c97298 100644 --- a/tests/generated/border_flex_child.rs +++ b/tests/generated/border_flex_child.rs @@ -5,7 +5,10 @@ fn border_flex_child() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,8 +18,8 @@ fn border_flex_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/tests/generated/border_stretch_child.rs b/tests/generated/border_stretch_child.rs index e11175463..5719576ed 100644 --- a/tests/generated/border_stretch_child.rs +++ b/tests/generated/border_stretch_child.rs @@ -4,7 +4,10 @@ fn border_stretch_child() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ fn border_stretch_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, border: taffy::geometry::Rect { diff --git a/tests/generated/child_min_max_width_flexing.rs b/tests/generated/child_min_max_width_flexing.rs index 3f2317c3a..b297fd296 100644 --- a/tests/generated/child_min_max_width_flexing.rs +++ b/tests/generated/child_min_max_width_flexing.rs @@ -29,8 +29,8 @@ fn child_min_max_width_flexing() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(120f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/container_with_unsized_child.rs b/tests/generated/container_with_unsized_child.rs index 0a3a3a95b..3b797e2c0 100644 --- a/tests/generated/container_with_unsized_child.rs +++ b/tests/generated/container_with_unsized_child.rs @@ -6,8 +6,8 @@ fn container_with_unsized_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/display_none.rs b/tests/generated/display_none.rs index 000913556..d93d0e701 100644 --- a/tests/generated/display_none.rs +++ b/tests/generated/display_none.rs @@ -13,8 +13,8 @@ fn display_none() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/display_none_fixed_size.rs b/tests/generated/display_none_fixed_size.rs index 24a844cbc..bc6c200a3 100644 --- a/tests/generated/display_none_fixed_size.rs +++ b/tests/generated/display_none_fixed_size.rs @@ -8,8 +8,8 @@ fn display_none_fixed_size() { taffy::style::FlexboxLayout { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -21,8 +21,8 @@ fn display_none_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/display_none_with_child.rs b/tests/generated/display_none_with_child.rs index cafc34d01..01f535709 100644 --- a/tests/generated/display_none_with_child.rs +++ b/tests/generated/display_none_with_child.rs @@ -18,7 +18,10 @@ fn display_none_with_child() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -52,8 +55,8 @@ fn display_none_with_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/display_none_with_margin.rs b/tests/generated/display_none_with_margin.rs index 03eb83e08..ea48561cd 100644 --- a/tests/generated/display_none_with_margin.rs +++ b/tests/generated/display_none_with_margin.rs @@ -6,8 +6,8 @@ fn display_none_with_margin() { taffy::style::FlexboxLayout { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -28,8 +28,8 @@ fn display_none_with_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/display_none_with_position.rs b/tests/generated/display_none_with_position.rs index 5d2fadbbd..164509d95 100644 --- a/tests/generated/display_none_with_position.rs +++ b/tests/generated/display_none_with_position.rs @@ -18,8 +18,8 @@ fn display_none_with_position() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs b/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs index a1f1659ef..b0655a869 100644 --- a/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs +++ b/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs @@ -7,8 +7,8 @@ fn flex_basis_and_main_dimen_set_when_flexing() { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -22,8 +22,8 @@ fn flex_basis_and_main_dimen_set_when_flexing() { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(0f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -34,7 +34,10 @@ fn flex_basis_and_main_dimen_set_when_flexing() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_flex_grow_column.rs b/tests/generated/flex_basis_flex_grow_column.rs index 9831b1794..c2278ed8e 100644 --- a/tests/generated/flex_basis_flex_grow_column.rs +++ b/tests/generated/flex_basis_flex_grow_column.rs @@ -18,8 +18,8 @@ fn flex_basis_flex_grow_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_flex_grow_row.rs b/tests/generated/flex_basis_flex_grow_row.rs index cc16842e2..badab4e9d 100644 --- a/tests/generated/flex_basis_flex_grow_row.rs +++ b/tests/generated/flex_basis_flex_grow_row.rs @@ -17,8 +17,8 @@ fn flex_basis_flex_grow_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_flex_shrink_column.rs b/tests/generated/flex_basis_flex_shrink_column.rs index 6fe6c85f8..0c60bdc71 100644 --- a/tests/generated/flex_basis_flex_shrink_column.rs +++ b/tests/generated/flex_basis_flex_shrink_column.rs @@ -18,8 +18,8 @@ fn flex_basis_flex_shrink_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_flex_shrink_row.rs b/tests/generated/flex_basis_flex_shrink_row.rs index 52b56b00d..c54f155d8 100644 --- a/tests/generated/flex_basis_flex_shrink_row.rs +++ b/tests/generated/flex_basis_flex_shrink_row.rs @@ -17,8 +17,8 @@ fn flex_basis_flex_shrink_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_larger_than_content_column.rs b/tests/generated/flex_basis_larger_than_content_column.rs index b6a8d7abb..ac36832f6 100644 --- a/tests/generated/flex_basis_larger_than_content_column.rs +++ b/tests/generated/flex_basis_larger_than_content_column.rs @@ -5,8 +5,8 @@ fn flex_basis_larger_than_content_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -28,7 +28,10 @@ fn flex_basis_larger_than_content_column() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_larger_than_content_row.rs b/tests/generated/flex_basis_larger_than_content_row.rs index f4d51b9e0..13be73f3b 100644 --- a/tests/generated/flex_basis_larger_than_content_row.rs +++ b/tests/generated/flex_basis_larger_than_content_row.rs @@ -5,8 +5,8 @@ fn flex_basis_larger_than_content_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -27,7 +27,10 @@ fn flex_basis_larger_than_content_row() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_overrides_main_size.rs b/tests/generated/flex_basis_overrides_main_size.rs index efcba0da8..e3c129cec 100644 --- a/tests/generated/flex_basis_overrides_main_size.rs +++ b/tests/generated/flex_basis_overrides_main_size.rs @@ -6,7 +6,10 @@ fn flex_basis_overrides_main_size() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn flex_basis_overrides_main_size() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn flex_basis_overrides_main_size() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -36,8 +45,8 @@ fn flex_basis_overrides_main_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs index d48f5a6c9..8d5277dbf 100644 --- a/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs @@ -5,8 +5,8 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -29,8 +29,8 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -52,7 +52,10 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_than_content_column.rs b/tests/generated/flex_basis_smaller_than_content_column.rs index 39973bc27..76f2795ec 100644 --- a/tests/generated/flex_basis_smaller_than_content_column.rs +++ b/tests/generated/flex_basis_smaller_than_content_column.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_than_content_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -28,7 +28,10 @@ fn flex_basis_smaller_than_content_column() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_content_row.rs b/tests/generated/flex_basis_smaller_than_content_row.rs index 4cb495ecb..85698a3fb 100644 --- a/tests/generated/flex_basis_smaller_than_content_row.rs +++ b/tests/generated/flex_basis_smaller_than_content_row.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_than_content_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -27,7 +27,10 @@ fn flex_basis_smaller_than_content_row() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs index 68775423c..d52ffa761 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs @@ -6,8 +6,8 @@ fn flex_basis_smaller_than_main_dimen_column() { taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn flex_basis_smaller_than_main_dimen_column() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs index 9dc2ffa22..a5f8f24cc 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs @@ -6,8 +6,8 @@ fn flex_basis_smaller_than_main_dimen_row() { taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ fn flex_basis_smaller_than_main_dimen_row() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs index 70eb24436..81546539b 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -29,8 +29,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -52,7 +52,10 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs index 12243ddd0..89457da15 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -29,8 +29,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -52,7 +52,10 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs index d9a77a88c..94dc97b6e 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -29,8 +29,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs index 7483202d8..c21694951 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs @@ -5,8 +5,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -29,8 +29,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -52,7 +52,10 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_unconstraint_column.rs b/tests/generated/flex_basis_unconstraint_column.rs index 68b88d414..ea436da64 100644 --- a/tests/generated/flex_basis_unconstraint_column.rs +++ b/tests/generated/flex_basis_unconstraint_column.rs @@ -5,7 +5,10 @@ fn flex_basis_unconstraint_column() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/tests/generated/flex_basis_unconstraint_row.rs b/tests/generated/flex_basis_unconstraint_row.rs index bad85ca0a..b196fdf63 100644 --- a/tests/generated/flex_basis_unconstraint_row.rs +++ b/tests/generated/flex_basis_unconstraint_row.rs @@ -5,7 +5,10 @@ fn flex_basis_unconstraint_row() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/tests/generated/flex_direction_column.rs b/tests/generated/flex_direction_column.rs index d14d38de5..9e954c4aa 100644 --- a/tests/generated/flex_direction_column.rs +++ b/tests/generated/flex_direction_column.rs @@ -4,7 +4,10 @@ fn flex_direction_column() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_column() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_column() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn flex_direction_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_direction_column_no_height.rs b/tests/generated/flex_direction_column_no_height.rs index 39a6dcb90..17ea1bb9f 100644 --- a/tests/generated/flex_direction_column_no_height.rs +++ b/tests/generated/flex_direction_column_no_height.rs @@ -4,7 +4,10 @@ fn flex_direction_column_no_height() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_column_no_height() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_column_no_height() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,7 +41,10 @@ fn flex_direction_column_no_height() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_direction_column_reverse.rs b/tests/generated/flex_direction_column_reverse.rs index f3e9934ba..f85bc59fd 100644 --- a/tests/generated/flex_direction_column_reverse.rs +++ b/tests/generated/flex_direction_column_reverse.rs @@ -4,7 +4,10 @@ fn flex_direction_column_reverse() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_column_reverse() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_column_reverse() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn flex_direction_column_reverse() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::ColumnReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_direction_row.rs b/tests/generated/flex_direction_row.rs index 4117f25a4..1159ca552 100644 --- a/tests/generated/flex_direction_row.rs +++ b/tests/generated/flex_direction_row.rs @@ -4,7 +4,10 @@ fn flex_direction_row() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_row() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_row() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ fn flex_direction_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_direction_row_no_width.rs b/tests/generated/flex_direction_row_no_width.rs index 7d9482f27..5b815a3b6 100644 --- a/tests/generated/flex_direction_row_no_width.rs +++ b/tests/generated/flex_direction_row_no_width.rs @@ -4,7 +4,10 @@ fn flex_direction_row_no_width() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_row_no_width() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_row_no_width() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -31,7 +40,10 @@ fn flex_direction_row_no_width() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_direction_row_reverse.rs b/tests/generated/flex_direction_row_reverse.rs index d169c9efb..2ea0bee8e 100644 --- a/tests/generated/flex_direction_row_reverse.rs +++ b/tests/generated/flex_direction_row_reverse.rs @@ -4,7 +4,10 @@ fn flex_direction_row_reverse() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_direction_row_reverse() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn flex_direction_row_reverse() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn flex_direction_row_reverse() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::RowReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_child.rs b/tests/generated/flex_grow_child.rs index 2e109bf9f..dc70b86c3 100644 --- a/tests/generated/flex_grow_child.rs +++ b/tests/generated/flex_grow_child.rs @@ -6,7 +6,10 @@ fn flex_grow_child() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/tests/generated/flex_grow_flex_basis_percent_min_max.rs b/tests/generated/flex_grow_flex_basis_percent_min_max.rs index d4dbe0f56..a669a6c87 100644 --- a/tests/generated/flex_grow_flex_basis_percent_min_max.rs +++ b/tests/generated/flex_grow_flex_basis_percent_min_max.rs @@ -7,7 +7,10 @@ fn flex_grow_flex_basis_percent_min_max() { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() }, @@ -21,8 +24,8 @@ fn flex_grow_flex_basis_percent_min_max() { flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -34,7 +37,10 @@ fn flex_grow_flex_basis_percent_min_max() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(120f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_height_maximized.rs b/tests/generated/flex_grow_height_maximized.rs index 7c2a10354..c5fcda742 100644 --- a/tests/generated/flex_grow_height_maximized.rs +++ b/tests/generated/flex_grow_height_maximized.rs @@ -14,7 +14,10 @@ fn flex_grow_height_maximized() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -43,8 +46,8 @@ fn flex_grow_height_maximized() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_in_at_most_container.rs b/tests/generated/flex_grow_in_at_most_container.rs index 5262b1d7a..258a603ed 100644 --- a/tests/generated/flex_grow_in_at_most_container.rs +++ b/tests/generated/flex_grow_in_at_most_container.rs @@ -17,8 +17,8 @@ fn flex_grow_in_at_most_container() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_less_than_factor_one.rs b/tests/generated/flex_grow_less_than_factor_one.rs index 6336d2815..f631605ed 100644 --- a/tests/generated/flex_grow_less_than_factor_one.rs +++ b/tests/generated/flex_grow_less_than_factor_one.rs @@ -28,8 +28,8 @@ fn flex_grow_less_than_factor_one() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_root_minimized.rs b/tests/generated/flex_grow_root_minimized.rs index 85b4b4407..198ee7f61 100644 --- a/tests/generated/flex_grow_root_minimized.rs +++ b/tests/generated/flex_grow_root_minimized.rs @@ -14,7 +14,10 @@ fn flex_grow_root_minimized() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -42,7 +45,10 @@ fn flex_grow_root_minimized() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_grow_shrink_at_most.rs b/tests/generated/flex_grow_shrink_at_most.rs index bcc47e095..4667216ff 100644 --- a/tests/generated/flex_grow_shrink_at_most.rs +++ b/tests/generated/flex_grow_shrink_at_most.rs @@ -12,8 +12,8 @@ fn flex_grow_shrink_at_most() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_to_min.rs b/tests/generated/flex_grow_to_min.rs index 62d89b18f..877d8c5fd 100644 --- a/tests/generated/flex_grow_to_min.rs +++ b/tests/generated/flex_grow_to_min.rs @@ -10,7 +10,10 @@ fn flex_grow_to_min() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -20,7 +23,10 @@ fn flex_grow_to_min() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_grow_within_constrained_max_column.rs b/tests/generated/flex_grow_within_constrained_max_column.rs index 46d29ebf8..5e474532b 100644 --- a/tests/generated/flex_grow_within_constrained_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_max_column.rs @@ -14,7 +14,10 @@ fn flex_grow_within_constrained_max_column() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -24,7 +27,10 @@ fn flex_grow_within_constrained_max_column() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_grow_within_constrained_max_row.rs b/tests/generated/flex_grow_within_constrained_max_row.rs index d8621f1d3..b595c0b12 100644 --- a/tests/generated/flex_grow_within_constrained_max_row.rs +++ b/tests/generated/flex_grow_within_constrained_max_row.rs @@ -14,7 +14,10 @@ fn flex_grow_within_constrained_max_row() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -23,7 +26,10 @@ fn flex_grow_within_constrained_max_row() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -37,7 +43,10 @@ fn flex_grow_within_constrained_max_row() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_grow_within_constrained_max_width.rs b/tests/generated/flex_grow_within_constrained_max_width.rs index 9ae4ae09d..c1da287a9 100644 --- a/tests/generated/flex_grow_within_constrained_max_width.rs +++ b/tests/generated/flex_grow_within_constrained_max_width.rs @@ -5,7 +5,10 @@ fn flex_grow_within_constrained_max_width() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -28,8 +31,8 @@ fn flex_grow_within_constrained_max_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_within_constrained_min_column.rs b/tests/generated/flex_grow_within_constrained_min_column.rs index 52e28efcf..6229f6eda 100644 --- a/tests/generated/flex_grow_within_constrained_min_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_column.rs @@ -6,7 +6,10 @@ fn flex_grow_within_constrained_min_column() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/tests/generated/flex_grow_within_constrained_min_max_column.rs b/tests/generated/flex_grow_within_constrained_min_max_column.rs index f626a8e86..e1585850a 100644 --- a/tests/generated/flex_grow_within_constrained_min_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_max_column.rs @@ -6,7 +6,10 @@ fn flex_grow_within_constrained_min_max_column() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], diff --git a/tests/generated/flex_grow_within_constrained_min_row.rs b/tests/generated/flex_grow_within_constrained_min_row.rs index 360963b96..81de0afa5 100644 --- a/tests/generated/flex_grow_within_constrained_min_row.rs +++ b/tests/generated/flex_grow_within_constrained_min_row.rs @@ -6,7 +6,10 @@ fn flex_grow_within_constrained_min_row() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,7 +18,10 @@ fn flex_grow_within_constrained_min_row() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_grow_within_max_width.rs b/tests/generated/flex_grow_within_max_width.rs index b7e89e8bc..883e06b3a 100644 --- a/tests/generated/flex_grow_within_max_width.rs +++ b/tests/generated/flex_grow_within_max_width.rs @@ -5,7 +5,10 @@ fn flex_grow_within_max_width() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -28,8 +31,8 @@ fn flex_grow_within_max_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_root_ignored.rs b/tests/generated/flex_root_ignored.rs index 9007b96e7..aab83e932 100644 --- a/tests/generated/flex_root_ignored.rs +++ b/tests/generated/flex_root_ignored.rs @@ -14,7 +14,10 @@ fn flex_root_ignored() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -24,7 +27,10 @@ fn flex_root_ignored() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs b/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs index 27ba85740..b599c6bf9 100644 --- a/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs +++ b/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs @@ -5,8 +5,8 @@ fn flex_shrink_by_outer_margin_with_max_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -19,7 +19,10 @@ fn flex_shrink_by_outer_margin_with_max_size() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(80f32), ..Default::default() diff --git a/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs b/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs index f3969ed71..fa93e1387 100644 --- a/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs +++ b/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs @@ -7,8 +7,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -22,8 +22,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { flex_grow: 1f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_shrink_flex_grow_row.rs b/tests/generated/flex_shrink_flex_grow_row.rs index d5dce82de..17b2450ff 100644 --- a/tests/generated/flex_shrink_flex_grow_row.rs +++ b/tests/generated/flex_shrink_flex_grow_row.rs @@ -7,8 +7,8 @@ fn flex_shrink_flex_grow_row() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -22,8 +22,8 @@ fn flex_shrink_flex_grow_row() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -35,8 +35,8 @@ fn flex_shrink_flex_grow_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_shrink_to_zero.rs b/tests/generated/flex_shrink_to_zero.rs index fbf3531a1..e0a546172 100644 --- a/tests/generated/flex_shrink_to_zero.rs +++ b/tests/generated/flex_shrink_to_zero.rs @@ -6,8 +6,8 @@ fn flex_shrink_to_zero() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn flex_shrink_to_zero() { taffy::style::FlexboxLayout { flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -34,8 +34,8 @@ fn flex_shrink_to_zero() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -46,7 +46,10 @@ fn flex_shrink_to_zero() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(75f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(75f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs index cc33c9719..53ca74724 100644 --- a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs +++ b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs @@ -4,7 +4,10 @@ fn flex_wrap_align_stretch_fits_one_row() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn flex_wrap_align_stretch_fits_one_row() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -24,8 +30,8 @@ fn flex_wrap_align_stretch_fits_one_row() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs index e23f7c493..805ef811a 100644 --- a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs +++ b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs @@ -5,7 +5,10 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, ..Default::default() }, @@ -16,7 +19,10 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .new_with_children( taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, ..Default::default() }, @@ -27,7 +33,10 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_wrap_wrap_to_child_height.rs b/tests/generated/flex_wrap_wrap_to_child_height.rs index e455d558e..5f89cf6b4 100644 --- a/tests/generated/flex_wrap_wrap_to_child_height.rs +++ b/tests/generated/flex_wrap_wrap_to_child_height.rs @@ -5,8 +5,8 @@ fn flex_wrap_wrap_to_child_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -18,7 +18,10 @@ fn flex_wrap_wrap_to_child_height() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node000], @@ -38,8 +41,8 @@ fn flex_wrap_wrap_to_child_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_center.rs b/tests/generated/justify_content_column_center.rs index d3f05cb16..47fb56f96 100644 --- a/tests/generated/justify_content_column_center.rs +++ b/tests/generated/justify_content_column_center.rs @@ -4,7 +4,10 @@ fn justify_content_column_center() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_center() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_center() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -34,8 +43,8 @@ fn justify_content_column_center() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_flex_end.rs b/tests/generated/justify_content_column_flex_end.rs index 32ebfd66a..7a57a3b8f 100644 --- a/tests/generated/justify_content_column_flex_end.rs +++ b/tests/generated/justify_content_column_flex_end.rs @@ -4,7 +4,10 @@ fn justify_content_column_flex_end() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_flex_end() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_flex_end() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -34,8 +43,8 @@ fn justify_content_column_flex_end() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_flex_start.rs b/tests/generated/justify_content_column_flex_start.rs index 39726c01b..30923a7f1 100644 --- a/tests/generated/justify_content_column_flex_start.rs +++ b/tests/generated/justify_content_column_flex_start.rs @@ -4,7 +4,10 @@ fn justify_content_column_flex_start() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_flex_start() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_flex_start() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_column_flex_start() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_min_height_and_margin_bottom.rs b/tests/generated/justify_content_column_min_height_and_margin_bottom.rs index 52659df79..23594acde 100644 --- a/tests/generated/justify_content_column_min_height_and_margin_bottom.rs +++ b/tests/generated/justify_content_column_min_height_and_margin_bottom.rs @@ -5,8 +5,8 @@ fn justify_content_column_min_height_and_margin_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/tests/generated/justify_content_column_min_height_and_margin_top.rs b/tests/generated/justify_content_column_min_height_and_margin_top.rs index 7e9b2a5d1..e800c2069 100644 --- a/tests/generated/justify_content_column_min_height_and_margin_top.rs +++ b/tests/generated/justify_content_column_min_height_and_margin_top.rs @@ -5,8 +5,8 @@ fn justify_content_column_min_height_and_margin_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/tests/generated/justify_content_column_space_around.rs b/tests/generated/justify_content_column_space_around.rs index 4aedb32a7..60b3b87d0 100644 --- a/tests/generated/justify_content_column_space_around.rs +++ b/tests/generated/justify_content_column_space_around.rs @@ -4,7 +4,10 @@ fn justify_content_column_space_around() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_space_around() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_space_around() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -34,8 +43,8 @@ fn justify_content_column_space_around() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_space_between.rs b/tests/generated/justify_content_column_space_between.rs index 24539949b..ed3fd5edd 100644 --- a/tests/generated/justify_content_column_space_between.rs +++ b/tests/generated/justify_content_column_space_between.rs @@ -4,7 +4,10 @@ fn justify_content_column_space_between() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_space_between() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_space_between() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -34,8 +43,8 @@ fn justify_content_column_space_between() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_column_space_evenly.rs b/tests/generated/justify_content_column_space_evenly.rs index cf7c86182..21e24a0c3 100644 --- a/tests/generated/justify_content_column_space_evenly.rs +++ b/tests/generated/justify_content_column_space_evenly.rs @@ -4,7 +4,10 @@ fn justify_content_column_space_evenly() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_column_space_evenly() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_column_space_evenly() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -34,8 +43,8 @@ fn justify_content_column_space_evenly() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_min_max.rs b/tests/generated/justify_content_min_max.rs index 212801fb0..69bec6da4 100644 --- a/tests/generated/justify_content_min_max.rs +++ b/tests/generated/justify_content_min_max.rs @@ -5,8 +5,8 @@ fn justify_content_min_max() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(60f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn justify_content_min_max() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs b/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs index 23e8da0e4..d909b9905 100644 --- a/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs +++ b/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs @@ -5,8 +5,8 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(300f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(300f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -38,8 +38,8 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1000f32), - height: taffy::style::Dimension::Points(1584f32), + width: Some(taffy::style::Dimension::Points(1000f32)), + height: Some(taffy::style::Dimension::Points(1584f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs b/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs index 2dc3fe0b3..abdb59ee5 100644 --- a/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs +++ b/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs @@ -5,8 +5,8 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(199f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(199f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -38,8 +38,8 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1080f32), - height: taffy::style::Dimension::Points(1584f32), + width: Some(taffy::style::Dimension::Points(1080f32)), + height: Some(taffy::style::Dimension::Points(1584f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_overflow_min_max.rs b/tests/generated/justify_content_overflow_min_max.rs index ffb25031a..8edb170a8 100644 --- a/tests/generated/justify_content_overflow_min_max.rs +++ b/tests/generated/justify_content_overflow_min_max.rs @@ -6,8 +6,8 @@ fn justify_content_overflow_min_max() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn justify_content_overflow_min_max() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -34,8 +34,8 @@ fn justify_content_overflow_min_max() { taffy::style::FlexboxLayout { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_center.rs b/tests/generated/justify_content_row_center.rs index 2b11ac561..d5f88b0ba 100644 --- a/tests/generated/justify_content_row_center.rs +++ b/tests/generated/justify_content_row_center.rs @@ -4,7 +4,10 @@ fn justify_content_row_center() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_center() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_center() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_row_center() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_flex_end.rs b/tests/generated/justify_content_row_flex_end.rs index 2fc811c31..64c2b43af 100644 --- a/tests/generated/justify_content_row_flex_end.rs +++ b/tests/generated/justify_content_row_flex_end.rs @@ -4,7 +4,10 @@ fn justify_content_row_flex_end() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_flex_end() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_flex_end() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_row_flex_end() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_flex_start.rs b/tests/generated/justify_content_row_flex_start.rs index 1c5397644..fd6aa30e3 100644 --- a/tests/generated/justify_content_row_flex_start.rs +++ b/tests/generated/justify_content_row_flex_start.rs @@ -4,7 +4,10 @@ fn justify_content_row_flex_start() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_flex_start() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_flex_start() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,8 +41,8 @@ fn justify_content_row_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_max_width_and_margin.rs b/tests/generated/justify_content_row_max_width_and_margin.rs index 778f8884d..e758cb818 100644 --- a/tests/generated/justify_content_row_max_width_and_margin.rs +++ b/tests/generated/justify_content_row_max_width_and_margin.rs @@ -5,8 +5,8 @@ fn justify_content_row_max_width_and_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -19,7 +19,10 @@ fn justify_content_row_max_width_and_margin() { .new_with_children( taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_min_width_and_margin.rs b/tests/generated/justify_content_row_min_width_and_margin.rs index 7d7bafefc..314237e4b 100644 --- a/tests/generated/justify_content_row_min_width_and_margin.rs +++ b/tests/generated/justify_content_row_min_width_and_margin.rs @@ -5,8 +5,8 @@ fn justify_content_row_min_width_and_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, diff --git a/tests/generated/justify_content_row_space_around.rs b/tests/generated/justify_content_row_space_around.rs index d67481d36..9129b89aa 100644 --- a/tests/generated/justify_content_row_space_around.rs +++ b/tests/generated/justify_content_row_space_around.rs @@ -4,7 +4,10 @@ fn justify_content_row_space_around() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_space_around() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_space_around() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_row_space_around() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_space_between.rs b/tests/generated/justify_content_row_space_between.rs index c0b45ff6d..dfa86dbcd 100644 --- a/tests/generated/justify_content_row_space_between.rs +++ b/tests/generated/justify_content_row_space_between.rs @@ -4,7 +4,10 @@ fn justify_content_row_space_between() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_space_between() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_space_between() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_row_space_between() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_space_evenly.rs b/tests/generated/justify_content_row_space_evenly.rs index 864f8d90c..6d57057e8 100644 --- a/tests/generated/justify_content_row_space_evenly.rs +++ b/tests/generated/justify_content_row_space_evenly.rs @@ -4,7 +4,10 @@ fn justify_content_row_space_evenly() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn justify_content_row_space_evenly() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -22,7 +28,10 @@ fn justify_content_row_space_evenly() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -33,8 +42,8 @@ fn justify_content_row_space_evenly() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_and_flex_column.rs b/tests/generated/margin_and_flex_column.rs index b98a31387..a5f685cf7 100644 --- a/tests/generated/margin_and_flex_column.rs +++ b/tests/generated/margin_and_flex_column.rs @@ -20,8 +20,8 @@ fn margin_and_flex_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_and_flex_row.rs b/tests/generated/margin_and_flex_row.rs index 671cdc285..6aa599124 100644 --- a/tests/generated/margin_and_flex_row.rs +++ b/tests/generated/margin_and_flex_row.rs @@ -19,8 +19,8 @@ fn margin_and_flex_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_and_stretch_column.rs b/tests/generated/margin_and_stretch_column.rs index 2966e1044..74b558013 100644 --- a/tests/generated/margin_and_stretch_column.rs +++ b/tests/generated/margin_and_stretch_column.rs @@ -20,8 +20,8 @@ fn margin_and_stretch_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_and_stretch_row.rs b/tests/generated/margin_and_stretch_row.rs index 7b90aa530..9326bf7d6 100644 --- a/tests/generated/margin_and_stretch_row.rs +++ b/tests/generated/margin_and_stretch_row.rs @@ -19,8 +19,8 @@ fn margin_and_stretch_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_bottom.rs b/tests/generated/margin_auto_bottom.rs index b5de799bd..7d979b1d4 100644 --- a/tests/generated/margin_auto_bottom.rs +++ b/tests/generated/margin_auto_bottom.rs @@ -5,8 +5,8 @@ fn margin_auto_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_bottom() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ fn margin_auto_bottom() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_bottom_and_top.rs b/tests/generated/margin_auto_bottom_and_top.rs index 9a46cd216..0dbb5bf9e 100644 --- a/tests/generated/margin_auto_bottom_and_top.rs +++ b/tests/generated/margin_auto_bottom_and_top.rs @@ -5,8 +5,8 @@ fn margin_auto_bottom_and_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_bottom_and_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ fn margin_auto_bottom_and_top() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_bottom_and_top_justify_center.rs b/tests/generated/margin_auto_bottom_and_top_justify_center.rs index 2034d6902..4dec6ec49 100644 --- a/tests/generated/margin_auto_bottom_and_top_justify_center.rs +++ b/tests/generated/margin_auto_bottom_and_top_justify_center.rs @@ -5,8 +5,8 @@ fn margin_auto_bottom_and_top_justify_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_bottom_and_top_justify_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ fn margin_auto_bottom_and_top_justify_center() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left.rs b/tests/generated/margin_auto_left.rs index ca503d944..59cffd74c 100644 --- a/tests/generated/margin_auto_left.rs +++ b/tests/generated/margin_auto_left.rs @@ -5,8 +5,8 @@ fn margin_auto_left() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_left() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ fn margin_auto_left() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_and_right.rs b/tests/generated/margin_auto_left_and_right.rs index 4fdeabb98..da635c66c 100644 --- a/tests/generated/margin_auto_left_and_right.rs +++ b/tests/generated/margin_auto_left_and_right.rs @@ -5,8 +5,8 @@ fn margin_auto_left_and_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_left_and_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ fn margin_auto_left_and_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_and_right_column.rs b/tests/generated/margin_auto_left_and_right_column.rs index 475c5e2f4..59c862466 100644 --- a/tests/generated/margin_auto_left_and_right_column.rs +++ b/tests/generated/margin_auto_left_and_right_column.rs @@ -5,8 +5,8 @@ fn margin_auto_left_and_right_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_left_and_right_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ fn margin_auto_left_and_right_column() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_and_right_column_and_center.rs b/tests/generated/margin_auto_left_and_right_column_and_center.rs index 7b078ad2d..36a9aaf3f 100644 --- a/tests/generated/margin_auto_left_and_right_column_and_center.rs +++ b/tests/generated/margin_auto_left_and_right_column_and_center.rs @@ -5,8 +5,8 @@ fn margin_auto_left_and_right_column_and_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_left_and_right_column_and_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ fn margin_auto_left_and_right_column_and_center() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_and_right_strech.rs b/tests/generated/margin_auto_left_and_right_strech.rs index 6511948ce..7c80ee57b 100644 --- a/tests/generated/margin_auto_left_and_right_strech.rs +++ b/tests/generated/margin_auto_left_and_right_strech.rs @@ -5,8 +5,8 @@ fn margin_auto_left_and_right_strech() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_left_and_right_strech() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ fn margin_auto_left_and_right_strech() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_child_bigger_than_parent.rs index feb672407..b2a750a97 100644 --- a/tests/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_child_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn margin_auto_left_child_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, @@ -20,8 +20,8 @@ fn margin_auto_left_child_bigger_than_parent() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs index 02fea8631..ac7669415 100644 --- a/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -24,8 +24,8 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs index e71536d78..fb4a61ce4 100644 --- a/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn margin_auto_left_right_child_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -24,8 +24,8 @@ fn margin_auto_left_right_child_bigger_than_parent() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left_stretching_child.rs b/tests/generated/margin_auto_left_stretching_child.rs index c632a824b..6de32b590 100644 --- a/tests/generated/margin_auto_left_stretching_child.rs +++ b/tests/generated/margin_auto_left_stretching_child.rs @@ -17,8 +17,8 @@ fn margin_auto_left_stretching_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn margin_auto_left_stretching_child() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_mutiple_children_column.rs b/tests/generated/margin_auto_mutiple_children_column.rs index 22f93a94d..d49d681b2 100644 --- a/tests/generated/margin_auto_mutiple_children_column.rs +++ b/tests/generated/margin_auto_mutiple_children_column.rs @@ -5,8 +5,8 @@ fn margin_auto_mutiple_children_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_mutiple_children_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -33,8 +33,8 @@ fn margin_auto_mutiple_children_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -48,8 +48,8 @@ fn margin_auto_mutiple_children_column() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_mutiple_children_row.rs b/tests/generated/margin_auto_mutiple_children_row.rs index 499f33a84..0c9d63ffc 100644 --- a/tests/generated/margin_auto_mutiple_children_row.rs +++ b/tests/generated/margin_auto_mutiple_children_row.rs @@ -5,8 +5,8 @@ fn margin_auto_mutiple_children_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_mutiple_children_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -33,8 +33,8 @@ fn margin_auto_mutiple_children_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -47,8 +47,8 @@ fn margin_auto_mutiple_children_row() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_right.rs b/tests/generated/margin_auto_right.rs index c0a696325..e79951813 100644 --- a/tests/generated/margin_auto_right.rs +++ b/tests/generated/margin_auto_right.rs @@ -5,8 +5,8 @@ fn margin_auto_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ fn margin_auto_right() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_top.rs b/tests/generated/margin_auto_top.rs index d21ca6bf2..cc00d0107 100644 --- a/tests/generated/margin_auto_top.rs +++ b/tests/generated/margin_auto_top.rs @@ -5,8 +5,8 @@ fn margin_auto_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Auto, ..Default::default() }, @@ -19,8 +19,8 @@ fn margin_auto_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -33,8 +33,8 @@ fn margin_auto_top() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_top_and_bottom_strech.rs b/tests/generated/margin_auto_top_and_bottom_strech.rs index 1834be931..06c0e7509 100644 --- a/tests/generated/margin_auto_top_and_bottom_strech.rs +++ b/tests/generated/margin_auto_top_and_bottom_strech.rs @@ -5,8 +5,8 @@ fn margin_auto_top_and_bottom_strech() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn margin_auto_top_and_bottom_strech() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -37,8 +37,8 @@ fn margin_auto_top_and_bottom_strech() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_top_stretching_child.rs b/tests/generated/margin_auto_top_stretching_child.rs index 8c079cb23..ab58a7876 100644 --- a/tests/generated/margin_auto_top_stretching_child.rs +++ b/tests/generated/margin_auto_top_stretching_child.rs @@ -17,8 +17,8 @@ fn margin_auto_top_stretching_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn margin_auto_top_stretching_child() { taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_bottom.rs b/tests/generated/margin_bottom.rs index c98be74a8..e2d7fc17b 100644 --- a/tests/generated/margin_bottom.rs +++ b/tests/generated/margin_bottom.rs @@ -4,7 +4,10 @@ fn margin_bottom() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -17,8 +20,8 @@ fn margin_bottom() { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs b/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs index 89962ee23..e0c8da2d9 100644 --- a/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs +++ b/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs @@ -5,8 +5,8 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: Some(taffy::style::Dimension::Points(72f32)), + height: Some(taffy::style::Dimension::Points(72f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -24,8 +24,8 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: Some(taffy::style::Dimension::Points(52f32)), + height: Some(taffy::style::Dimension::Points(52f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_left.rs b/tests/generated/margin_left.rs index 91e0ce223..83542e6b0 100644 --- a/tests/generated/margin_left.rs +++ b/tests/generated/margin_left.rs @@ -4,7 +4,10 @@ fn margin_left() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -15,8 +18,8 @@ fn margin_left() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_right.rs b/tests/generated/margin_right.rs index 8903b7abc..8e83dce60 100644 --- a/tests/generated/margin_right.rs +++ b/tests/generated/margin_right.rs @@ -4,7 +4,10 @@ fn margin_right() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -16,8 +19,8 @@ fn margin_right() { taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_should_not_be_part_of_max_height.rs b/tests/generated/margin_should_not_be_part_of_max_height.rs index 7e5361f7e..b0bead084 100644 --- a/tests/generated/margin_should_not_be_part_of_max_height.rs +++ b/tests/generated/margin_should_not_be_part_of_max_height.rs @@ -5,8 +5,8 @@ fn margin_should_not_be_part_of_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -23,8 +23,8 @@ fn margin_should_not_be_part_of_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: Some(taffy::style::Dimension::Points(250f32)), + height: Some(taffy::style::Dimension::Points(250f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_should_not_be_part_of_max_width.rs b/tests/generated/margin_should_not_be_part_of_max_width.rs index 8a94264df..4dc14fb4b 100644 --- a/tests/generated/margin_should_not_be_part_of_max_width.rs +++ b/tests/generated/margin_should_not_be_part_of_max_width.rs @@ -5,8 +5,8 @@ fn margin_should_not_be_part_of_max_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -23,8 +23,8 @@ fn margin_should_not_be_part_of_max_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: Some(taffy::style::Dimension::Points(250f32)), + height: Some(taffy::style::Dimension::Points(250f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_top.rs b/tests/generated/margin_top.rs index 37b6438c6..04b3780ca 100644 --- a/tests/generated/margin_top.rs +++ b/tests/generated/margin_top.rs @@ -4,7 +4,10 @@ fn margin_top() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -16,8 +19,8 @@ fn margin_top() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_with_sibling_column.rs b/tests/generated/margin_with_sibling_column.rs index 81bba7b1d..10da8c2a3 100644 --- a/tests/generated/margin_with_sibling_column.rs +++ b/tests/generated/margin_with_sibling_column.rs @@ -18,8 +18,8 @@ fn margin_with_sibling_column() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_with_sibling_row.rs b/tests/generated/margin_with_sibling_row.rs index c9475b8d0..2f4396db2 100644 --- a/tests/generated/margin_with_sibling_row.rs +++ b/tests/generated/margin_with_sibling_row.rs @@ -17,8 +17,8 @@ fn margin_with_sibling_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/max_height.rs b/tests/generated/max_height.rs index ac56d96b0..a9660a465 100644 --- a/tests/generated/max_height.rs +++ b/tests/generated/max_height.rs @@ -4,7 +4,10 @@ fn max_height() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -18,8 +21,8 @@ fn max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/max_height_overrides_height.rs b/tests/generated/max_height_overrides_height.rs index 98c934930..4508b6455 100644 --- a/tests/generated/max_height_overrides_height.rs +++ b/tests/generated/max_height_overrides_height.rs @@ -4,7 +4,10 @@ fn max_height_overrides_height() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/max_height_overrides_height_on_root.rs b/tests/generated/max_height_overrides_height_on_root.rs index 41568816a..16e6e87b8 100644 --- a/tests/generated/max_height_overrides_height_on_root.rs +++ b/tests/generated/max_height_overrides_height_on_root.rs @@ -4,7 +4,10 @@ fn max_height_overrides_height_on_root() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/max_width.rs b/tests/generated/max_width.rs index 445c263eb..b3afb893a 100644 --- a/tests/generated/max_width.rs +++ b/tests/generated/max_width.rs @@ -4,7 +4,10 @@ fn max_width() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -16,8 +19,8 @@ fn max_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/max_width_overrides_width.rs b/tests/generated/max_width_overrides_width.rs index eca6bd279..199635dc2 100644 --- a/tests/generated/max_width_overrides_width.rs +++ b/tests/generated/max_width_overrides_width.rs @@ -4,7 +4,10 @@ fn max_width_overrides_width() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/max_width_overrides_width_on_root.rs b/tests/generated/max_width_overrides_width_on_root.rs index 5726f3649..34faf992f 100644 --- a/tests/generated/max_width_overrides_width_on_root.rs +++ b/tests/generated/max_width_overrides_width_on_root.rs @@ -4,7 +4,10 @@ fn max_width_overrides_width_on_root() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/min_height.rs b/tests/generated/min_height.rs index 77fdd9471..276e643db 100644 --- a/tests/generated/min_height.rs +++ b/tests/generated/min_height.rs @@ -21,8 +21,8 @@ fn min_height() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/min_height_overrides_height.rs b/tests/generated/min_height_overrides_height.rs index 7daa7aa7b..9ed35106c 100644 --- a/tests/generated/min_height_overrides_height.rs +++ b/tests/generated/min_height_overrides_height.rs @@ -4,7 +4,10 @@ fn min_height_overrides_height() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/min_height_overrides_height_on_root.rs b/tests/generated/min_height_overrides_height_on_root.rs index 94ae666a1..1994b7615 100644 --- a/tests/generated/min_height_overrides_height_on_root.rs +++ b/tests/generated/min_height_overrides_height_on_root.rs @@ -4,7 +4,10 @@ fn min_height_overrides_height_on_root() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/min_max_percent_no_width_height.rs b/tests/generated/min_max_percent_no_width_height.rs index 0f98df176..e9e4024af 100644 --- a/tests/generated/min_max_percent_no_width_height.rs +++ b/tests/generated/min_max_percent_no_width_height.rs @@ -25,8 +25,8 @@ fn min_max_percent_no_width_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/min_width.rs b/tests/generated/min_width.rs index 83b877818..f8ae9959a 100644 --- a/tests/generated/min_width.rs +++ b/tests/generated/min_width.rs @@ -17,8 +17,8 @@ fn min_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/min_width_overrides_width.rs b/tests/generated/min_width_overrides_width.rs index ce9be599b..fd28d85c4 100644 --- a/tests/generated/min_width_overrides_width.rs +++ b/tests/generated/min_width_overrides_width.rs @@ -4,7 +4,10 @@ fn min_width_overrides_width() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/min_width_overrides_width_on_root.rs b/tests/generated/min_width_overrides_width_on_root.rs index c45ea3a42..9c2ca8615 100644 --- a/tests/generated/min_width_overrides_width_on_root.rs +++ b/tests/generated/min_width_overrides_width_on_root.rs @@ -4,7 +4,10 @@ fn min_width_overrides_width_on_root() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50f32)), + ..Default::default() + }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/nested_overflowing_child.rs b/tests/generated/nested_overflowing_child.rs index 4515cf275..7b6e12032 100644 --- a/tests/generated/nested_overflowing_child.rs +++ b/tests/generated/nested_overflowing_child.rs @@ -5,8 +5,8 @@ fn nested_overflowing_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn nested_overflowing_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/nested_overflowing_child_in_constraint_parent.rs b/tests/generated/nested_overflowing_child_in_constraint_parent.rs index ca84c3ff9..de30cd7c9 100644 --- a/tests/generated/nested_overflowing_child_in_constraint_parent.rs +++ b/tests/generated/nested_overflowing_child_in_constraint_parent.rs @@ -5,8 +5,8 @@ fn nested_overflowing_child_in_constraint_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn nested_overflowing_child_in_constraint_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn nested_overflowing_child_in_constraint_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/overflow_cross_axis.rs b/tests/generated/overflow_cross_axis.rs index c9fc72e0a..885999654 100644 --- a/tests/generated/overflow_cross_axis.rs +++ b/tests/generated/overflow_cross_axis.rs @@ -5,8 +5,8 @@ fn overflow_cross_axis() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn overflow_cross_axis() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/overflow_main_axis.rs b/tests/generated/overflow_main_axis.rs index 66b16c11a..ea89c35f4 100644 --- a/tests/generated/overflow_main_axis.rs +++ b/tests/generated/overflow_main_axis.rs @@ -5,7 +5,10 @@ fn overflow_main_axis() { .new_with_children( taffy::style::FlexboxLayout { flex_shrink: 0f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,8 +18,8 @@ fn overflow_main_axis() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/padding_align_end_child.rs b/tests/generated/padding_align_end_child.rs index c224ef229..b3a975708 100644 --- a/tests/generated/padding_align_end_child.rs +++ b/tests/generated/padding_align_end_child.rs @@ -5,8 +5,8 @@ fn padding_align_end_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { @@ -27,8 +27,8 @@ fn padding_align_end_child() { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/padding_center_child.rs b/tests/generated/padding_center_child.rs index 056eae758..67ddbabfc 100644 --- a/tests/generated/padding_center_child.rs +++ b/tests/generated/padding_center_child.rs @@ -5,8 +5,8 @@ fn padding_center_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -20,8 +20,8 @@ fn padding_center_child() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/tests/generated/padding_flex_child.rs b/tests/generated/padding_flex_child.rs index 3ea358a9e..c38d7103f 100644 --- a/tests/generated/padding_flex_child.rs +++ b/tests/generated/padding_flex_child.rs @@ -5,7 +5,10 @@ fn padding_flex_child() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -15,8 +18,8 @@ fn padding_flex_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/tests/generated/padding_stretch_child.rs b/tests/generated/padding_stretch_child.rs index ce6e1fb1d..5f48d63fe 100644 --- a/tests/generated/padding_stretch_child.rs +++ b/tests/generated/padding_stretch_child.rs @@ -4,7 +4,10 @@ fn padding_stretch_child() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -14,8 +17,8 @@ fn padding_stretch_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/tests/generated/parent_wrap_child_size_overflowing_parent.rs b/tests/generated/parent_wrap_child_size_overflowing_parent.rs index 4c9e9242a..ca66974e2 100644 --- a/tests/generated/parent_wrap_child_size_overflowing_parent.rs +++ b/tests/generated/parent_wrap_child_size_overflowing_parent.rs @@ -5,8 +5,8 @@ fn parent_wrap_child_size_overflowing_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() @@ -17,7 +17,10 @@ fn parent_wrap_child_size_overflowing_parent() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -27,8 +30,8 @@ fn parent_wrap_child_size_overflowing_parent() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percent_absolute_position.rs b/tests/generated/percent_absolute_position.rs index 43eddf582..16d41998d 100644 --- a/tests/generated/percent_absolute_position.rs +++ b/tests/generated/percent_absolute_position.rs @@ -4,7 +4,10 @@ fn percent_absolute_position() { let node00 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn percent_absolute_position() { let node01 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -24,8 +30,8 @@ fn percent_absolute_position() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Percent(1f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -42,8 +48,8 @@ fn percent_absolute_position() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(60f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percent_within_flex_grow.rs b/tests/generated/percent_within_flex_grow.rs index 52c0e9079..099ccb2bc 100644 --- a/tests/generated/percent_within_flex_grow.rs +++ b/tests/generated/percent_within_flex_grow.rs @@ -4,7 +4,10 @@ fn percent_within_flex_grow() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -13,7 +16,10 @@ fn percent_within_flex_grow() { let node10 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -32,7 +38,10 @@ fn percent_within_flex_grow() { let node2 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -42,8 +51,8 @@ fn percent_within_flex_grow() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(350f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(350f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_absolute_position.rs b/tests/generated/percentage_absolute_position.rs index 4fd8b7f5f..7fbb05fb8 100644 --- a/tests/generated/percentage_absolute_position.rs +++ b/tests/generated/percentage_absolute_position.rs @@ -6,8 +6,8 @@ fn percentage_absolute_position() { taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -25,8 +25,8 @@ fn percentage_absolute_position() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_container_in_wrapping_container.rs b/tests/generated/percentage_container_in_wrapping_container.rs index 155dd61df..bf4f12359 100644 --- a/tests/generated/percentage_container_in_wrapping_container.rs +++ b/tests/generated/percentage_container_in_wrapping_container.rs @@ -5,8 +5,8 @@ fn percentage_container_in_wrapping_container() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn percentage_container_in_wrapping_container() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(50f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -31,7 +31,10 @@ fn percentage_container_in_wrapping_container() { .new_with_children( taffy::style::FlexboxLayout { justify_content: taffy::style::JustifyContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(1f32)), + ..Default::default() + }, ..Default::default() }, &[node000, node001], @@ -50,8 +53,8 @@ fn percentage_container_in_wrapping_container() { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis.rs b/tests/generated/percentage_flex_basis.rs index 0438d18d9..e7d4d59e1 100644 --- a/tests/generated/percentage_flex_basis.rs +++ b/tests/generated/percentage_flex_basis.rs @@ -25,8 +25,8 @@ fn percentage_flex_basis() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_cross.rs b/tests/generated/percentage_flex_basis_cross.rs index 60ac6fdcf..567b4fa0a 100644 --- a/tests/generated/percentage_flex_basis_cross.rs +++ b/tests/generated/percentage_flex_basis_cross.rs @@ -26,8 +26,8 @@ fn percentage_flex_basis_cross() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_cross_max_height.rs b/tests/generated/percentage_flex_basis_cross_max_height.rs index 899873792..3dd034121 100644 --- a/tests/generated/percentage_flex_basis_cross_max_height.rs +++ b/tests/generated/percentage_flex_basis_cross_max_height.rs @@ -34,8 +34,8 @@ fn percentage_flex_basis_cross_max_height() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_cross_max_width.rs b/tests/generated/percentage_flex_basis_cross_max_width.rs index a0b4c8216..823f410b0 100644 --- a/tests/generated/percentage_flex_basis_cross_max_width.rs +++ b/tests/generated/percentage_flex_basis_cross_max_width.rs @@ -34,8 +34,8 @@ fn percentage_flex_basis_cross_max_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_cross_min_height.rs b/tests/generated/percentage_flex_basis_cross_min_height.rs index 7dbb75119..3457a81b3 100644 --- a/tests/generated/percentage_flex_basis_cross_min_height.rs +++ b/tests/generated/percentage_flex_basis_cross_min_height.rs @@ -32,8 +32,8 @@ fn percentage_flex_basis_cross_min_height() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_cross_min_width.rs b/tests/generated/percentage_flex_basis_cross_min_width.rs index fa4c28826..a6fd51178 100644 --- a/tests/generated/percentage_flex_basis_cross_min_width.rs +++ b/tests/generated/percentage_flex_basis_cross_min_width.rs @@ -34,8 +34,8 @@ fn percentage_flex_basis_cross_min_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_main_max_height.rs b/tests/generated/percentage_flex_basis_main_max_height.rs index 6e41bfdb9..e52ac5a99 100644 --- a/tests/generated/percentage_flex_basis_main_max_height.rs +++ b/tests/generated/percentage_flex_basis_main_max_height.rs @@ -33,8 +33,8 @@ fn percentage_flex_basis_main_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_main_max_width.rs b/tests/generated/percentage_flex_basis_main_max_width.rs index fbc2634dc..37698ff15 100644 --- a/tests/generated/percentage_flex_basis_main_max_width.rs +++ b/tests/generated/percentage_flex_basis_main_max_width.rs @@ -33,8 +33,8 @@ fn percentage_flex_basis_main_max_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_flex_basis_main_min_width.rs b/tests/generated/percentage_flex_basis_main_min_width.rs index e625bf832..12cccacef 100644 --- a/tests/generated/percentage_flex_basis_main_min_width.rs +++ b/tests/generated/percentage_flex_basis_main_min_width.rs @@ -33,8 +33,8 @@ fn percentage_flex_basis_main_min_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_margin_should_calculate_based_only_on_width.rs b/tests/generated/percentage_margin_should_calculate_based_only_on_width.rs index 157f98e78..5ee02638e 100644 --- a/tests/generated/percentage_margin_should_calculate_based_only_on_width.rs +++ b/tests/generated/percentage_margin_should_calculate_based_only_on_width.rs @@ -5,8 +5,8 @@ fn percentage_margin_should_calculate_based_only_on_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ fn percentage_margin_should_calculate_based_only_on_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs b/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs index d47cfe232..b9c035df9 100644 --- a/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs +++ b/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs @@ -4,7 +4,10 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { let node000 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.45f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(0.45f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Percent(0.05f32), end: taffy::style::Dimension::Percent(0.05f32), @@ -28,7 +31,10 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { .new_with_children( taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Percent(0.5f32)), + ..Default::default() + }, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), end: taffy::style::Dimension::Points(5f32), @@ -96,8 +102,8 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs b/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs index 0c07f0ce5..85c379643 100644 --- a/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs +++ b/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs @@ -5,8 +5,8 @@ fn percentage_padding_should_calculate_based_only_on_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -36,8 +36,8 @@ fn percentage_padding_should_calculate_based_only_on_width() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_position_bottom_right.rs b/tests/generated/percentage_position_bottom_right.rs index 3ccf7a33e..d2ba21d4b 100644 --- a/tests/generated/percentage_position_bottom_right.rs +++ b/tests/generated/percentage_position_bottom_right.rs @@ -5,8 +5,8 @@ fn percentage_position_bottom_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.55f32), - height: taffy::style::Dimension::Percent(0.15f32), + width: Some(taffy::style::Dimension::Percent(0.55f32)), + height: Some(taffy::style::Dimension::Percent(0.15f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn percentage_position_bottom_right() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_position_left_top.rs b/tests/generated/percentage_position_left_top.rs index f273f872a..a49a1218b 100644 --- a/tests/generated/percentage_position_left_top.rs +++ b/tests/generated/percentage_position_left_top.rs @@ -5,8 +5,8 @@ fn percentage_position_left_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.45f32), - height: taffy::style::Dimension::Percent(0.55f32), + width: Some(taffy::style::Dimension::Percent(0.45f32)), + height: Some(taffy::style::Dimension::Percent(0.55f32)), ..Default::default() }, position: taffy::geometry::Rect { @@ -23,8 +23,8 @@ fn percentage_position_left_top() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(400f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_size_based_on_parent_inner_size.rs b/tests/generated/percentage_size_based_on_parent_inner_size.rs index 79b9d1180..fd299e228 100644 --- a/tests/generated/percentage_size_based_on_parent_inner_size.rs +++ b/tests/generated/percentage_size_based_on_parent_inner_size.rs @@ -5,8 +5,8 @@ fn percentage_size_based_on_parent_inner_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.5f32), - height: taffy::style::Dimension::Percent(0.5f32), + width: Some(taffy::style::Dimension::Percent(0.5f32)), + height: Some(taffy::style::Dimension::Percent(0.5f32)), ..Default::default() }, ..Default::default() @@ -19,8 +19,8 @@ fn percentage_size_based_on_parent_inner_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, padding: taffy::geometry::Rect { diff --git a/tests/generated/percentage_size_of_flex_basis.rs b/tests/generated/percentage_size_of_flex_basis.rs index 03037f06a..bad751e6c 100644 --- a/tests/generated/percentage_size_of_flex_basis.rs +++ b/tests/generated/percentage_size_of_flex_basis.rs @@ -5,8 +5,8 @@ fn percentage_size_of_flex_basis() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Percent(1f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -23,7 +23,10 @@ fn percentage_size_of_flex_basis() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0], diff --git a/tests/generated/percentage_width_height.rs b/tests/generated/percentage_width_height.rs index 544a9c813..8f6b385f4 100644 --- a/tests/generated/percentage_width_height.rs +++ b/tests/generated/percentage_width_height.rs @@ -5,8 +5,8 @@ fn percentage_width_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.3f32), - height: taffy::style::Dimension::Percent(0.3f32), + width: Some(taffy::style::Dimension::Percent(0.3f32)), + height: Some(taffy::style::Dimension::Percent(0.3f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn percentage_width_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(400f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_width_height_undefined_parent_size.rs b/tests/generated/percentage_width_height_undefined_parent_size.rs index b4fa47e7e..7caba5819 100644 --- a/tests/generated/percentage_width_height_undefined_parent_size.rs +++ b/tests/generated/percentage_width_height_undefined_parent_size.rs @@ -5,8 +5,8 @@ fn percentage_width_height_undefined_parent_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(0.5f32), - height: taffy::style::Dimension::Percent(0.5f32), + width: Some(taffy::style::Dimension::Percent(0.5f32)), + height: Some(taffy::style::Dimension::Percent(0.5f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/relative_position_should_not_nudge_siblings.rs b/tests/generated/relative_position_should_not_nudge_siblings.rs index 21f84090e..b2383f2f4 100644 --- a/tests/generated/relative_position_should_not_nudge_siblings.rs +++ b/tests/generated/relative_position_should_not_nudge_siblings.rs @@ -4,7 +4,10 @@ fn relative_position_should_not_nudge_siblings() { let node0 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() }, @@ -14,7 +17,10 @@ fn relative_position_should_not_nudge_siblings() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() }, @@ -26,8 +32,8 @@ fn relative_position_should_not_nudge_siblings() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs b/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs index 75ed48a30..5d383163f 100644 --- a/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs +++ b/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs @@ -15,8 +15,8 @@ fn rounding_flex_basis_flex_grow_row_prime_number_width() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(113f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(113f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs b/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs index eadb3f2bc..b60883256 100644 --- a/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs +++ b/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs @@ -11,8 +11,8 @@ fn rounding_flex_basis_flex_grow_row_width_of_100() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_flex_basis_flex_shrink_row.rs b/tests/generated/rounding_flex_basis_flex_shrink_row.rs index a2354483f..80ed8aef6 100644 --- a/tests/generated/rounding_flex_basis_flex_shrink_row.rs +++ b/tests/generated/rounding_flex_basis_flex_shrink_row.rs @@ -27,8 +27,8 @@ fn rounding_flex_basis_flex_shrink_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(101f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(101f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_flex_basis_overrides_main_size.rs b/tests/generated/rounding_flex_basis_overrides_main_size.rs index 5274b9683..4dcad960c 100644 --- a/tests/generated/rounding_flex_basis_overrides_main_size.rs +++ b/tests/generated/rounding_flex_basis_overrides_main_size.rs @@ -6,7 +6,10 @@ fn rounding_flex_basis_overrides_main_size() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_flex_basis_overrides_main_size() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_flex_basis_overrides_main_size() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_flex_basis_overrides_main_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_fractial_input_1.rs b/tests/generated/rounding_fractial_input_1.rs index 46600499a..ffc16bbdb 100644 --- a/tests/generated/rounding_fractial_input_1.rs +++ b/tests/generated/rounding_fractial_input_1.rs @@ -6,7 +6,10 @@ fn rounding_fractial_input_1() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_fractial_input_1() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_fractial_input_1() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_fractial_input_1() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_fractial_input_2.rs b/tests/generated/rounding_fractial_input_2.rs index d4186021e..73f47b6e7 100644 --- a/tests/generated/rounding_fractial_input_2.rs +++ b/tests/generated/rounding_fractial_input_2.rs @@ -6,7 +6,10 @@ fn rounding_fractial_input_2() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_fractial_input_2() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_fractial_input_2() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_fractial_input_2() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.6f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.6f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_fractial_input_3.rs b/tests/generated/rounding_fractial_input_3.rs index 4855300d8..51cedc4ca 100644 --- a/tests/generated/rounding_fractial_input_3.rs +++ b/tests/generated/rounding_fractial_input_3.rs @@ -6,7 +6,10 @@ fn rounding_fractial_input_3() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_fractial_input_3() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_fractial_input_3() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_fractial_input_3() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_fractial_input_4.rs b/tests/generated/rounding_fractial_input_4.rs index ea6aa826c..bd44d8fe5 100644 --- a/tests/generated/rounding_fractial_input_4.rs +++ b/tests/generated/rounding_fractial_input_4.rs @@ -6,7 +6,10 @@ fn rounding_fractial_input_4() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_fractial_input_4() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_fractial_input_4() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_fractial_input_4() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_total_fractial.rs b/tests/generated/rounding_total_fractial.rs index a5a99a78d..961eb6f3b 100644 --- a/tests/generated/rounding_total_fractial.rs +++ b/tests/generated/rounding_total_fractial.rs @@ -6,7 +6,10 @@ fn rounding_total_fractial() { taffy::style::FlexboxLayout { flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20.3f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -16,7 +19,10 @@ fn rounding_total_fractial() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.6f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -26,7 +32,10 @@ fn rounding_total_fractial() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10.7f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -37,8 +46,8 @@ fn rounding_total_fractial() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(87.4f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/rounding_total_fractial_nested.rs b/tests/generated/rounding_total_fractial_nested.rs index b32652d23..bde0cab2a 100644 --- a/tests/generated/rounding_total_fractial_nested.rs +++ b/tests/generated/rounding_total_fractial_nested.rs @@ -6,7 +6,10 @@ fn rounding_total_fractial_nested() { taffy::style::FlexboxLayout { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(9.9f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(9.9f32)), + ..Default::default() + }, position: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(13.3f32), ..Default::default() @@ -21,7 +24,10 @@ fn rounding_total_fractial_nested() { taffy::style::FlexboxLayout { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(1.1f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(1.1f32)), + ..Default::default() + }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(13.3f32), ..Default::default() }, ..Default::default() }, @@ -34,7 +40,10 @@ fn rounding_total_fractial_nested() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(20.3f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -44,7 +53,10 @@ fn rounding_total_fractial_nested() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.6f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -54,7 +66,10 @@ fn rounding_total_fractial_nested() { .new_with_children( taffy::style::FlexboxLayout { flex_grow: 1.1f32, - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(10.7f32)), + ..Default::default() + }, ..Default::default() }, &[], @@ -65,8 +80,8 @@ fn rounding_total_fractial_nested() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: Some(taffy::style::Dimension::Points(87.4f32)), + height: Some(taffy::style::Dimension::Points(113.4f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/size_defined_by_child.rs b/tests/generated/size_defined_by_child.rs index 53123137f..7307d04fc 100644 --- a/tests/generated/size_defined_by_child.rs +++ b/tests/generated/size_defined_by_child.rs @@ -5,8 +5,8 @@ fn size_defined_by_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/size_defined_by_child_with_border.rs b/tests/generated/size_defined_by_child_with_border.rs index ed13004bd..81370d463 100644 --- a/tests/generated/size_defined_by_child_with_border.rs +++ b/tests/generated/size_defined_by_child_with_border.rs @@ -5,8 +5,8 @@ fn size_defined_by_child_with_border() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/size_defined_by_child_with_padding.rs b/tests/generated/size_defined_by_child_with_padding.rs index bf16d6a4c..dd4bfe6bc 100644 --- a/tests/generated/size_defined_by_child_with_padding.rs +++ b/tests/generated/size_defined_by_child_with_padding.rs @@ -5,8 +5,8 @@ fn size_defined_by_child_with_padding() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(10f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/size_defined_by_grand_child.rs b/tests/generated/size_defined_by_grand_child.rs index 6b7a2ca36..7ada088bb 100644 --- a/tests/generated/size_defined_by_grand_child.rs +++ b/tests/generated/size_defined_by_grand_child.rs @@ -5,8 +5,8 @@ fn size_defined_by_grand_child() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs index 78434ed76..875ac5962 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs @@ -5,8 +5,8 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn width_smaller_then_content_with_flex_grow_large_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -29,8 +32,8 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -43,7 +46,10 @@ fn width_smaller_then_content_with_flex_grow_large_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -52,7 +58,10 @@ fn width_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs index a1255b347..4b0dc4743 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs @@ -5,8 +5,8 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn width_smaller_then_content_with_flex_grow_small_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -29,8 +32,8 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -43,7 +46,10 @@ fn width_smaller_then_content_with_flex_grow_small_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -52,7 +58,10 @@ fn width_smaller_then_content_with_flex_grow_small_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(10f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs index fc16819f9..7232907d6 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -5,8 +5,8 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -29,8 +32,8 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -43,7 +46,10 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs index 8bbbea4b9..1c1d29e85 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs @@ -5,8 +5,8 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(70f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -19,7 +19,10 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node00], @@ -29,8 +32,8 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(20f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -43,7 +46,10 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(0f32)), + ..Default::default() + }, ..Default::default() }, &[node10], @@ -52,7 +58,10 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(200f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/wrap_column.rs b/tests/generated/wrap_column.rs index 54164e38f..5ecf63740 100644 --- a/tests/generated/wrap_column.rs +++ b/tests/generated/wrap_column.rs @@ -5,8 +5,8 @@ fn wrap_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(31f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(32f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(33f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(34f32)), ..Default::default() }, ..Default::default() @@ -59,8 +59,8 @@ fn wrap_column() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs index b20032868..8119495c9 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs @@ -5,8 +5,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -24,8 +24,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -47,7 +47,10 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(70f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -58,8 +61,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs index c80217fb1..cc28e06f1 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -5,8 +5,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -24,8 +24,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(40f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -47,7 +47,10 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(85f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(85f32)), + ..Default::default() + }, ..Default::default() }, &[node00, node01], @@ -58,8 +61,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(500f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_reverse_column.rs b/tests/generated/wrap_reverse_column.rs index 58bc03288..7c869092b 100644 --- a/tests/generated/wrap_reverse_column.rs +++ b/tests/generated/wrap_reverse_column.rs @@ -5,8 +5,8 @@ fn wrap_reverse_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(31f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(32f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(33f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_column() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(34f32)), ..Default::default() }, ..Default::default() @@ -59,8 +59,8 @@ fn wrap_reverse_column() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_reverse_column_fixed_size.rs b/tests/generated/wrap_reverse_column_fixed_size.rs index 3422d2f50..bb3a3de03 100644 --- a/tests/generated/wrap_reverse_column_fixed_size.rs +++ b/tests/generated/wrap_reverse_column_fixed_size.rs @@ -5,8 +5,8 @@ fn wrap_reverse_column_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_column_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_column_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_column_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_column_fixed_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -73,8 +73,8 @@ fn wrap_reverse_column_fixed_size() { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_reverse_row.rs b/tests/generated/wrap_reverse_row.rs index 6e23e0b7d..7c1067f0c 100644 --- a/tests/generated/wrap_reverse_row.rs +++ b/tests/generated/wrap_reverse_row.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(31f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(32f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(33f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(34f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -57,7 +57,10 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_reverse_row_align_content_center.rs b/tests/generated/wrap_reverse_row_align_content_center.rs index 186491f84..f73a3c981 100644 --- a/tests/generated/wrap_reverse_row_align_content_center.rs +++ b/tests/generated/wrap_reverse_row_align_content_center.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row_align_content_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row_align_content_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row_align_content_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row_align_content_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_row_align_content_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -71,7 +71,10 @@ fn wrap_reverse_row_align_content_center() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_flex_start.rs b/tests/generated/wrap_reverse_row_align_content_flex_start.rs index 56c912b7c..6d4934115 100644 --- a/tests/generated/wrap_reverse_row_align_content_flex_start.rs +++ b/tests/generated/wrap_reverse_row_align_content_flex_start.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row_align_content_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row_align_content_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row_align_content_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row_align_content_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_row_align_content_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -71,7 +71,10 @@ fn wrap_reverse_row_align_content_flex_start() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_space_around.rs b/tests/generated/wrap_reverse_row_align_content_space_around.rs index f65c8f5bc..8a98c2717 100644 --- a/tests/generated/wrap_reverse_row_align_content_space_around.rs +++ b/tests/generated/wrap_reverse_row_align_content_space_around.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row_align_content_space_around() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row_align_content_space_around() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row_align_content_space_around() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row_align_content_space_around() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_row_align_content_space_around() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -71,7 +71,10 @@ fn wrap_reverse_row_align_content_space_around() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::SpaceAround, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_stretch.rs b/tests/generated/wrap_reverse_row_align_content_stretch.rs index 652b12af0..69e21f8dc 100644 --- a/tests/generated/wrap_reverse_row_align_content_stretch.rs +++ b/tests/generated/wrap_reverse_row_align_content_stretch.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -70,7 +70,10 @@ fn wrap_reverse_row_align_content_stretch() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_single_line_different_size.rs b/tests/generated/wrap_reverse_row_single_line_different_size.rs index 2da555662..3944312a3 100644 --- a/tests/generated/wrap_reverse_row_single_line_different_size.rs +++ b/tests/generated/wrap_reverse_row_single_line_different_size.rs @@ -5,8 +5,8 @@ fn wrap_reverse_row_single_line_different_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_reverse_row_single_line_different_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_reverse_row_single_line_different_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_reverse_row_single_line_different_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(40f32)), ..Default::default() }, ..Default::default() @@ -57,8 +57,8 @@ fn wrap_reverse_row_single_line_different_size() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(50f32)), ..Default::default() }, ..Default::default() @@ -71,7 +71,10 @@ fn wrap_reverse_row_single_line_different_size() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(300f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_row.rs b/tests/generated/wrap_row.rs index 56ff948c6..0106b45cf 100644 --- a/tests/generated/wrap_row.rs +++ b/tests/generated/wrap_row.rs @@ -5,8 +5,8 @@ fn wrap_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(31f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(32f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(33f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_row() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(34f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -57,7 +57,10 @@ fn wrap_row() { .new_with_children( taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_row_align_items_center.rs b/tests/generated/wrap_row_align_items_center.rs index 187e1a5a4..eb9629c79 100644 --- a/tests/generated/wrap_row_align_items_center.rs +++ b/tests/generated/wrap_row_align_items_center.rs @@ -5,8 +5,8 @@ fn wrap_row_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_row_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_row_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_row_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -58,7 +58,10 @@ fn wrap_row_align_items_center() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_row_align_items_flex_end.rs b/tests/generated/wrap_row_align_items_flex_end.rs index 7510ff79e..3775b072f 100644 --- a/tests/generated/wrap_row_align_items_flex_end.rs +++ b/tests/generated/wrap_row_align_items_flex_end.rs @@ -5,8 +5,8 @@ fn wrap_row_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(10f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrap_row_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(20f32)), ..Default::default() }, ..Default::default() @@ -31,8 +31,8 @@ fn wrap_row_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -44,8 +44,8 @@ fn wrap_row_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: Some(taffy::style::Dimension::Points(30f32)), + height: Some(taffy::style::Dimension::Points(30f32)), ..Default::default() }, ..Default::default() @@ -58,7 +58,10 @@ fn wrap_row_align_items_flex_end() { taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100f32)), + ..Default::default() + }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrapped_column_max_height.rs b/tests/generated/wrapped_column_max_height.rs index 9022ba456..2347c80c3 100644 --- a/tests/generated/wrapped_column_max_height.rs +++ b/tests/generated/wrapped_column_max_height.rs @@ -5,8 +5,8 @@ fn wrapped_column_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -22,8 +22,8 @@ fn wrapped_column_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -42,8 +42,8 @@ fn wrapped_column_max_height() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -60,8 +60,8 @@ fn wrapped_column_max_height() { align_content: taffy::style::AlignContent::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(700f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrapped_column_max_height_flex.rs b/tests/generated/wrapped_column_max_height_flex.rs index 23c367139..292f2408c 100644 --- a/tests/generated/wrapped_column_max_height_flex.rs +++ b/tests/generated/wrapped_column_max_height_flex.rs @@ -8,8 +8,8 @@ fn wrapped_column_max_height_flex() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, max_size: taffy::geometry::Size { @@ -28,8 +28,8 @@ fn wrapped_column_max_height_flex() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, margin: taffy::geometry::Rect { @@ -48,8 +48,8 @@ fn wrapped_column_max_height_flex() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: Some(taffy::style::Dimension::Points(100f32)), + height: Some(taffy::style::Dimension::Points(100f32)), ..Default::default() }, ..Default::default() @@ -66,8 +66,8 @@ fn wrapped_column_max_height_flex() { align_content: taffy::style::AlignContent::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: Some(taffy::style::Dimension::Points(700f32)), + height: Some(taffy::style::Dimension::Points(500f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrapped_row_within_align_items_center.rs b/tests/generated/wrapped_row_within_align_items_center.rs index c2ae63ab1..30481998b 100644 --- a/tests/generated/wrapped_row_within_align_items_center.rs +++ b/tests/generated/wrapped_row_within_align_items_center.rs @@ -5,8 +5,8 @@ fn wrapped_row_within_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrapped_row_within_align_items_center() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -39,8 +39,8 @@ fn wrapped_row_within_align_items_center() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrapped_row_within_align_items_flex_end.rs b/tests/generated/wrapped_row_within_align_items_flex_end.rs index 99a126c33..7116b7f6d 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_end.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_end.rs @@ -5,8 +5,8 @@ fn wrapped_row_within_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrapped_row_within_align_items_flex_end() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -39,8 +39,8 @@ fn wrapped_row_within_align_items_flex_end() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrapped_row_within_align_items_flex_start.rs b/tests/generated/wrapped_row_within_align_items_flex_start.rs index 50708923b..62953d608 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_start.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_start.rs @@ -5,8 +5,8 @@ fn wrapped_row_within_align_items_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(150f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -18,8 +18,8 @@ fn wrapped_row_within_align_items_flex_start() { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: Some(taffy::style::Dimension::Points(80f32)), + height: Some(taffy::style::Dimension::Points(80f32)), ..Default::default() }, ..Default::default() @@ -39,8 +39,8 @@ fn wrapped_row_within_align_items_flex_start() { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: Some(taffy::style::Dimension::Points(200f32)), + height: Some(taffy::style::Dimension::Points(200f32)), ..Default::default() }, ..Default::default() From 05237a58a77a761a495d735ddb036ac897b4806a Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:34 +0200 Subject: [PATCH 4/7] Making sure we generate tests and benches with optional size --- scripts/gentest/src/main.rs | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs index ba68cc12a..7eddc6170 100644 --- a/scripts/gentest/src/main.rs +++ b/scripts/gentest/src/main.rs @@ -336,7 +336,7 @@ fn generate_node(ident: &str, node: &json::JsonValue) -> TokenStream { let size = match style["size"] { json::JsonValue::Object(ref value) => { - let size = generate_size(value); + let size = generate_size_option(value); quote!(size: #size,) } _ => quote!(), @@ -440,6 +440,18 @@ macro_rules! dim_quoted { }; } +macro_rules! dim_quoted_option { + ($obj:ident, $dim_name:ident) => { + let $dim_name = match $obj.get(stringify!($dim_name)) { + Some(json::JsonValue::Object(ref value)) => { + let dim = generate_dimension(value); + quote!($dim_name: Some(#dim),) + } + _ => quote!(), + }; + }; +} + fn generate_size(size: &json::object::Object) -> TokenStream { dim_quoted!(size, width); dim_quoted!(size, height); @@ -451,6 +463,17 @@ fn generate_size(size: &json::object::Object) -> TokenStream { ) } +fn generate_size_option(size: &json::object::Object) -> TokenStream { + dim_quoted_option!(size, width); + dim_quoted_option!(size, height); + quote!( + taffy::geometry::Size { + #width #height + ..Default::default() + } + ) +} + fn generate_dimension(dimen: &json::object::Object) -> TokenStream { let unit = dimen.get("unit").unwrap(); let value = || dimen.get("value").unwrap().as_f32().unwrap(); From 680ad0d146d7bf01a25ed38732df11e0ed6b2014 Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:34 +0200 Subject: [PATCH 5/7] Wrapping optional elements in Some --- examples/basic.rs | 7 ++-- examples/nested.rs | 10 +++--- tests/measure.rs | 71 +++++++++++++++++++++++++-------------- tests/relayout.rs | 12 +++++-- tests/root_constraints.rs | 8 ++--- 5 files changed, 69 insertions(+), 39 deletions(-) diff --git a/examples/basic.rs b/examples/basic.rs index ba1f7f29b..279ebfff9 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -4,13 +4,16 @@ fn main() -> Result<(), taffy::error::InvalidNode> { let mut taffy = Taffy::new(); let child = taffy.new_with_children( - FlexboxLayout { size: Size { width: Dimension::Percent(0.5), height: Dimension::Auto }, ..Default::default() }, + FlexboxLayout { + size: Size { width: Some(Dimension::Percent(0.5)), height: Some(Dimension::Auto) }, + ..Default::default() + }, &[], )?; let node = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Some(Dimension::Points(100.0)), height: Some(Dimension::Points(100.0)) }, justify_content: JustifyContent::Center, ..Default::default() }, diff --git a/examples/nested.rs b/examples/nested.rs index 2abf98213..b52ead5ec 100644 --- a/examples/nested.rs +++ b/examples/nested.rs @@ -6,7 +6,7 @@ fn main() -> Result<(), taffy::error::InvalidNode> { // left let child_t1 = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, + size: Size { width: Some(Dimension::Points(5.0)), height: Some(Dimension::Points(5.0)) }, ..Default::default() }, &[], @@ -14,7 +14,7 @@ fn main() -> Result<(), taffy::error::InvalidNode> { let div1 = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Percent(0.5), height: Dimension::Percent(1.0) }, + size: Size { width: Some(Dimension::Percent(0.5)), height: Some(Dimension::Percent(1.0)) }, // justify_content: JustifyContent::Center, ..Default::default() }, @@ -24,7 +24,7 @@ fn main() -> Result<(), taffy::error::InvalidNode> { // right let child_t2 = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, + size: Size { width: Some(Dimension::Points(5.0)), height: Some(Dimension::Points(5.0)) }, ..Default::default() }, &[], @@ -32,7 +32,7 @@ fn main() -> Result<(), taffy::error::InvalidNode> { let div2 = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Percent(0.5), height: Dimension::Percent(1.0) }, + size: Size { width: Some(Dimension::Percent(0.5)), height: Some(Dimension::Percent(1.0)) }, // justify_content: JustifyContent::Center, ..Default::default() }, @@ -41,7 +41,7 @@ fn main() -> Result<(), taffy::error::InvalidNode> { let container = taffy.new_with_children( FlexboxLayout { - size: Size { width: Dimension::Percent(1.0), height: Dimension::Percent(1.0) }, + size: Size { width: Some(Dimension::Percent(1.0)), height: Some(Dimension::Percent(1.0)) }, ..Default::default() }, &[div1, div2], diff --git a/tests/measure.rs b/tests/measure.rs index 0716eb1ae..b57524d53 100644 --- a/tests/measure.rs +++ b/tests/measure.rs @@ -96,7 +96,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50.0)), + ..Default::default() + }, padding: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10.0), end: taffy::style::Dimension::Points(10.0), @@ -124,8 +127,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50.0), - height: taffy::style::Dimension::Points(50.0), + width: Some(taffy::style::Dimension::Points(50.0)), + height: Some(taffy::style::Dimension::Points(50.0)), }, ..Default::default() }, @@ -146,7 +149,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100.0)), + ..Default::default() + }, ..Default::default() }, &[child0, child1], @@ -166,8 +172,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50.0), - height: taffy::style::Dimension::Points(50.0), + width: Some(taffy::style::Dimension::Points(50.0)), + height: Some(taffy::style::Dimension::Points(50.0)), }, flex_shrink: 0.0, ..Default::default() @@ -189,7 +195,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100.0)), + ..Default::default() + }, ..Default::default() }, &[child0, child1], @@ -209,8 +218,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50.0), - height: taffy::style::Dimension::Points(50.0), + width: Some(taffy::style::Dimension::Points(50.0)), + height: Some(taffy::style::Dimension::Points(50.0)), }, ..Default::default() }, @@ -232,7 +241,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100.0)), + ..Default::default() + }, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, @@ -254,8 +266,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50.0), - height: taffy::style::Dimension::Points(50.0), + width: Some(taffy::style::Dimension::Points(50.0)), + height: Some(taffy::style::Dimension::Points(50.0)), }, flex_shrink: 0.0, ..Default::default() @@ -278,7 +290,10 @@ mod measure { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(100.0)), + ..Default::default() + }, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, @@ -311,8 +326,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.0), - height: taffy::style::Dimension::Points(100.0), + width: Some(taffy::style::Dimension::Points(100.0)), + height: Some(taffy::style::Dimension::Points(100.0)), }, ..Default::default() }, @@ -332,7 +347,10 @@ mod measure { let child = taffy .new_leaf( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), ..Default::default() }, + size: taffy::geometry::Size { + width: Some(taffy::style::Dimension::Points(50.0)), + ..Default::default() + }, ..Default::default() }, MeasureFunc::Raw(|constraint| taffy::geometry::Size { @@ -355,7 +373,10 @@ mod measure { let child = taffy .new_leaf( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50.0), ..Default::default() }, + size: taffy::geometry::Size { + height: Some(taffy::style::Dimension::Points(50.0)), + ..Default::default() + }, ..Default::default() }, MeasureFunc::Raw(|constraint| taffy::geometry::Size { @@ -404,8 +425,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200.0), - height: taffy::style::Dimension::Points(100.0), + width: Some(taffy::style::Dimension::Points(200.0)), + height: Some(taffy::style::Dimension::Points(100.0)), }, ..Default::default() }, @@ -438,8 +459,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.0), - height: taffy::style::Dimension::Points(100.0), + width: Some(taffy::style::Dimension::Points(100.0)), + height: Some(taffy::style::Dimension::Points(100.0)), }, ..Default::default() }, @@ -473,8 +494,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.0), - height: taffy::style::Dimension::Points(100.0), + width: Some(taffy::style::Dimension::Points(100.0)), + height: Some(taffy::style::Dimension::Points(100.0)), }, ..Default::default() }, @@ -502,8 +523,8 @@ mod measure { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.0), - height: taffy::style::Dimension::Points(100.0), + width: Some(taffy::style::Dimension::Points(100.0)), + height: Some(taffy::style::Dimension::Points(100.0)), }, ..Default::default() }, diff --git a/tests/relayout.rs b/tests/relayout.rs index 6b4df7767..cef59231d 100644 --- a/tests/relayout.rs +++ b/tests/relayout.rs @@ -6,7 +6,10 @@ fn relayout() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Dimension::Points(8f32), height: Dimension::Points(80f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Points(8f32)), + height: Some(Dimension::Points(80f32)), + }, ..Default::default() }, &[], @@ -16,7 +19,7 @@ fn relayout() { .new_with_children( taffy::style::FlexboxLayout { align_self: taffy::prelude::AlignSelf::Center, - size: taffy::geometry::Size { width: Dimension::Auto, height: Dimension::Auto }, + size: taffy::geometry::Size { width: Some(Dimension::Auto), height: Some(Dimension::Auto) }, // size: taffy::geometry::Size { width: Dimension::Percent(1.0), height: Dimension::Percent(1.0) }, ..Default::default() }, @@ -26,7 +29,10 @@ fn relayout() { let node = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Dimension::Percent(1f32), height: Dimension::Percent(1f32) }, + size: taffy::geometry::Size { + width: Some(Dimension::Percent(1f32)), + height: Some(Dimension::Percent(1f32)), + }, ..Default::default() }, &[node0], diff --git a/tests/root_constraints.rs b/tests/root_constraints.rs index bc2ee1f86..156e66bc8 100644 --- a/tests/root_constraints.rs +++ b/tests/root_constraints.rs @@ -8,8 +8,8 @@ mod root_constraints { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Percent(1.0), - height: taffy::style::Dimension::Percent(1.0), + width: Some(taffy::style::Dimension::Percent(1.0)), + height: Some(taffy::style::Dimension::Percent(1.0)), }, ..Default::default() }, @@ -43,8 +43,8 @@ mod root_constraints { .new_with_children( taffy::style::FlexboxLayout { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200.0), - height: taffy::style::Dimension::Points(200.0), + width: Some(taffy::style::Dimension::Points(200.0)), + height: Some(taffy::style::Dimension::Points(200.0)), }, ..Default::default() }, From 2eb1d0e72031c64a3bb297d5b5f49b629eafa5ec Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:35 +0200 Subject: [PATCH 6/7] Changing default --- src/geometry.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/geometry.rs b/src/geometry.rs index d3aed6a2a..f23a7c328 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -169,7 +169,7 @@ impl Size<()> { impl Default for Size> { fn default() -> Self { - Self { width: Default::default(), height: Default::default() } + Self { width: None, height: None } } } From 86a69b2eae3f2faeabd3740e7d430894860eb465 Mon Sep 17 00:00:00 2001 From: Andreas Weibye <13300393+Weibye@users.noreply.github.com> Date: Sat, 18 Jun 2022 14:48:35 +0200 Subject: [PATCH 7/7] Dimension::Undefined should correctly be None --- tests/simple_child.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/simple_child.rs b/tests/simple_child.rs index 930a9aee3..38bac94fb 100644 --- a/tests/simple_child.rs +++ b/tests/simple_child.rs @@ -57,7 +57,7 @@ fn simple_child() { let node1 = taffy .new_with_children( taffy::style::FlexboxLayout { - size: taffy::geometry::Size { width: Some(Dimension::Auto), height: Some(Dimension::Auto) }, + size: taffy::geometry::Size { width: None, height: None }, ..Default::default() }, &[node1_0, node1_1],