From ca514f6c8ddc2a934f97170227bbe109223c80b8 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Thu, 24 Nov 2022 13:38:52 +0000 Subject: [PATCH] Rename Rect field start->left end->right (#257) --- ...ustify_content_center_and_left_position.rs | 2 +- ...stify_content_center_and_right_position.rs | 2 +- .../absolute_layout_start_top_end_bottom.rs | 4 +- ...absolute_layout_width_height_end_bottom.rs | 2 +- .../absolute_layout_width_height_start_top.rs | 2 +- ...ayout_width_height_start_top_end_bottom.rs | 4 +- .../absolute_layout_within_border.rs | 24 ++++++------ ...er_child_with_margin_bigger_than_parent.rs | 4 +- ...nd_child_with_margin_bigger_than_parent.rs | 4 +- benches/generated/border_flex_child.rs | 4 +- benches/generated/border_no_child.rs | 4 +- benches/generated/border_stretch_child.rs | 4 +- benches/generated/display_none_with_margin.rs | 4 +- .../generated/gap_column_gap_child_margins.rs | 12 +++--- ...padding_child_width_greater_than_parent.rs | 4 +- ...h_padding_child_width_lower_than_parent.rs | 4 +- ...ustify_content_row_max_width_and_margin.rs | 2 +- ...ustify_content_row_min_width_and_margin.rs | 2 +- benches/generated/margin_and_flex_row.rs | 4 +- .../generated/margin_and_stretch_column.rs | 4 +- benches/generated/margin_auto_left.rs | 2 +- .../generated/margin_auto_left_and_right.rs | 4 +- .../margin_auto_left_and_right_column.rs | 4 +- ...n_auto_left_and_right_column_and_center.rs | 4 +- .../margin_auto_left_and_right_strech.rs | 4 +- ...rgin_auto_left_child_bigger_than_parent.rs | 2 +- ...left_fix_right_child_bigger_than_parent.rs | 4 +- ...uto_left_right_child_bigger_than_parent.rs | 4 +- .../margin_auto_left_stretching_child.rs | 2 +- .../margin_auto_mutiple_children_row.rs | 4 +- benches/generated/margin_auto_right.rs | 2 +- ...eft_auto_right_child_bigger_than_parent.rs | 4 +- benches/generated/margin_left.rs | 2 +- benches/generated/margin_right.rs | 2 +- .../margin_should_not_be_part_of_max_width.rs | 2 +- benches/generated/margin_with_sibling_row.rs | 2 +- benches/generated/padding_align_end_child.rs | 4 +- benches/generated/padding_center_child.rs | 4 +- benches/generated/padding_flex_child.rs | 4 +- benches/generated/padding_no_child.rs | 4 +- benches/generated/padding_stretch_child.rs | 4 +- .../generated/percent_absolute_position.rs | 2 +- .../generated/percentage_absolute_position.rs | 2 +- ...in_should_calculate_based_only_on_width.rs | 4 +- ...th_padding_margin_and_percentage_values.rs | 24 ++++++------ ...ng_should_calculate_based_only_on_width.rs | 4 +- .../percentage_position_bottom_right.rs | 2 +- .../generated/percentage_position_left_top.rs | 2 +- ...centage_size_based_on_parent_inner_size.rs | 4 +- .../size_defined_by_child_with_border.rs | 4 +- .../size_defined_by_child_with_padding.rs | 4 +- ..._with_content_sizing_overflowing_margin.rs | 2 +- .../generated/wrapped_column_max_height.rs | 4 +- .../wrapped_column_max_height_flex.rs | 4 +- scripts/gentest/src/main.rs | 6 +-- scripts/gentest/test_helper.js | 24 ++++++------ src/compute/flexbox.rs | 28 +++++++------- src/geometry.rs | 22 +++++------ src/resolve.rs | 8 ++-- src/style.rs | 37 +++++++++++-------- ...ustify_content_center_and_left_position.rs | 2 +- ...stify_content_center_and_right_position.rs | 2 +- .../absolute_layout_start_top_end_bottom.rs | 4 +- ...absolute_layout_width_height_end_bottom.rs | 2 +- .../absolute_layout_width_height_start_top.rs | 2 +- ...ayout_width_height_start_top_end_bottom.rs | 4 +- .../absolute_layout_within_border.rs | 24 ++++++------ ...er_child_with_margin_bigger_than_parent.rs | 4 +- ...nd_child_with_margin_bigger_than_parent.rs | 4 +- tests/generated/border_flex_child.rs | 4 +- tests/generated/border_no_child.rs | 4 +- tests/generated/border_stretch_child.rs | 4 +- tests/generated/display_none_with_margin.rs | 4 +- .../generated/gap_column_gap_child_margins.rs | 12 +++--- ...padding_child_width_greater_than_parent.rs | 4 +- ...h_padding_child_width_lower_than_parent.rs | 4 +- ...ustify_content_row_max_width_and_margin.rs | 2 +- ...ustify_content_row_min_width_and_margin.rs | 2 +- tests/generated/margin_and_flex_row.rs | 4 +- tests/generated/margin_and_stretch_column.rs | 4 +- tests/generated/margin_auto_left.rs | 2 +- tests/generated/margin_auto_left_and_right.rs | 4 +- .../margin_auto_left_and_right_column.rs | 4 +- ...n_auto_left_and_right_column_and_center.rs | 4 +- .../margin_auto_left_and_right_strech.rs | 4 +- ...rgin_auto_left_child_bigger_than_parent.rs | 2 +- ...left_fix_right_child_bigger_than_parent.rs | 4 +- ...uto_left_right_child_bigger_than_parent.rs | 4 +- .../margin_auto_left_stretching_child.rs | 2 +- .../margin_auto_mutiple_children_row.rs | 4 +- tests/generated/margin_auto_right.rs | 2 +- ...eft_auto_right_child_bigger_than_parent.rs | 4 +- tests/generated/margin_left.rs | 2 +- tests/generated/margin_right.rs | 2 +- .../margin_should_not_be_part_of_max_width.rs | 2 +- tests/generated/margin_with_sibling_row.rs | 2 +- tests/generated/padding_align_end_child.rs | 4 +- tests/generated/padding_center_child.rs | 4 +- tests/generated/padding_flex_child.rs | 4 +- tests/generated/padding_no_child.rs | 4 +- tests/generated/padding_stretch_child.rs | 4 +- tests/generated/percent_absolute_position.rs | 2 +- .../generated/percentage_absolute_position.rs | 2 +- ...in_should_calculate_based_only_on_width.rs | 4 +- ...th_padding_margin_and_percentage_values.rs | 24 ++++++------ ...ng_should_calculate_based_only_on_width.rs | 4 +- .../percentage_position_bottom_right.rs | 2 +- .../generated/percentage_position_left_top.rs | 2 +- ...centage_size_based_on_parent_inner_size.rs | 4 +- .../size_defined_by_child_with_border.rs | 4 +- .../size_defined_by_child_with_padding.rs | 4 +- ..._with_content_sizing_overflowing_margin.rs | 2 +- tests/generated/wrapped_column_max_height.rs | 4 +- .../wrapped_column_max_height_flex.rs | 4 +- tests/measure.rs | 4 +- 115 files changed, 293 insertions(+), 288 deletions(-) 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 7fd33dc84..6a5b02e61 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 @@ -9,7 +9,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(40f32), ..Default::default() }, - position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), ..Default::default() }, + position: taffy::geometry::Rect { left: taffy::style::Dimension::Points(5f32), ..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 90a59bd1f..033bf3880 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 @@ -9,7 +9,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(40f32), ..Default::default() }, - position: taffy::geometry::Rect { end: taffy::style::Dimension::Points(5f32), ..Default::default() }, + position: taffy::geometry::Rect { right: taffy::style::Dimension::Points(5f32), ..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 0ab7e32a7..31ad9203e 100644 --- a/benches/generated/absolute_layout_start_top_end_bottom.rs +++ b/benches/generated/absolute_layout_start_top_end_bottom.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::Style { position_type: taffy::style::PositionType::Absolute, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 add84bec5..6644673f9 100644 --- a/benches/generated/absolute_layout_width_height_end_bottom.rs +++ b/benches/generated/absolute_layout_width_height_end_bottom.rs @@ -10,7 +10,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 e53564707..5e2e511a7 100644 --- a/benches/generated/absolute_layout_width_height_start_top.rs +++ b/benches/generated/absolute_layout_width_height_start_top.rs @@ -10,7 +10,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), ..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 505acfb31..96ba399d4 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 @@ -10,8 +10,8 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/absolute_layout_within_border.rs b/benches/generated/absolute_layout_within_border.rs index 00a5a60f3..2a3a628ea 100644 --- a/benches/generated/absolute_layout_within_border.rs +++ b/benches/generated/absolute_layout_within_border.rs @@ -10,7 +10,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(0f32), + left: taffy::style::Dimension::Points(0f32), top: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(0f32), + right: taffy::style::Dimension::Points(0f32), bottom: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -48,14 +48,14 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(0f32), + left: taffy::style::Dimension::Points(0f32), top: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -74,14 +74,14 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(0f32), + right: taffy::style::Dimension::Points(0f32), bottom: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -99,15 +99,15 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 7350548a9..c6c4b97c4 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..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 1130768f1..892c1af6e 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/border_flex_child.rs b/benches/generated/border_flex_child.rs index f6f311549..a2b4d0dd2 100644 --- a/benches/generated/border_flex_child.rs +++ b/benches/generated/border_flex_child.rs @@ -19,8 +19,8 @@ pub fn compute() { ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/border_no_child.rs b/benches/generated/border_no_child.rs index 6a693aad4..27e7fad2c 100644 --- a/benches/generated/border_no_child.rs +++ b/benches/generated/border_no_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::Style { border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/border_stretch_child.rs b/benches/generated/border_stretch_child.rs index 935776ddd..b607d1ab9 100644 --- a/benches/generated/border_stretch_child.rs +++ b/benches/generated/border_stretch_child.rs @@ -18,8 +18,8 @@ pub fn compute() { ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/display_none_with_margin.rs b/benches/generated/display_none_with_margin.rs index 540afb303..e049c66d9 100644 --- a/benches/generated/display_none_with_margin.rs +++ b/benches/generated/display_none_with_margin.rs @@ -10,8 +10,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/gap_column_gap_child_margins.rs b/benches/generated/gap_column_gap_child_margins.rs index 1a1b078d8..ac32a9663 100644 --- a/benches/generated/gap_column_gap_child_margins.rs +++ b/benches/generated/gap_column_gap_child_margins.rs @@ -7,8 +7,8 @@ pub fn compute() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(2f32), - end: taffy::style::Dimension::Points(2f32), + left: taffy::style::Dimension::Points(2f32), + right: taffy::style::Dimension::Points(2f32), ..Default::default() }, ..Default::default() @@ -23,8 +23,8 @@ pub fn compute() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -39,8 +39,8 @@ pub fn compute() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(15f32), - end: taffy::style::Dimension::Points(15f32), + left: taffy::style::Dimension::Points(15f32), + right: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..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 5a7110287..24a4ad99c 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 @@ -22,8 +22,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(100f32), - end: taffy::style::Dimension::Points(100f32), + left: taffy::style::Dimension::Points(100f32), + right: taffy::style::Dimension::Points(100f32), ..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 5854257d1..7e6522621 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 @@ -22,8 +22,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(100f32), - end: taffy::style::Dimension::Points(100f32), + left: taffy::style::Dimension::Points(100f32), + right: 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 5accc9619..e5353f1b2 100644 --- a/benches/generated/justify_content_row_max_width_and_margin.rs +++ b/benches/generated/justify_content_row_max_width_and_margin.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(100f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(100f32), ..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 635ed97dc..0af599913 100644 --- a/benches/generated/justify_content_row_min_width_and_margin.rs +++ b/benches/generated/justify_content_row_min_width_and_margin.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/benches/generated/margin_and_flex_row.rs b/benches/generated/margin_and_flex_row.rs index 3a1d8f301..559d83e5b 100644 --- a/benches/generated/margin_and_flex_row.rs +++ b/benches/generated/margin_and_flex_row.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_and_stretch_column.rs b/benches/generated/margin_and_stretch_column.rs index 383924576..478d82e9b 100644 --- a/benches/generated/margin_and_stretch_column.rs +++ b/benches/generated/margin_and_stretch_column.rs @@ -5,8 +5,8 @@ pub fn compute() { taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_auto_left.rs b/benches/generated/margin_auto_left.rs index c36f314e3..ac07b6780 100644 --- a/benches/generated/margin_auto_left.rs +++ b/benches/generated/margin_auto_left.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 2e0f3510a..ed593a568 100644 --- a/benches/generated/margin_auto_left_and_right.rs +++ b/benches/generated/margin_auto_left_and_right.rs @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 09416f8d3..95b5cf21e 100644 --- a/benches/generated/margin_auto_left_and_right_column.rs +++ b/benches/generated/margin_auto_left_and_right_column.rs @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 09416f8d3..95b5cf21e 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 2e0f3510a..ed593a568 100644 --- a/benches/generated/margin_auto_left_and_right_strech.rs +++ b/benches/generated/margin_auto_left_and_right_strech.rs @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 4d2d3bc2c..c75df0efe 100644 --- a/benches/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/benches/generated/margin_auto_left_child_bigger_than_parent.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(72f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 2379f4b11..9e9e0404f 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Points(10f32), ..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 4e24650ad..893e5d683 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 d9c32a695..1748e0584 100644 --- a/benches/generated/margin_auto_left_stretching_child.rs +++ b/benches/generated/margin_auto_left_stretching_child.rs @@ -6,7 +6,7 @@ pub fn compute() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 8a257ccd6..e75e2eb76 100644 --- a/benches/generated/margin_auto_mutiple_children_row.rs +++ b/benches/generated/margin_auto_mutiple_children_row.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() }, &[], @@ -22,7 +22,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() }, &[], diff --git a/benches/generated/margin_auto_right.rs b/benches/generated/margin_auto_right.rs index 81be597d4..b2733a78d 100644 --- a/benches/generated/margin_auto_right.rs +++ b/benches/generated/margin_auto_right.rs @@ -8,7 +8,7 @@ pub fn compute() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..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 0cfb7f8c1..394618cec 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 @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() diff --git a/benches/generated/margin_left.rs b/benches/generated/margin_left.rs index 7f36b2b27..9b42900c8 100644 --- a/benches/generated/margin_left.rs +++ b/benches/generated/margin_left.rs @@ -4,7 +4,7 @@ pub fn compute() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/benches/generated/margin_right.rs b/benches/generated/margin_right.rs index f3a88fa45..d138a0c5f 100644 --- a/benches/generated/margin_right.rs +++ b/benches/generated/margin_right.rs @@ -4,7 +4,7 @@ pub fn compute() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..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 897ef2cc9..0a848e8d3 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 @@ -12,7 +12,7 @@ pub fn compute() { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(20f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/benches/generated/margin_with_sibling_row.rs b/benches/generated/margin_with_sibling_row.rs index 83ad1769a..a6415510d 100644 --- a/benches/generated/margin_with_sibling_row.rs +++ b/benches/generated/margin_with_sibling_row.rs @@ -4,7 +4,7 @@ pub fn compute() { .new_with_children( taffy::style::Style { flex_grow: 1f32, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/benches/generated/padding_align_end_child.rs b/benches/generated/padding_align_end_child.rs index 9a69f5fae..c516002bc 100644 --- a/benches/generated/padding_align_end_child.rs +++ b/benches/generated/padding_align_end_child.rs @@ -9,8 +9,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/benches/generated/padding_center_child.rs b/benches/generated/padding_center_child.rs index d3c5f209f..b323a0826 100644 --- a/benches/generated/padding_center_child.rs +++ b/benches/generated/padding_center_child.rs @@ -24,8 +24,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/benches/generated/padding_flex_child.rs b/benches/generated/padding_flex_child.rs index ea0f9fc12..2d5152d42 100644 --- a/benches/generated/padding_flex_child.rs +++ b/benches/generated/padding_flex_child.rs @@ -19,8 +19,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/padding_no_child.rs b/benches/generated/padding_no_child.rs index 1efd79499..5ac1592c1 100644 --- a/benches/generated/padding_no_child.rs +++ b/benches/generated/padding_no_child.rs @@ -4,8 +4,8 @@ pub fn compute() { .new_with_children( taffy::style::Style { padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/padding_stretch_child.rs b/benches/generated/padding_stretch_child.rs index edce37e35..2acb3aa82 100644 --- a/benches/generated/padding_stretch_child.rs +++ b/benches/generated/padding_stretch_child.rs @@ -18,8 +18,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/benches/generated/percent_absolute_position.rs b/benches/generated/percent_absolute_position.rs index f20b73599..f74374dd5 100644 --- a/benches/generated/percent_absolute_position.rs +++ b/benches/generated/percent_absolute_position.rs @@ -28,7 +28,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.5f32), + left: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/percentage_absolute_position.rs b/benches/generated/percentage_absolute_position.rs index bc7792796..0e06f3776 100644 --- a/benches/generated/percentage_absolute_position.rs +++ b/benches/generated/percentage_absolute_position.rs @@ -10,7 +10,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.3f32), + left: taffy::style::Dimension::Percent(0.3f32), top: taffy::style::Dimension::Percent(0.1f32), ..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 95106134c..d6aeacb33 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 @@ -19,8 +19,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), - end: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), + right: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..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 64ae8e62c..6a6c874ba 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 @@ -5,15 +5,15 @@ pub fn compute() { taffy::style::Style { size: taffy::geometry::Size { width: 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), + left: taffy::style::Dimension::Percent(0.05f32), + right: taffy::style::Dimension::Percent(0.05f32), top: taffy::style::Dimension::Percent(0.05f32), bottom: taffy::style::Dimension::Percent(0.05f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(3f32), - end: taffy::style::Dimension::Points(3f32), + left: taffy::style::Dimension::Points(3f32), + right: taffy::style::Dimension::Points(3f32), top: taffy::style::Dimension::Points(3f32), bottom: taffy::style::Dimension::Points(3f32), ..Default::default() @@ -29,15 +29,15 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(5f32), - end: taffy::style::Dimension::Points(5f32), + left: taffy::style::Dimension::Points(5f32), + right: taffy::style::Dimension::Points(5f32), top: taffy::style::Dimension::Points(5f32), bottom: taffy::style::Dimension::Points(5f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.03f32), - end: taffy::style::Dimension::Percent(0.03f32), + left: taffy::style::Dimension::Percent(0.03f32), + right: taffy::style::Dimension::Percent(0.03f32), top: taffy::style::Dimension::Percent(0.03f32), bottom: taffy::style::Dimension::Percent(0.03f32), ..Default::default() @@ -58,15 +58,15 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(5f32), - end: taffy::style::Dimension::Points(5f32), + left: taffy::style::Dimension::Points(5f32), + right: taffy::style::Dimension::Points(5f32), top: taffy::style::Dimension::Points(5f32), bottom: taffy::style::Dimension::Points(5f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(3f32), - end: taffy::style::Dimension::Points(3f32), + left: taffy::style::Dimension::Points(3f32), + right: taffy::style::Dimension::Points(3f32), top: taffy::style::Dimension::Points(3f32), bottom: taffy::style::Dimension::Points(3f32), ..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 a8605be3a..417459abe 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 @@ -19,8 +19,8 @@ pub fn compute() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), - end: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), + right: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..Default::default() diff --git a/benches/generated/percentage_position_bottom_right.rs b/benches/generated/percentage_position_bottom_right.rs index a11561e2d..6a3a80472 100644 --- a/benches/generated/percentage_position_bottom_right.rs +++ b/benches/generated/percentage_position_bottom_right.rs @@ -9,7 +9,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Percent(0.2f32), + right: taffy::style::Dimension::Percent(0.2f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..Default::default() }, diff --git a/benches/generated/percentage_position_left_top.rs b/benches/generated/percentage_position_left_top.rs index 0ae91af23..c270080c3 100644 --- a/benches/generated/percentage_position_left_top.rs +++ b/benches/generated/percentage_position_left_top.rs @@ -9,7 +9,7 @@ pub fn compute() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.2f32), ..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 25ecb1fc8..0d4c1e4d3 100644 --- a/benches/generated/percentage_size_based_on_parent_inner_size.rs +++ b/benches/generated/percentage_size_based_on_parent_inner_size.rs @@ -23,8 +23,8 @@ pub fn compute() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..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 6c82516b8..2636a1d1d 100644 --- a/benches/generated/size_defined_by_child_with_border.rs +++ b/benches/generated/size_defined_by_child_with_border.rs @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::Style { border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 0bcc26266..63d5cfdd4 100644 --- a/benches/generated/size_defined_by_child_with_padding.rs +++ b/benches/generated/size_defined_by_child_with_padding.rs @@ -17,8 +17,8 @@ pub fn compute() { .new_with_children( taffy::style::Style { padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 540cffde6..36773c8c6 100644 --- a/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -36,7 +36,7 @@ pub fn compute() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[node010], diff --git a/benches/generated/wrapped_column_max_height.rs b/benches/generated/wrapped_column_max_height.rs index 8896ee392..18e7cc59e 100644 --- a/benches/generated/wrapped_column_max_height.rs +++ b/benches/generated/wrapped_column_max_height.rs @@ -26,8 +26,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/benches/generated/wrapped_column_max_height_flex.rs b/benches/generated/wrapped_column_max_height_flex.rs index 07efd6862..c2b871a23 100644 --- a/benches/generated/wrapped_column_max_height_flex.rs +++ b/benches/generated/wrapped_column_max_height_flex.rs @@ -32,8 +32,8 @@ pub fn compute() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs index ff5252085..cb793a11b 100644 --- a/scripts/gentest/src/main.rs +++ b/scripts/gentest/src/main.rs @@ -553,13 +553,13 @@ fn generate_dimension(dimen: &json::object::Object) -> TokenStream { } fn generate_edges(dimen: &json::object::Object) -> TokenStream { - dim_quoted!(dimen, start); - dim_quoted!(dimen, end); + dim_quoted!(dimen, left); + dim_quoted!(dimen, right); dim_quoted!(dimen, top); dim_quoted!(dimen, bottom); quote!(taffy::geometry::Rect { - #start #end #top #bottom + #left #right #top #bottom ..Default::default() }) } diff --git a/scripts/gentest/test_helper.js b/scripts/gentest/test_helper.js index 184cdf7e2..376fd2a52 100644 --- a/scripts/gentest/test_helper.js +++ b/scripts/gentest/test_helper.js @@ -102,13 +102,13 @@ function parseEnum(input) { } function parseEdges(edges) { - const start = parseDimension(edges.start); - const end = parseDimension(edges.end); + const left = parseDimension(edges.left); + const right = parseDimension(edges.right); const top = parseDimension(edges.top); const bottom = parseDimension(edges.bottom); - if (!start && !end && !top && !bottom) return undefined; - return { start, end, top, bottom }; + if (!left && !right && !top && !bottom) return undefined; + return { left, right, top, bottom }; } function parseSize(size) { @@ -190,29 +190,29 @@ function describeElement(e) { maxSize: parseSize({width: e.style.maxWidth, height: e.style.maxHeight}), margin: parseEdges({ - start: e.style.marginLeft, - end: e.style.marginRight, + left: e.style.marginLeft, + right: e.style.marginRight, top: e.style.marginTop, bottom: e.style.marginBottom, }), padding: parseEdges({ - start: e.style.paddingLeft, - end: e.style.paddingRight, + left: e.style.paddingLeft, + right: e.style.paddingRight, top: e.style.paddingTop, bottom: e.style.paddingBottom, }), border: parseEdges({ - start: e.style.borderLeftWidth, - end: e.style.borderRightWidth, + left: e.style.borderLeftWidth, + right: e.style.borderRightWidth, top: e.style.borderTopWidth, bottom: e.style.borderBottomWidth, }), position: parseEdges({ - start: e.style.left, - end: e.style.right, + left: e.style.left, + right: e.style.right, top: e.style.top, bottom: e.style.bottom, }), diff --git a/src/compute/flexbox.rs b/src/compute/flexbox.rs index 826485bce..f4bcdde79 100644 --- a/src/compute/flexbox.rs +++ b/src/compute/flexbox.rs @@ -357,8 +357,8 @@ fn compute_constants(style: &Style, node_size: Size>, parent_size: S let border = style.border.resolve_or_default(parent_size.width.into_option()); let padding_border = Rect { - start: padding.start + border.start, - end: padding.end + border.end, + left: padding.left + border.left, + right: padding.right + border.right, top: padding.top + border.top, bottom: padding.bottom + border.bottom, }; @@ -1219,14 +1219,14 @@ fn distribute_remaining_free_space( let child_style = tree.style(child.node); if child_style.main_margin_start(constants.dir) == Dimension::Auto { if constants.is_row { - child.margin.start = margin; + child.margin.left = margin; } else { child.margin.top = margin; } } if child_style.main_margin_end(constants.dir) == Dimension::Auto { if constants.is_row { - child.margin.end = margin; + child.margin.right = margin; } else { child.margin.bottom = margin; } @@ -1337,20 +1337,20 @@ fn resolve_cross_axis_auto_margins( child.margin.top = free_space / 2.0; child.margin.bottom = free_space / 2.0; } else { - child.margin.start = free_space / 2.0; - child.margin.end = free_space / 2.0; + child.margin.left = free_space / 2.0; + child.margin.right = free_space / 2.0; } } else if child_style.cross_margin_start(constants.dir) == Dimension::Auto { if constants.is_row { child.margin.top = free_space; } else { - child.margin.start = free_space; + child.margin.left = free_space; } } else if child_style.cross_margin_end(constants.dir) == Dimension::Auto { if constants.is_row { child.margin.bottom = free_space; } else { - child.margin.end = free_space; + child.margin.right = free_space; } } else { // 14. Align all flex items along the cross-axis. @@ -1686,12 +1686,12 @@ fn perform_absolute_layout_on_absolute_children(tree: &mut impl LayoutTree, node let child_style = tree.style(child); // X-axis - let child_position_start = child_style.position.start.maybe_resolve(container_width); - let child_margin_start = child_style.margin.start.maybe_resolve(container_width); + let child_position_start = child_style.position.left.maybe_resolve(container_width); + let child_margin_start = child_style.margin.left.maybe_resolve(container_width); let start = child_position_start.maybe_add(child_margin_start); - let child_position_end = child_style.position.end.maybe_resolve(container_width); - let child_margin_end = child_style.margin.end.maybe_resolve(container_width); + let child_position_end = child_style.position.right.maybe_resolve(container_width); + let child_margin_end = child_style.margin.right.maybe_resolve(container_width); let end = child_position_end.maybe_add(child_margin_end); // Y-axis @@ -1893,8 +1893,8 @@ mod tests { // TODO: Replace with something less hardcoded? let padding_border = Rect { - start: padding.start + border.start, - end: padding.end + border.end, + left: padding.left + border.left, + right: padding.right + border.right, top: padding.top + border.top, bottom: padding.bottom + border.bottom, }; diff --git a/src/geometry.rs b/src/geometry.rs index 31bc3c8ed..7f871b926 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -13,13 +13,13 @@ pub struct Rect { /// /// The starting edge is the left edge when working with LTR text, /// and the right edge when working with RTL text. - pub start: T, + pub left: T, /// This can represent either the x-coordinate of the ending edge, /// or the amount of padding on the ending side. /// /// The ending edge is the right edge when working with LTR text, /// and the left edge when working with RTL text. - pub end: T, + pub right: T, /// This can represent either the y-coordinate of the top edge, /// or the amount of padding on the top side. pub top: T, @@ -40,8 +40,8 @@ impl Rect { U: Copy, { Rect { - start: f(self.start, size.width), - end: f(self.end, size.width), + left: f(self.left, size.width), + right: f(self.right, size.width), top: f(self.top, size.height), bottom: f(self.bottom, size.height), } @@ -58,7 +58,7 @@ where /// /// **NOTE:** this is *not* the width of the rectangle. pub(crate) fn horizontal_axis_sum(&self) -> T { - self.start + self.end + self.left + self.right } /// The sum of [`Rect.top`](Rect) and [`Rect.bottom`](Rect) @@ -104,7 +104,7 @@ where /// The `start` or `top` value of the [`Rect`], from the perspective of the main layout axis pub(crate) fn main_start(&self, direction: FlexDirection) -> T { if direction.is_row() { - self.start + self.left } else { self.top } @@ -113,7 +113,7 @@ where /// The `end` or `bottom` value of the [`Rect`], from the perspective of the main layout axis pub(crate) fn main_end(&self, direction: FlexDirection) -> T { if direction.is_row() { - self.end + self.right } else { self.bottom } @@ -124,7 +124,7 @@ where if direction.is_row() { self.top } else { - self.start + self.left } } @@ -133,19 +133,19 @@ where if direction.is_row() { self.bottom } else { - self.end + self.right } } } impl Rect { /// Creates a new Rect with `0.0` as all parameters - pub const ZERO: Rect = Self { start: 0.0, end: 0.0, top: 0.0, bottom: 0.0 }; + pub const ZERO: Rect = Self { left: 0.0, right: 0.0, top: 0.0, bottom: 0.0 }; /// Creates a new Rect #[must_use] pub const fn new(start: f32, end: f32, top: f32, bottom: f32) -> Self { - Self { start, end, top, bottom } + Self { left: start, right: end, top, bottom } } } diff --git a/src/resolve.rs b/src/resolve.rs index e8895d213..08f85c5d7 100644 --- a/src/resolve.rs +++ b/src/resolve.rs @@ -77,8 +77,8 @@ impl ResolveOrDefault>, Size> for Size { impl ResolveOrDefault>, Rect> for Rect { fn resolve_or_default(self, context: Size>) -> Rect { Rect { - start: self.start.resolve_or_default(context.width), - end: self.end.resolve_or_default(context.width), + left: self.left.resolve_or_default(context.width), + right: self.right.resolve_or_default(context.width), top: self.top.resolve_or_default(context.height), bottom: self.bottom.resolve_or_default(context.height), } @@ -88,8 +88,8 @@ impl ResolveOrDefault>, Rect> for Rect { impl ResolveOrDefault, Rect> for Rect { fn resolve_or_default(self, context: Option) -> Rect { Rect { - start: self.start.resolve_or_default(context), - end: self.end.resolve_or_default(context), + left: self.left.resolve_or_default(context), + right: self.right.resolve_or_default(context), top: self.top.resolve_or_default(context), bottom: self.bottom.resolve_or_default(context), } diff --git a/src/style.rs b/src/style.rs index 315097fc5..7b0b13491 100644 --- a/src/style.rs +++ b/src/style.rs @@ -283,7 +283,12 @@ impl Dimension { impl Default for Rect { fn default() -> Self { - Self { start: Default::default(), end: Default::default(), top: Default::default(), bottom: Default::default() } + Self { + left: Default::default(), + right: Default::default(), + top: Default::default(), + bottom: Default::default(), + } } } @@ -291,45 +296,45 @@ impl Rect { /// Generates a [`Rect`] using [`Dimension::Points`] values for `start` and `top` #[must_use] pub const fn top_from_points(start: f32, top: f32) -> Rect { - Rect { start: Dimension::Points(start), top: Dimension::Points(top), ..Rect::AUTO } + Rect { left: Dimension::Points(start), top: Dimension::Points(top), ..Rect::AUTO } } /// Generates a [`Rect`] using [`Dimension::Points`] values for `end` and `bottom` #[must_use] pub const fn bot_from_points(end: f32, bottom: f32) -> Rect { - Rect { end: Dimension::Points(end), bottom: Dimension::Points(bottom), ..Rect::AUTO } + Rect { right: Dimension::Points(end), bottom: Dimension::Points(bottom), ..Rect::AUTO } } /// Generates a [`Rect`] using [`Dimension::Percent`] values for `start` and `top` #[must_use] pub const fn top_from_percent(start: f32, top: f32) -> Rect { - Rect { start: Dimension::Percent(start), top: Dimension::Percent(top), ..Rect::AUTO } + Rect { left: Dimension::Percent(start), top: Dimension::Percent(top), ..Rect::AUTO } } /// Generates a [`Rect`] using [`Dimension::Percent`] values for `end` and `bottom` #[must_use] pub const fn bot_from_percent(end: f32, bottom: f32) -> Rect { - Rect { end: Dimension::Percent(end), bottom: Dimension::Percent(bottom), ..Rect::AUTO } + Rect { right: Dimension::Percent(end), bottom: Dimension::Percent(bottom), ..Rect::AUTO } } /// Generates a [`Rect`] using [`Dimension::Undefined`] for all values pub const UNDEFINED: Rect = Self { - start: Dimension::Undefined, - end: Dimension::Undefined, + left: Dimension::Undefined, + right: Dimension::Undefined, top: Dimension::Undefined, bottom: Dimension::Undefined, }; /// Generates a [`Rect`] using [`Dimension::Auto`] for all values pub const AUTO: Rect = - Self { start: Dimension::Auto, end: Dimension::Auto, top: Dimension::Auto, bottom: Dimension::Auto }; + Self { left: Dimension::Auto, right: Dimension::Auto, top: Dimension::Auto, bottom: Dimension::Auto }; /// Create a new Rect with [`Dimension::Points`] #[must_use] pub const fn from_points(start: f32, end: f32, top: f32, bottom: f32) -> Self { Rect { - start: Dimension::Points(start), - end: Dimension::Points(end), + left: Dimension::Points(start), + right: Dimension::Points(end), top: Dimension::Points(top), bottom: Dimension::Points(bottom), } @@ -339,8 +344,8 @@ impl Rect { #[must_use] pub const fn from_percent(start: f32, end: f32, top: f32, bottom: f32) -> Self { Rect { - start: Dimension::Percent(start), - end: Dimension::Percent(end), + left: Dimension::Percent(start), + right: Dimension::Percent(end), top: Dimension::Percent(top), bottom: Dimension::Percent(bottom), } @@ -475,7 +480,7 @@ impl Style { /// If the `direction` is row-oriented, the margin start. Otherwise the margin top pub(crate) fn main_margin_start(&self, direction: FlexDirection) -> Dimension { if direction.is_row() { - self.margin.start + self.margin.left } else { self.margin.top } @@ -484,7 +489,7 @@ impl Style { /// If the `direction` is row-oriented, the margin end. Otherwise the margin bottom pub(crate) fn main_margin_end(&self, direction: FlexDirection) -> Dimension { if direction.is_row() { - self.margin.end + self.margin.right } else { self.margin.bottom } @@ -522,7 +527,7 @@ impl Style { if direction.is_row() { self.margin.top } else { - self.margin.start + self.margin.left } } @@ -531,7 +536,7 @@ impl Style { if direction.is_row() { self.margin.bottom } else { - self.margin.end + self.margin.right } } 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 aff5cae8a..30f66b21a 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 @@ -10,7 +10,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { height: taffy::style::Dimension::Points(40f32), ..Default::default() }, - position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(5f32), ..Default::default() }, + position: taffy::geometry::Rect { left: taffy::style::Dimension::Points(5f32), ..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 5c1db0909..29be89e91 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 @@ -10,7 +10,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { height: taffy::style::Dimension::Points(40f32), ..Default::default() }, - position: taffy::geometry::Rect { end: taffy::style::Dimension::Points(5f32), ..Default::default() }, + position: taffy::geometry::Rect { right: taffy::style::Dimension::Points(5f32), ..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 e560766e7..f77b12913 100644 --- a/tests/generated/absolute_layout_start_top_end_bottom.rs +++ b/tests/generated/absolute_layout_start_top_end_bottom.rs @@ -6,8 +6,8 @@ fn absolute_layout_start_top_end_bottom() { taffy::style::Style { position_type: taffy::style::PositionType::Absolute, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 76a0924bd..5ef93ddbd 100644 --- a/tests/generated/absolute_layout_width_height_end_bottom.rs +++ b/tests/generated/absolute_layout_width_height_end_bottom.rs @@ -11,7 +11,7 @@ fn absolute_layout_width_height_end_bottom() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 90e88669f..fd0af4c56 100644 --- a/tests/generated/absolute_layout_width_height_start_top.rs +++ b/tests/generated/absolute_layout_width_height_start_top.rs @@ -11,7 +11,7 @@ fn absolute_layout_width_height_start_top() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), ..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 7c1058829..890bc0bf9 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 @@ -11,8 +11,8 @@ fn absolute_layout_width_height_start_top_end_bottom() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/absolute_layout_within_border.rs b/tests/generated/absolute_layout_within_border.rs index 78f8c5a35..138b5f1a6 100644 --- a/tests/generated/absolute_layout_within_border.rs +++ b/tests/generated/absolute_layout_within_border.rs @@ -11,7 +11,7 @@ fn absolute_layout_within_border() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(0f32), + left: taffy::style::Dimension::Points(0f32), top: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -30,7 +30,7 @@ fn absolute_layout_within_border() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(0f32), + right: taffy::style::Dimension::Points(0f32), bottom: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -49,14 +49,14 @@ fn absolute_layout_within_border() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(0f32), + left: taffy::style::Dimension::Points(0f32), top: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -75,14 +75,14 @@ fn absolute_layout_within_border() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Points(0f32), + right: taffy::style::Dimension::Points(0f32), bottom: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -100,15 +100,15 @@ fn absolute_layout_within_border() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 4bc2b7a20..ddb227b88 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 @@ -10,8 +10,8 @@ fn align_items_center_child_with_margin_bigger_than_parent() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..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 2975d65f2..19db7d4c0 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 @@ -10,8 +10,8 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/border_flex_child.rs b/tests/generated/border_flex_child.rs index fe7e8b934..9d47a97f7 100644 --- a/tests/generated/border_flex_child.rs +++ b/tests/generated/border_flex_child.rs @@ -20,8 +20,8 @@ fn border_flex_child() { ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/border_no_child.rs b/tests/generated/border_no_child.rs index 714e6c59d..6033b8326 100644 --- a/tests/generated/border_no_child.rs +++ b/tests/generated/border_no_child.rs @@ -5,8 +5,8 @@ fn border_no_child() { .new_with_children( taffy::style::Style { border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/border_stretch_child.rs b/tests/generated/border_stretch_child.rs index f9b2b6890..a21ad850c 100644 --- a/tests/generated/border_stretch_child.rs +++ b/tests/generated/border_stretch_child.rs @@ -19,8 +19,8 @@ fn border_stretch_child() { ..Default::default() }, border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/display_none_with_margin.rs b/tests/generated/display_none_with_margin.rs index 7e93d882f..63d0a3bd3 100644 --- a/tests/generated/display_none_with_margin.rs +++ b/tests/generated/display_none_with_margin.rs @@ -11,8 +11,8 @@ fn display_none_with_margin() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/gap_column_gap_child_margins.rs b/tests/generated/gap_column_gap_child_margins.rs index 388eb9ffe..ba1de74d5 100644 --- a/tests/generated/gap_column_gap_child_margins.rs +++ b/tests/generated/gap_column_gap_child_margins.rs @@ -8,8 +8,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(2f32), - end: taffy::style::Dimension::Points(2f32), + left: taffy::style::Dimension::Points(2f32), + right: taffy::style::Dimension::Points(2f32), ..Default::default() }, ..Default::default() @@ -24,8 +24,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -40,8 +40,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(15f32), - end: taffy::style::Dimension::Points(15f32), + left: taffy::style::Dimension::Points(15f32), + right: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..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 fe4fd1903..2912f6b79 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 @@ -23,8 +23,8 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(100f32), - end: taffy::style::Dimension::Points(100f32), + left: taffy::style::Dimension::Points(100f32), + right: taffy::style::Dimension::Points(100f32), ..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 3a6973faa..ae698b6b1 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 @@ -23,8 +23,8 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(100f32), - end: taffy::style::Dimension::Points(100f32), + left: taffy::style::Dimension::Points(100f32), + right: 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 d3108ffd7..2b1ce60e9 100644 --- a/tests/generated/justify_content_row_max_width_and_margin.rs +++ b/tests/generated/justify_content_row_max_width_and_margin.rs @@ -9,7 +9,7 @@ fn justify_content_row_max_width_and_margin() { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(100f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(100f32), ..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 e41a9bae0..af0eeacdf 100644 --- a/tests/generated/justify_content_row_min_width_and_margin.rs +++ b/tests/generated/justify_content_row_min_width_and_margin.rs @@ -9,7 +9,7 @@ fn justify_content_row_min_width_and_margin() { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/tests/generated/margin_and_flex_row.rs b/tests/generated/margin_and_flex_row.rs index 1805c1e7d..77e21bc43 100644 --- a/tests/generated/margin_and_flex_row.rs +++ b/tests/generated/margin_and_flex_row.rs @@ -6,8 +6,8 @@ fn margin_and_flex_row() { taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_and_stretch_column.rs b/tests/generated/margin_and_stretch_column.rs index bd64e1781..a753e3a89 100644 --- a/tests/generated/margin_and_stretch_column.rs +++ b/tests/generated/margin_and_stretch_column.rs @@ -6,8 +6,8 @@ fn margin_and_stretch_column() { taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_auto_left.rs b/tests/generated/margin_auto_left.rs index 5f29cd458..0a284fdfb 100644 --- a/tests/generated/margin_auto_left.rs +++ b/tests/generated/margin_auto_left.rs @@ -9,7 +9,7 @@ fn margin_auto_left() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 82615ade6..2c9298a29 100644 --- a/tests/generated/margin_auto_left_and_right.rs +++ b/tests/generated/margin_auto_left_and_right.rs @@ -10,8 +10,8 @@ fn margin_auto_left_and_right() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 55ea91221..79150e3ab 100644 --- a/tests/generated/margin_auto_left_and_right_column.rs +++ b/tests/generated/margin_auto_left_and_right_column.rs @@ -10,8 +10,8 @@ fn margin_auto_left_and_right_column() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 3ae3efe05..bb896a689 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 @@ -10,8 +10,8 @@ fn margin_auto_left_and_right_column_and_center() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 926df3b9e..023d03c5f 100644 --- a/tests/generated/margin_auto_left_and_right_strech.rs +++ b/tests/generated/margin_auto_left_and_right_strech.rs @@ -10,8 +10,8 @@ fn margin_auto_left_and_right_strech() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 a8455180c..9294be1ee 100644 --- a/tests/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_child_bigger_than_parent.rs @@ -9,7 +9,7 @@ fn margin_auto_left_child_bigger_than_parent() { height: taffy::style::Dimension::Points(72f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 f3f4c4113..e203c2cf8 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 @@ -10,8 +10,8 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Points(10f32), ..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 924091246..50f11daf4 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 @@ -10,8 +10,8 @@ fn margin_auto_left_right_child_bigger_than_parent() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Auto, - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Auto, + right: taffy::style::Dimension::Auto, ..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 3b0b789ee..f3afc7938 100644 --- a/tests/generated/margin_auto_left_stretching_child.rs +++ b/tests/generated/margin_auto_left_stretching_child.rs @@ -7,7 +7,7 @@ fn margin_auto_left_stretching_child() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Auto, ..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 d349c3c28..642f51e27 100644 --- a/tests/generated/margin_auto_mutiple_children_row.rs +++ b/tests/generated/margin_auto_mutiple_children_row.rs @@ -9,7 +9,7 @@ fn margin_auto_mutiple_children_row() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() }, &[], @@ -23,7 +23,7 @@ fn margin_auto_mutiple_children_row() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() }, &[], diff --git a/tests/generated/margin_auto_right.rs b/tests/generated/margin_auto_right.rs index 12d94a351..6e4036632 100644 --- a/tests/generated/margin_auto_right.rs +++ b/tests/generated/margin_auto_right.rs @@ -9,7 +9,7 @@ fn margin_auto_right() { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Auto, ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Auto, ..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 170fa2097..649b6c151 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 @@ -10,8 +10,8 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Auto, + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Auto, ..Default::default() }, ..Default::default() diff --git a/tests/generated/margin_left.rs b/tests/generated/margin_left.rs index d0dda9559..42c2d910f 100644 --- a/tests/generated/margin_left.rs +++ b/tests/generated/margin_left.rs @@ -5,7 +5,7 @@ fn margin_left() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/tests/generated/margin_right.rs b/tests/generated/margin_right.rs index cf513dae2..f76329196 100644 --- a/tests/generated/margin_right.rs +++ b/tests/generated/margin_right.rs @@ -5,7 +5,7 @@ fn margin_right() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..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 fdc5e740a..9771ad708 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 @@ -13,7 +13,7 @@ fn margin_should_not_be_part_of_max_width() { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, - margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(20f32), ..Default::default() }, + margin: taffy::geometry::Rect { left: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/tests/generated/margin_with_sibling_row.rs b/tests/generated/margin_with_sibling_row.rs index f4b618907..d9e648dd7 100644 --- a/tests/generated/margin_with_sibling_row.rs +++ b/tests/generated/margin_with_sibling_row.rs @@ -5,7 +5,7 @@ fn margin_with_sibling_row() { .new_with_children( taffy::style::Style { flex_grow: 1f32, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[], diff --git a/tests/generated/padding_align_end_child.rs b/tests/generated/padding_align_end_child.rs index eb9a72ce6..7c55fa105 100644 --- a/tests/generated/padding_align_end_child.rs +++ b/tests/generated/padding_align_end_child.rs @@ -10,8 +10,8 @@ fn padding_align_end_child() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/tests/generated/padding_center_child.rs b/tests/generated/padding_center_child.rs index 60b577d85..eeddd1405 100644 --- a/tests/generated/padding_center_child.rs +++ b/tests/generated/padding_center_child.rs @@ -25,8 +25,8 @@ fn padding_center_child() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/tests/generated/padding_flex_child.rs b/tests/generated/padding_flex_child.rs index d4036dd21..c7236262b 100644 --- a/tests/generated/padding_flex_child.rs +++ b/tests/generated/padding_flex_child.rs @@ -20,8 +20,8 @@ fn padding_flex_child() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/padding_no_child.rs b/tests/generated/padding_no_child.rs index 32d3bbf4a..c3e732b23 100644 --- a/tests/generated/padding_no_child.rs +++ b/tests/generated/padding_no_child.rs @@ -5,8 +5,8 @@ fn padding_no_child() { .new_with_children( taffy::style::Style { padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/padding_stretch_child.rs b/tests/generated/padding_stretch_child.rs index 27eb797c4..b612b5f36 100644 --- a/tests/generated/padding_stretch_child.rs +++ b/tests/generated/padding_stretch_child.rs @@ -19,8 +19,8 @@ fn padding_stretch_child() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..Default::default() diff --git a/tests/generated/percent_absolute_position.rs b/tests/generated/percent_absolute_position.rs index 67b0b30b0..ddd5b0964 100644 --- a/tests/generated/percent_absolute_position.rs +++ b/tests/generated/percent_absolute_position.rs @@ -29,7 +29,7 @@ fn percent_absolute_position() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.5f32), + left: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/percentage_absolute_position.rs b/tests/generated/percentage_absolute_position.rs index a6f694302..b56eaa296 100644 --- a/tests/generated/percentage_absolute_position.rs +++ b/tests/generated/percentage_absolute_position.rs @@ -11,7 +11,7 @@ fn percentage_absolute_position() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.3f32), + left: taffy::style::Dimension::Percent(0.3f32), top: taffy::style::Dimension::Percent(0.1f32), ..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 6dd8ac242..b6fc65ff0 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 @@ -20,8 +20,8 @@ fn percentage_margin_should_calculate_based_only_on_width() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), - end: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), + right: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..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 e43016e93..2cd489621 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 @@ -6,15 +6,15 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { taffy::style::Style { size: taffy::geometry::Size { width: 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), + left: taffy::style::Dimension::Percent(0.05f32), + right: taffy::style::Dimension::Percent(0.05f32), top: taffy::style::Dimension::Percent(0.05f32), bottom: taffy::style::Dimension::Percent(0.05f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(3f32), - end: taffy::style::Dimension::Points(3f32), + left: taffy::style::Dimension::Points(3f32), + right: taffy::style::Dimension::Points(3f32), top: taffy::style::Dimension::Points(3f32), bottom: taffy::style::Dimension::Points(3f32), ..Default::default() @@ -30,15 +30,15 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(5f32), - end: taffy::style::Dimension::Points(5f32), + left: taffy::style::Dimension::Points(5f32), + right: taffy::style::Dimension::Points(5f32), top: taffy::style::Dimension::Points(5f32), bottom: taffy::style::Dimension::Points(5f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.03f32), - end: taffy::style::Dimension::Percent(0.03f32), + left: taffy::style::Dimension::Percent(0.03f32), + right: taffy::style::Dimension::Percent(0.03f32), top: taffy::style::Dimension::Percent(0.03f32), bottom: taffy::style::Dimension::Percent(0.03f32), ..Default::default() @@ -59,15 +59,15 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(5f32), - end: taffy::style::Dimension::Points(5f32), + left: taffy::style::Dimension::Points(5f32), + right: taffy::style::Dimension::Points(5f32), top: taffy::style::Dimension::Points(5f32), bottom: taffy::style::Dimension::Points(5f32), ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(3f32), - end: taffy::style::Dimension::Points(3f32), + left: taffy::style::Dimension::Points(3f32), + right: taffy::style::Dimension::Points(3f32), top: taffy::style::Dimension::Points(3f32), bottom: taffy::style::Dimension::Points(3f32), ..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 613eb75dd..adcae0c1e 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 @@ -20,8 +20,8 @@ fn percentage_padding_should_calculate_based_only_on_width() { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), - end: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), + right: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.1f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..Default::default() diff --git a/tests/generated/percentage_position_bottom_right.rs b/tests/generated/percentage_position_bottom_right.rs index 2bf181f49..cb7b93133 100644 --- a/tests/generated/percentage_position_bottom_right.rs +++ b/tests/generated/percentage_position_bottom_right.rs @@ -10,7 +10,7 @@ fn percentage_position_bottom_right() { ..Default::default() }, position: taffy::geometry::Rect { - end: taffy::style::Dimension::Percent(0.2f32), + right: taffy::style::Dimension::Percent(0.2f32), bottom: taffy::style::Dimension::Percent(0.1f32), ..Default::default() }, diff --git a/tests/generated/percentage_position_left_top.rs b/tests/generated/percentage_position_left_top.rs index 9a2cdc3e1..0bb381af0 100644 --- a/tests/generated/percentage_position_left_top.rs +++ b/tests/generated/percentage_position_left_top.rs @@ -10,7 +10,7 @@ fn percentage_position_left_top() { ..Default::default() }, position: taffy::geometry::Rect { - start: taffy::style::Dimension::Percent(0.1f32), + left: taffy::style::Dimension::Percent(0.1f32), top: taffy::style::Dimension::Percent(0.2f32), ..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 687a6902a..064236546 100644 --- a/tests/generated/percentage_size_based_on_parent_inner_size.rs +++ b/tests/generated/percentage_size_based_on_parent_inner_size.rs @@ -24,8 +24,8 @@ fn percentage_size_based_on_parent_inner_size() { ..Default::default() }, padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..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 d897bcf66..35373aac8 100644 --- a/tests/generated/size_defined_by_child_with_border.rs +++ b/tests/generated/size_defined_by_child_with_border.rs @@ -18,8 +18,8 @@ fn size_defined_by_child_with_border() { .new_with_children( taffy::style::Style { border: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 99c148f03..39dede377 100644 --- a/tests/generated/size_defined_by_child_with_padding.rs +++ b/tests/generated/size_defined_by_child_with_padding.rs @@ -18,8 +18,8 @@ fn size_defined_by_child_with_padding() { .new_with_children( taffy::style::Style { padding: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(10f32), - end: taffy::style::Dimension::Points(10f32), + left: taffy::style::Dimension::Points(10f32), + right: taffy::style::Dimension::Points(10f32), top: taffy::style::Dimension::Points(10f32), bottom: taffy::style::Dimension::Points(10f32), ..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 475e001a6..6360d325f 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -37,7 +37,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, + margin: taffy::geometry::Rect { right: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, &[node010], diff --git a/tests/generated/wrapped_column_max_height.rs b/tests/generated/wrapped_column_max_height.rs index 6cf2231bb..13b6da18f 100644 --- a/tests/generated/wrapped_column_max_height.rs +++ b/tests/generated/wrapped_column_max_height.rs @@ -27,8 +27,8 @@ fn wrapped_column_max_height() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/tests/generated/wrapped_column_max_height_flex.rs b/tests/generated/wrapped_column_max_height_flex.rs index 815d915dd..f1772b525 100644 --- a/tests/generated/wrapped_column_max_height_flex.rs +++ b/tests/generated/wrapped_column_max_height_flex.rs @@ -33,8 +33,8 @@ fn wrapped_column_max_height_flex() { ..Default::default() }, margin: taffy::geometry::Rect { - start: taffy::style::Dimension::Points(20f32), - end: taffy::style::Dimension::Points(20f32), + left: taffy::style::Dimension::Points(20f32), + right: taffy::style::Dimension::Points(20f32), top: taffy::style::Dimension::Points(20f32), bottom: taffy::style::Dimension::Points(20f32), ..Default::default() diff --git a/tests/measure.rs b/tests/measure.rs index 4561618ea..7f8c6e4e3 100644 --- a/tests/measure.rs +++ b/tests/measure.rs @@ -95,8 +95,8 @@ mod measure { taffy::style::Style { size: taffy::geometry::Size { width: 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), + left: taffy::style::Dimension::Points(10.0), + right: taffy::style::Dimension::Points(10.0), top: taffy::style::Dimension::Points(10.0), bottom: taffy::style::Dimension::Points(10.0), },