From 49893a7d9b97a9042d1a736769be87b75903a550 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Wed, 23 Nov 2022 19:56:04 +0000 Subject: [PATCH] Rename FlexboxLayout back to Style (#251) --- README.md | 8 +- benches/big_tree.rs | 19 ++- benches/complex.rs | 36 +++--- ..._align_items_and_justify_content_center.rs | 4 +- ...tify_content_center_and_bottom_position.rs | 4 +- ...ustify_content_center_and_left_position.rs | 4 +- ...stify_content_center_and_right_position.rs | 4 +- ...justify_content_center_and_top_position.rs | 4 +- ...lign_items_and_justify_content_flex_end.rs | 4 +- .../absolute_layout_align_items_center.rs | 4 +- ...layout_align_items_center_on_child_only.rs | 4 +- .../generated/absolute_layout_child_order.rs | 8 +- ...layout_in_wrap_reverse_column_container.rs | 4 +- ..._wrap_reverse_column_container_flex_end.rs | 4 +- ...te_layout_in_wrap_reverse_row_container.rs | 4 +- ..._in_wrap_reverse_row_container_flex_end.rs | 4 +- .../absolute_layout_justify_content_center.rs | 4 +- benches/generated/absolute_layout_no_size.rs | 4 +- ...ercentage_bottom_based_on_parent_height.rs | 8 +- .../absolute_layout_start_top_end_bottom.rs | 4 +- ...absolute_layout_width_height_end_bottom.rs | 4 +- .../absolute_layout_width_height_start_top.rs | 4 +- ...ayout_width_height_start_top_end_bottom.rs | 4 +- .../absolute_layout_within_border.rs | 10 +- benches/generated/align_baseline.rs | 6 +- .../align_baseline_child_multiline.rs | 14 +-- .../generated/align_baseline_nested_child.rs | 8 +- ...ign_center_should_size_based_on_content.rs | 11 +- .../align_content_space_around_single_line.rs | 14 +-- .../align_content_space_around_wrapped.rs | 14 +-- ...align_content_space_between_single_line.rs | 14 +-- .../align_content_space_between_wrapped.rs | 14 +-- .../align_content_space_evenly_single_line.rs | 14 +-- .../align_content_space_evenly_wrapped.rs | 14 +-- ...lign_flex_start_with_shrinking_children.rs | 14 +-- ...rt_with_shrinking_children_with_stretch.rs | 14 +-- ...ign_flex_start_with_stretching_children.rs | 14 +-- benches/generated/align_items_center.rs | 4 +- ...er_child_with_margin_bigger_than_parent.rs | 6 +- ...child_without_margin_bigger_than_parent.rs | 6 +- .../align_items_center_with_child_margin.rs | 4 +- .../align_items_center_with_child_top.rs | 4 +- benches/generated/align_items_flex_end.rs | 4 +- ...nd_child_with_margin_bigger_than_parent.rs | 6 +- ...child_without_margin_bigger_than_parent.rs | 6 +- benches/generated/align_items_flex_start.rs | 4 +- benches/generated/align_items_min_max.rs | 4 +- benches/generated/align_items_stretch.rs | 4 +- benches/generated/align_self_baseline.rs | 8 +- benches/generated/align_self_center.rs | 4 +- benches/generated/align_self_flex_end.rs | 4 +- ...align_self_flex_end_override_flex_start.rs | 4 +- benches/generated/align_self_flex_start.rs | 4 +- ...lign_strech_should_size_based_on_parent.rs | 11 +- benches/generated/border_center_child.rs | 4 +- benches/generated/border_flex_child.rs | 4 +- benches/generated/border_no_child.rs | 2 +- benches/generated/border_stretch_child.rs | 4 +- .../generated/child_min_max_width_flexing.rs | 6 +- .../generated/container_with_unsized_child.rs | 4 +- benches/generated/display_none.rs | 7 +- benches/generated/display_none_fixed_size.rs | 7 +- benches/generated/display_none_with_child.rs | 10 +- benches/generated/display_none_with_margin.rs | 7 +- .../generated/display_none_with_position.rs | 7 +- ...x_basis_and_main_dimen_set_when_flexing.rs | 6 +- .../generated/flex_basis_flex_grow_column.rs | 7 +- benches/generated/flex_basis_flex_grow_row.rs | 7 +- .../flex_basis_flex_shrink_column.rs | 6 +- .../generated/flex_basis_flex_shrink_row.rs | 6 +- .../flex_basis_larger_than_content_column.rs | 6 +- .../flex_basis_larger_than_content_row.rs | 6 +- .../flex_basis_overrides_main_size.rs | 8 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- .../flex_basis_smaller_than_content_column.rs | 6 +- .../flex_basis_smaller_than_content_row.rs | 6 +- ...ex_basis_smaller_than_main_dimen_column.rs | 4 +- .../flex_basis_smaller_than_main_dimen_row.rs | 4 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- ..._then_content_with_flex_grow_small_size.rs | 10 +- ...ontent_with_flex_grow_unconstraint_size.rs | 10 +- ..._content_with_flex_grow_very_large_size.rs | 10 +- .../flex_basis_unconstraint_column.rs | 4 +- .../generated/flex_basis_unconstraint_row.rs | 4 +- benches/generated/flex_direction_column.rs | 8 +- .../flex_direction_column_no_height.rs | 8 +- .../flex_direction_column_reverse.rs | 8 +- benches/generated/flex_direction_row.rs | 8 +- .../generated/flex_direction_row_no_width.rs | 8 +- .../generated/flex_direction_row_reverse.rs | 8 +- benches/generated/flex_grow_child.rs | 4 +- .../flex_grow_flex_basis_percent_min_max.rs | 6 +- .../generated/flex_grow_height_maximized.rs | 8 +- .../flex_grow_in_at_most_container.rs | 6 +- .../flex_grow_less_than_factor_one.rs | 14 +-- benches/generated/flex_grow_root_minimized.rs | 8 +- benches/generated/flex_grow_shrink_at_most.rs | 9 +- benches/generated/flex_grow_to_min.rs | 9 +- ...flex_grow_within_constrained_max_column.rs | 6 +- .../flex_grow_within_constrained_max_row.rs | 8 +- .../flex_grow_within_constrained_max_width.rs | 6 +- ...flex_grow_within_constrained_min_column.rs | 7 +- ..._grow_within_constrained_min_max_column.rs | 7 +- .../flex_grow_within_constrained_min_row.rs | 7 +- .../generated/flex_grow_within_max_width.rs | 6 +- benches/generated/flex_root_ignored.rs | 6 +- ...ex_shrink_by_outer_margin_with_max_size.rs | 4 +- ...flex_grow_child_flex_shrink_other_child.rs | 6 +- .../generated/flex_shrink_flex_grow_row.rs | 6 +- benches/generated/flex_shrink_to_zero.rs | 8 +- .../flex_wrap_align_stretch_fits_one_row.rs | 6 +- ...ren_with_min_main_overriding_flex_basis.rs | 6 +- .../flex_wrap_wrap_to_child_height.rs | 10 +- .../generated/gap_column_gap_child_margins.rs | 8 +- benches/generated/gap_column_gap_flexible.rs | 8 +- ...ap_column_gap_flexible_undefined_parent.rs | 8 +- .../generated/gap_column_gap_inflexible.rs | 8 +- ..._column_gap_inflexible_undefined_parent.rs | 8 +- .../gap_column_gap_justify_center.rs | 8 +- .../gap_column_gap_justify_flex_end.rs | 8 +- .../gap_column_gap_justify_flex_start.rs | 8 +- .../gap_column_gap_justify_space_around.rs | 8 +- .../gap_column_gap_justify_space_between.rs | 8 +- .../gap_column_gap_justify_space_evenly.rs | 8 +- .../gap_column_gap_mixed_flexible.rs | 8 +- ..._percentage_cyclic_partially_shrinkable.rs | 8 +- ...column_gap_percentage_cyclic_shrinkable.rs | 8 +- ...lumn_gap_percentage_cyclic_unshrinkable.rs | 8 +- .../gap_column_gap_percentage_flexible.rs | 8 +- .../gap_column_gap_percentage_inflexible.rs | 8 +- .../gap_column_gap_wrap_align_center.rs | 14 +-- .../gap_column_gap_wrap_align_flex_end.rs | 14 +-- .../gap_column_gap_wrap_align_flex_start.rs | 14 +-- .../gap_column_gap_wrap_align_space_around.rs | 14 +-- ...gap_column_gap_wrap_align_space_between.rs | 14 +-- .../gap_column_gap_wrap_align_stretch.rs | 12 +- .../generated/gap_column_row_gap_wrapping.rs | 20 ++-- .../gap_percentage_row_gap_wrapping.rs | 20 ++-- .../generated/gap_row_gap_align_items_end.rs | 14 +-- .../gap_row_gap_align_items_stretch.rs | 14 +-- .../gap_row_gap_column_child_margins.rs | 8 +- .../gap_row_gap_row_wrap_child_margins.rs | 8 +- .../justify_content_column_center.rs | 8 +- .../justify_content_column_flex_end.rs | 8 +- .../justify_content_column_flex_start.rs | 8 +- ...ent_column_min_height_and_margin_bottom.rs | 4 +- ...ontent_column_min_height_and_margin_top.rs | 4 +- .../justify_content_column_space_around.rs | 8 +- .../justify_content_column_space_between.rs | 8 +- .../justify_content_column_space_evenly.rs | 8 +- benches/generated/justify_content_min_max.rs | 4 +- ...padding_child_width_greater_than_parent.rs | 8 +- ...h_padding_child_width_lower_than_parent.rs | 8 +- .../justify_content_overflow_min_max.rs | 8 +- .../generated/justify_content_row_center.rs | 8 +- .../generated/justify_content_row_flex_end.rs | 8 +- .../justify_content_row_flex_start.rs | 8 +- ...ustify_content_row_max_width_and_margin.rs | 4 +- ...ustify_content_row_min_width_and_margin.rs | 4 +- .../justify_content_row_space_around.rs | 8 +- .../justify_content_row_space_between.rs | 8 +- .../justify_content_row_space_evenly.rs | 8 +- benches/generated/margin_and_flex_column.rs | 4 +- benches/generated/margin_and_flex_row.rs | 4 +- .../generated/margin_and_stretch_column.rs | 4 +- benches/generated/margin_and_stretch_row.rs | 4 +- benches/generated/margin_auto_bottom.rs | 6 +- .../generated/margin_auto_bottom_and_top.rs | 6 +- ...rgin_auto_bottom_and_top_justify_center.rs | 6 +- benches/generated/margin_auto_left.rs | 6 +- .../generated/margin_auto_left_and_right.rs | 6 +- .../margin_auto_left_and_right_column.rs | 6 +- ...n_auto_left_and_right_column_and_center.rs | 6 +- .../margin_auto_left_and_right_strech.rs | 6 +- ...rgin_auto_left_child_bigger_than_parent.rs | 4 +- ...left_fix_right_child_bigger_than_parent.rs | 4 +- ...uto_left_right_child_bigger_than_parent.rs | 4 +- .../margin_auto_left_stretching_child.rs | 6 +- .../margin_auto_mutiple_children_column.rs | 8 +- .../margin_auto_mutiple_children_row.rs | 8 +- benches/generated/margin_auto_right.rs | 6 +- benches/generated/margin_auto_top.rs | 6 +- .../margin_auto_top_and_bottom_strech.rs | 6 +- .../margin_auto_top_stretching_child.rs | 6 +- benches/generated/margin_bottom.rs | 4 +- ...eft_auto_right_child_bigger_than_parent.rs | 4 +- benches/generated/margin_left.rs | 4 +- benches/generated/margin_right.rs | 4 +- ...margin_should_not_be_part_of_max_height.rs | 4 +- .../margin_should_not_be_part_of_max_width.rs | 4 +- benches/generated/margin_top.rs | 4 +- .../generated/margin_with_sibling_column.rs | 7 +- benches/generated/margin_with_sibling_row.rs | 7 +- benches/generated/max_height.rs | 4 +- .../generated/max_height_overrides_height.rs | 4 +- .../max_height_overrides_height_on_root.rs | 2 +- benches/generated/max_width.rs | 4 +- .../generated/max_width_overrides_width.rs | 4 +- .../max_width_overrides_width_on_root.rs | 2 +- benches/generated/min_height.rs | 7 +- .../generated/min_height_overrides_height.rs | 4 +- .../min_height_overrides_height_on_root.rs | 2 +- .../min_max_percent_no_width_height.rs | 4 +- benches/generated/min_width.rs | 7 +- .../generated/min_width_overrides_width.rs | 4 +- .../min_width_overrides_width_on_root.rs | 2 +- benches/generated/nested_overflowing_child.rs | 6 +- ..._overflowing_child_in_constraint_parent.rs | 6 +- benches/generated/overflow_cross_axis.rs | 4 +- benches/generated/overflow_main_axis.rs | 4 +- 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 | 2 +- benches/generated/padding_stretch_child.rs | 4 +- ...rent_wrap_child_size_overflowing_parent.rs | 6 +- .../generated/percent_absolute_position.rs | 8 +- benches/generated/percent_within_flex_grow.rs | 10 +- .../generated/percentage_absolute_position.rs | 4 +- ...centage_container_in_wrapping_container.rs | 10 +- benches/generated/percentage_flex_basis.rs | 6 +- .../generated/percentage_flex_basis_cross.rs | 6 +- .../percentage_flex_basis_cross_max_height.rs | 6 +- .../percentage_flex_basis_cross_max_width.rs | 6 +- .../percentage_flex_basis_cross_min_height.rs | 6 +- .../percentage_flex_basis_cross_min_width.rs | 6 +- .../percentage_flex_basis_main_max_height.rs | 6 +- .../percentage_flex_basis_main_max_width.rs | 6 +- .../percentage_flex_basis_main_min_width.rs | 6 +- ...in_should_calculate_based_only_on_width.rs | 6 +- ...th_padding_margin_and_percentage_values.rs | 10 +- ...ng_should_calculate_based_only_on_width.rs | 6 +- .../percentage_position_bottom_right.rs | 4 +- .../generated/percentage_position_left_top.rs | 4 +- ...centage_size_based_on_parent_inner_size.rs | 4 +- .../percentage_size_of_flex_basis.rs | 6 +- benches/generated/percentage_width_height.rs | 4 +- ...tage_width_height_undefined_parent_size.rs | 4 +- ...tive_position_should_not_nudge_siblings.rs | 6 +- ..._basis_flex_grow_row_prime_number_width.rs | 17 +-- ...g_flex_basis_flex_grow_row_width_of_100.rs | 11 +- .../rounding_flex_basis_flex_shrink_row.rs | 8 +- ...rounding_flex_basis_overrides_main_size.rs | 8 +- .../generated/rounding_fractial_input_1.rs | 8 +- .../generated/rounding_fractial_input_2.rs | 8 +- .../generated/rounding_fractial_input_3.rs | 8 +- .../generated/rounding_fractial_input_4.rs | 8 +- benches/generated/rounding_total_fractial.rs | 8 +- .../rounding_total_fractial_nested.rs | 12 +- benches/generated/size_defined_by_child.rs | 4 +- .../size_defined_by_child_with_border.rs | 4 +- .../size_defined_by_child_with_padding.rs | 4 +- .../generated/size_defined_by_grand_child.rs | 6 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- ..._then_content_with_flex_grow_small_size.rs | 10 +- ...ontent_with_flex_grow_unconstraint_size.rs | 10 +- ..._content_with_flex_grow_very_large_size.rs | 10 +- benches/generated/wrap_column.rs | 10 +- ..._nodes_with_content_sizing_margin_cross.rs | 12 +- ..._with_content_sizing_overflowing_margin.rs | 12 +- benches/generated/wrap_reverse_column.rs | 10 +- .../wrap_reverse_column_fixed_size.rs | 12 +- benches/generated/wrap_reverse_row.rs | 10 +- .../wrap_reverse_row_align_content_center.rs | 12 +- ...ap_reverse_row_align_content_flex_start.rs | 12 +- ..._reverse_row_align_content_space_around.rs | 12 +- .../wrap_reverse_row_align_content_stretch.rs | 12 +- ..._reverse_row_single_line_different_size.rs | 12 +- benches/generated/wrap_row.rs | 10 +- .../generated/wrap_row_align_items_center.rs | 10 +- .../wrap_row_align_items_flex_end.rs | 10 +- .../generated/wrapped_column_max_height.rs | 8 +- .../wrapped_column_max_height_flex.rs | 8 +- .../wrapped_row_within_align_items_center.rs | 8 +- ...wrapped_row_within_align_items_flex_end.rs | 8 +- ...apped_row_within_align_items_flex_start.rs | 8 +- examples/basic.rs | 4 +- examples/flexbox-gap.rs | 11 +- examples/nested.rs | 13 +- scripts/gentest/src/main.rs | 2 +- src/compute/flexbox.rs | 19 ++- src/data.rs | 6 +- src/node.rs | 112 +++++++++--------- src/prelude.rs | 4 +- src/randomizable.rs | 6 +- src/style.rs | 48 ++++---- src/tree.rs | 4 +- ..._align_items_and_justify_content_center.rs | 4 +- ...tify_content_center_and_bottom_position.rs | 4 +- ...ustify_content_center_and_left_position.rs | 4 +- ...stify_content_center_and_right_position.rs | 4 +- ...justify_content_center_and_top_position.rs | 4 +- ...lign_items_and_justify_content_flex_end.rs | 4 +- .../absolute_layout_align_items_center.rs | 4 +- ...layout_align_items_center_on_child_only.rs | 4 +- .../generated/absolute_layout_child_order.rs | 8 +- ...layout_in_wrap_reverse_column_container.rs | 4 +- ..._wrap_reverse_column_container_flex_end.rs | 4 +- ...te_layout_in_wrap_reverse_row_container.rs | 4 +- ..._in_wrap_reverse_row_container_flex_end.rs | 4 +- .../absolute_layout_justify_content_center.rs | 4 +- tests/generated/absolute_layout_no_size.rs | 4 +- ...ercentage_bottom_based_on_parent_height.rs | 8 +- .../absolute_layout_start_top_end_bottom.rs | 4 +- ...absolute_layout_width_height_end_bottom.rs | 4 +- .../absolute_layout_width_height_start_top.rs | 4 +- ...ayout_width_height_start_top_end_bottom.rs | 4 +- .../absolute_layout_within_border.rs | 10 +- tests/generated/align_baseline.rs | 6 +- .../align_baseline_child_multiline.rs | 14 +-- .../generated/align_baseline_nested_child.rs | 8 +- ...ign_center_should_size_based_on_content.rs | 11 +- .../align_content_space_around_single_line.rs | 14 +-- .../align_content_space_around_wrapped.rs | 14 +-- ...align_content_space_between_single_line.rs | 14 +-- .../align_content_space_between_wrapped.rs | 14 +-- .../align_content_space_evenly_single_line.rs | 14 +-- .../align_content_space_evenly_wrapped.rs | 14 +-- ...lign_flex_start_with_shrinking_children.rs | 14 +-- ...rt_with_shrinking_children_with_stretch.rs | 14 +-- ...ign_flex_start_with_stretching_children.rs | 14 +-- tests/generated/align_items_center.rs | 4 +- ...er_child_with_margin_bigger_than_parent.rs | 6 +- ...child_without_margin_bigger_than_parent.rs | 6 +- .../align_items_center_with_child_margin.rs | 4 +- .../align_items_center_with_child_top.rs | 4 +- tests/generated/align_items_flex_end.rs | 4 +- ...nd_child_with_margin_bigger_than_parent.rs | 6 +- ...child_without_margin_bigger_than_parent.rs | 6 +- tests/generated/align_items_flex_start.rs | 4 +- tests/generated/align_items_min_max.rs | 4 +- tests/generated/align_items_stretch.rs | 4 +- tests/generated/align_self_baseline.rs | 8 +- tests/generated/align_self_center.rs | 4 +- tests/generated/align_self_flex_end.rs | 4 +- ...align_self_flex_end_override_flex_start.rs | 4 +- tests/generated/align_self_flex_start.rs | 4 +- ...lign_strech_should_size_based_on_parent.rs | 11 +- tests/generated/border_center_child.rs | 4 +- tests/generated/border_flex_child.rs | 4 +- tests/generated/border_no_child.rs | 2 +- tests/generated/border_stretch_child.rs | 4 +- .../generated/child_min_max_width_flexing.rs | 6 +- .../generated/container_with_unsized_child.rs | 4 +- tests/generated/display_none.rs | 7 +- tests/generated/display_none_fixed_size.rs | 7 +- tests/generated/display_none_with_child.rs | 10 +- tests/generated/display_none_with_margin.rs | 7 +- tests/generated/display_none_with_position.rs | 7 +- ...x_basis_and_main_dimen_set_when_flexing.rs | 6 +- .../generated/flex_basis_flex_grow_column.rs | 7 +- tests/generated/flex_basis_flex_grow_row.rs | 7 +- .../flex_basis_flex_shrink_column.rs | 6 +- tests/generated/flex_basis_flex_shrink_row.rs | 6 +- .../flex_basis_larger_than_content_column.rs | 6 +- .../flex_basis_larger_than_content_row.rs | 6 +- .../flex_basis_overrides_main_size.rs | 8 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- .../flex_basis_smaller_than_content_column.rs | 6 +- .../flex_basis_smaller_than_content_row.rs | 6 +- ...ex_basis_smaller_than_main_dimen_column.rs | 4 +- .../flex_basis_smaller_than_main_dimen_row.rs | 4 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- ..._then_content_with_flex_grow_small_size.rs | 10 +- ...ontent_with_flex_grow_unconstraint_size.rs | 10 +- ..._content_with_flex_grow_very_large_size.rs | 10 +- .../flex_basis_unconstraint_column.rs | 4 +- .../generated/flex_basis_unconstraint_row.rs | 4 +- tests/generated/flex_direction_column.rs | 8 +- .../flex_direction_column_no_height.rs | 8 +- .../flex_direction_column_reverse.rs | 8 +- tests/generated/flex_direction_row.rs | 8 +- .../generated/flex_direction_row_no_width.rs | 8 +- tests/generated/flex_direction_row_reverse.rs | 8 +- tests/generated/flex_grow_child.rs | 4 +- .../flex_grow_flex_basis_percent_min_max.rs | 6 +- tests/generated/flex_grow_height_maximized.rs | 8 +- .../flex_grow_in_at_most_container.rs | 6 +- .../flex_grow_less_than_factor_one.rs | 14 +-- tests/generated/flex_grow_root_minimized.rs | 8 +- tests/generated/flex_grow_shrink_at_most.rs | 9 +- tests/generated/flex_grow_to_min.rs | 9 +- ...flex_grow_within_constrained_max_column.rs | 6 +- .../flex_grow_within_constrained_max_row.rs | 8 +- .../flex_grow_within_constrained_max_width.rs | 6 +- ...flex_grow_within_constrained_min_column.rs | 7 +- ..._grow_within_constrained_min_max_column.rs | 7 +- .../flex_grow_within_constrained_min_row.rs | 7 +- tests/generated/flex_grow_within_max_width.rs | 6 +- tests/generated/flex_root_ignored.rs | 6 +- ...ex_shrink_by_outer_margin_with_max_size.rs | 4 +- ...flex_grow_child_flex_shrink_other_child.rs | 6 +- tests/generated/flex_shrink_flex_grow_row.rs | 6 +- tests/generated/flex_shrink_to_zero.rs | 8 +- .../flex_wrap_align_stretch_fits_one_row.rs | 6 +- ...ren_with_min_main_overriding_flex_basis.rs | 6 +- .../flex_wrap_wrap_to_child_height.rs | 10 +- .../generated/gap_column_gap_child_margins.rs | 8 +- tests/generated/gap_column_gap_flexible.rs | 8 +- ...ap_column_gap_flexible_undefined_parent.rs | 8 +- tests/generated/gap_column_gap_inflexible.rs | 8 +- ..._column_gap_inflexible_undefined_parent.rs | 8 +- .../gap_column_gap_justify_center.rs | 8 +- .../gap_column_gap_justify_flex_end.rs | 8 +- .../gap_column_gap_justify_flex_start.rs | 8 +- .../gap_column_gap_justify_space_around.rs | 8 +- .../gap_column_gap_justify_space_between.rs | 8 +- .../gap_column_gap_justify_space_evenly.rs | 8 +- .../gap_column_gap_mixed_flexible.rs | 8 +- ..._percentage_cyclic_partially_shrinkable.rs | 8 +- ...column_gap_percentage_cyclic_shrinkable.rs | 8 +- ...lumn_gap_percentage_cyclic_unshrinkable.rs | 8 +- .../gap_column_gap_percentage_flexible.rs | 8 +- .../gap_column_gap_percentage_inflexible.rs | 8 +- .../gap_column_gap_wrap_align_center.rs | 14 +-- .../gap_column_gap_wrap_align_flex_end.rs | 14 +-- .../gap_column_gap_wrap_align_flex_start.rs | 14 +-- .../gap_column_gap_wrap_align_space_around.rs | 14 +-- ...gap_column_gap_wrap_align_space_between.rs | 14 +-- .../gap_column_gap_wrap_align_stretch.rs | 12 +- .../generated/gap_column_row_gap_wrapping.rs | 20 ++-- .../gap_percentage_row_gap_wrapping.rs | 20 ++-- .../generated/gap_row_gap_align_items_end.rs | 14 +-- .../gap_row_gap_align_items_stretch.rs | 14 +-- .../gap_row_gap_column_child_margins.rs | 8 +- .../gap_row_gap_row_wrap_child_margins.rs | 8 +- .../justify_content_column_center.rs | 8 +- .../justify_content_column_flex_end.rs | 8 +- .../justify_content_column_flex_start.rs | 8 +- ...ent_column_min_height_and_margin_bottom.rs | 4 +- ...ontent_column_min_height_and_margin_top.rs | 4 +- .../justify_content_column_space_around.rs | 8 +- .../justify_content_column_space_between.rs | 8 +- .../justify_content_column_space_evenly.rs | 8 +- tests/generated/justify_content_min_max.rs | 4 +- ...padding_child_width_greater_than_parent.rs | 8 +- ...h_padding_child_width_lower_than_parent.rs | 8 +- .../justify_content_overflow_min_max.rs | 8 +- tests/generated/justify_content_row_center.rs | 8 +- .../generated/justify_content_row_flex_end.rs | 8 +- .../justify_content_row_flex_start.rs | 8 +- ...ustify_content_row_max_width_and_margin.rs | 4 +- ...ustify_content_row_min_width_and_margin.rs | 4 +- .../justify_content_row_space_around.rs | 8 +- .../justify_content_row_space_between.rs | 8 +- .../justify_content_row_space_evenly.rs | 8 +- tests/generated/margin_and_flex_column.rs | 4 +- tests/generated/margin_and_flex_row.rs | 4 +- tests/generated/margin_and_stretch_column.rs | 4 +- tests/generated/margin_and_stretch_row.rs | 4 +- tests/generated/margin_auto_bottom.rs | 6 +- tests/generated/margin_auto_bottom_and_top.rs | 6 +- ...rgin_auto_bottom_and_top_justify_center.rs | 6 +- tests/generated/margin_auto_left.rs | 6 +- tests/generated/margin_auto_left_and_right.rs | 6 +- .../margin_auto_left_and_right_column.rs | 6 +- ...n_auto_left_and_right_column_and_center.rs | 6 +- .../margin_auto_left_and_right_strech.rs | 6 +- ...rgin_auto_left_child_bigger_than_parent.rs | 4 +- ...left_fix_right_child_bigger_than_parent.rs | 4 +- ...uto_left_right_child_bigger_than_parent.rs | 4 +- .../margin_auto_left_stretching_child.rs | 6 +- .../margin_auto_mutiple_children_column.rs | 8 +- .../margin_auto_mutiple_children_row.rs | 8 +- tests/generated/margin_auto_right.rs | 6 +- tests/generated/margin_auto_top.rs | 6 +- .../margin_auto_top_and_bottom_strech.rs | 6 +- .../margin_auto_top_stretching_child.rs | 6 +- tests/generated/margin_bottom.rs | 4 +- ...eft_auto_right_child_bigger_than_parent.rs | 4 +- tests/generated/margin_left.rs | 4 +- tests/generated/margin_right.rs | 4 +- ...margin_should_not_be_part_of_max_height.rs | 4 +- .../margin_should_not_be_part_of_max_width.rs | 4 +- tests/generated/margin_top.rs | 4 +- tests/generated/margin_with_sibling_column.rs | 7 +- tests/generated/margin_with_sibling_row.rs | 7 +- tests/generated/max_height.rs | 4 +- .../generated/max_height_overrides_height.rs | 4 +- .../max_height_overrides_height_on_root.rs | 2 +- tests/generated/max_width.rs | 4 +- tests/generated/max_width_overrides_width.rs | 4 +- .../max_width_overrides_width_on_root.rs | 2 +- tests/generated/min_height.rs | 7 +- .../generated/min_height_overrides_height.rs | 4 +- .../min_height_overrides_height_on_root.rs | 2 +- .../min_max_percent_no_width_height.rs | 4 +- tests/generated/min_width.rs | 7 +- tests/generated/min_width_overrides_width.rs | 4 +- .../min_width_overrides_width_on_root.rs | 2 +- tests/generated/nested_overflowing_child.rs | 6 +- ..._overflowing_child_in_constraint_parent.rs | 6 +- tests/generated/overflow_cross_axis.rs | 4 +- tests/generated/overflow_main_axis.rs | 4 +- 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 | 2 +- tests/generated/padding_stretch_child.rs | 4 +- ...rent_wrap_child_size_overflowing_parent.rs | 6 +- tests/generated/percent_absolute_position.rs | 8 +- tests/generated/percent_within_flex_grow.rs | 10 +- .../generated/percentage_absolute_position.rs | 4 +- ...centage_container_in_wrapping_container.rs | 10 +- tests/generated/percentage_flex_basis.rs | 6 +- .../generated/percentage_flex_basis_cross.rs | 6 +- .../percentage_flex_basis_cross_max_height.rs | 6 +- .../percentage_flex_basis_cross_max_width.rs | 6 +- .../percentage_flex_basis_cross_min_height.rs | 6 +- .../percentage_flex_basis_cross_min_width.rs | 6 +- .../percentage_flex_basis_main_max_height.rs | 6 +- .../percentage_flex_basis_main_max_width.rs | 6 +- .../percentage_flex_basis_main_min_width.rs | 6 +- ...in_should_calculate_based_only_on_width.rs | 6 +- ...th_padding_margin_and_percentage_values.rs | 10 +- ...ng_should_calculate_based_only_on_width.rs | 6 +- .../percentage_position_bottom_right.rs | 4 +- .../generated/percentage_position_left_top.rs | 4 +- ...centage_size_based_on_parent_inner_size.rs | 4 +- .../percentage_size_of_flex_basis.rs | 6 +- tests/generated/percentage_width_height.rs | 4 +- ...tage_width_height_undefined_parent_size.rs | 4 +- ...tive_position_should_not_nudge_siblings.rs | 6 +- ..._basis_flex_grow_row_prime_number_width.rs | 17 +-- ...g_flex_basis_flex_grow_row_width_of_100.rs | 11 +- .../rounding_flex_basis_flex_shrink_row.rs | 8 +- ...rounding_flex_basis_overrides_main_size.rs | 8 +- tests/generated/rounding_fractial_input_1.rs | 8 +- tests/generated/rounding_fractial_input_2.rs | 8 +- tests/generated/rounding_fractial_input_3.rs | 8 +- tests/generated/rounding_fractial_input_4.rs | 8 +- tests/generated/rounding_total_fractial.rs | 8 +- .../rounding_total_fractial_nested.rs | 12 +- tests/generated/size_defined_by_child.rs | 4 +- .../size_defined_by_child_with_border.rs | 4 +- .../size_defined_by_child_with_padding.rs | 4 +- .../generated/size_defined_by_grand_child.rs | 6 +- ..._then_content_with_flex_grow_large_size.rs | 10 +- ..._then_content_with_flex_grow_small_size.rs | 10 +- ...ontent_with_flex_grow_unconstraint_size.rs | 10 +- ..._content_with_flex_grow_very_large_size.rs | 10 +- tests/generated/wrap_column.rs | 10 +- ..._nodes_with_content_sizing_margin_cross.rs | 12 +- ..._with_content_sizing_overflowing_margin.rs | 12 +- tests/generated/wrap_reverse_column.rs | 10 +- .../wrap_reverse_column_fixed_size.rs | 12 +- tests/generated/wrap_reverse_row.rs | 10 +- .../wrap_reverse_row_align_content_center.rs | 12 +- ...ap_reverse_row_align_content_flex_start.rs | 12 +- ..._reverse_row_align_content_space_around.rs | 12 +- .../wrap_reverse_row_align_content_stretch.rs | 12 +- ..._reverse_row_single_line_different_size.rs | 12 +- tests/generated/wrap_row.rs | 10 +- .../generated/wrap_row_align_items_center.rs | 10 +- .../wrap_row_align_items_flex_end.rs | 10 +- tests/generated/wrapped_column_max_height.rs | 8 +- .../wrapped_column_max_height_flex.rs | 8 +- .../wrapped_row_within_align_items_center.rs | 8 +- ...wrapped_row_within_align_items_flex_end.rs | 8 +- ...apped_row_within_align_items_flex_start.rs | 8 +- tests/measure.rs | 78 ++++++------ tests/relayout.rs | 6 +- tests/root_constraints.rs | 6 +- tests/simple_child.rs | 12 +- 564 files changed, 2069 insertions(+), 2211 deletions(-) diff --git a/README.md b/README.md index ea637f091..1b6f3df63 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ let mut taffy = Taffy::new(); // Create a tree of nodes using `taffy.new_leaf` and `taffy.new_with_children`. // These functions both return a node id which can be used to refer to that node -// The FlexboxLayout struct is used to specify styling information +// The Style struct is used to specify styling information let header_node = taffy .new_leaf( - FlexboxLayout { + Style { size: Size { width: Dimension::Points(800.0), height: Dimension::Points(100.0) }, ..Default::default() }, @@ -35,7 +35,7 @@ let header_node = taffy let body_node = taffy .new_leaf( - FlexboxLayout { + Style { size: Size { width: Dimension::Points(800.0), height: Dimension::Undefined }, flex_grow: 1.0, ..Default::default() @@ -44,7 +44,7 @@ let body_node = taffy let root_node = taffy .new_with_children( - FlexboxLayout { + Style { flex_direction: FlexDirection::Column, size: Size { width: Dimension::Points(800.0), height: Dimension::Points(600.0) }, ..Default::default() diff --git a/benches/big_tree.rs b/benches/big_tree.rs index 97aea4183..d965885ac 100644 --- a/benches/big_tree.rs +++ b/benches/big_tree.rs @@ -4,11 +4,11 @@ use rand::prelude::*; use rand_chacha::ChaCha8Rng; use taffy::prelude::*; use taffy::randomizable::Randomizeable; -use taffy::style::FlexboxLayout; +use taffy::style::Style; /// Build a random leaf node fn build_random_leaf(taffy: &mut Taffy, rng: &mut ChaCha8Rng) -> Node { - taffy.new_with_children(FlexboxLayout::random(rng), &[]).unwrap() + taffy.new_with_children(Style::random(rng), &[]).unwrap() } /// A tree with many children that have shallow depth @@ -20,13 +20,13 @@ fn build_flat_hierarchy(taffy: &mut Taffy, total_node_count: u32) -> Node { while node_count < total_node_count { let sub_children_count = rng.gen_range(1..=4); let sub_children: Vec = (0..sub_children_count).map(|_| build_random_leaf(taffy, &mut rng)).collect(); - let node = taffy.new_with_children(FlexboxLayout::random(&mut rng), &sub_children).unwrap(); + let node = taffy.new_with_children(Style::random(&mut rng), &sub_children).unwrap(); children.push(node); node_count += 1 + sub_children_count; } - taffy.new_with_children(FlexboxLayout { ..Default::default() }, children.as_slice()).unwrap() + taffy.new_with_children(Style { ..Default::default() }, children.as_slice()).unwrap() } /// A helper function to recursively construct a deep tree @@ -58,18 +58,17 @@ fn build_deep_hierarchy(taffy: &mut Taffy, node_count: u32, branching_factor: u3 let mut rng = ChaCha8Rng::seed_from_u64(12345); let mut build_leaf_node = |taffy: &mut Taffy| build_random_leaf(taffy, &mut rng); let mut rng = ChaCha8Rng::seed_from_u64(12345); - let mut build_flex_node = |taffy: &mut Taffy, children: Vec| { - taffy.new_with_children(FlexboxLayout::random(&mut rng), &children).unwrap() - }; + let mut build_flex_node = + |taffy: &mut Taffy, children: Vec| taffy.new_with_children(Style::random(&mut rng), &children).unwrap(); let tree = build_deep_tree(taffy, node_count, branching_factor, &mut build_leaf_node, &mut build_flex_node); - taffy.new_with_children(FlexboxLayout { ..Default::default() }, &tree).unwrap() + taffy.new_with_children(Style { ..Default::default() }, &tree).unwrap() } /// A deep tree that matches the shape and styling that yoga use on their benchmarks fn build_yoga_deep_hierarchy(taffy: &mut Taffy, node_count: u32, branching_factor: u32) -> Node { - let style = FlexboxLayout { + let style = Style { size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) }, flex_grow: 1.0, ..Default::default() @@ -79,7 +78,7 @@ fn build_yoga_deep_hierarchy(taffy: &mut Taffy, node_count: u32, branching_facto |taffy: &mut Taffy, children: Vec| taffy.new_with_children(style.clone(), &children).unwrap(); let tree = build_deep_tree(taffy, node_count, branching_factor, &mut build_leaf_node, &mut build_flex_node); - let root = taffy.new_with_children(FlexboxLayout::DEFAULT, &tree).unwrap(); + let root = taffy.new_with_children(Style::DEFAULT, &tree).unwrap(); root } diff --git a/benches/complex.rs b/benches/complex.rs index 188bf3df7..4ba4945c3 100644 --- a/benches/complex.rs +++ b/benches/complex.rs @@ -2,7 +2,7 @@ use criterion::{criterion_group, criterion_main, Criterion}; fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { let node111 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -11,7 +11,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); let node112 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -21,7 +21,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .unwrap(); let node121 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -30,7 +30,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); let node122 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -39,15 +39,12 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); - let node11 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node111, node112]).unwrap(); - let node12 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node121, node122]).unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node11, node12]).unwrap(); + let node11 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node111, node112]).unwrap(); + let node12 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node121, node122]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node11, node12]).unwrap(); let node211 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -56,7 +53,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); let node212 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -66,7 +63,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { .unwrap(); let node221 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -75,7 +72,7 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); let node222 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10.0), height: taffy::style::Dimension::Points(10.0), @@ -84,15 +81,12 @@ fn build_deep_hierarchy(taffy: &mut taffy::node::Taffy) -> taffy::node::Node { }) .unwrap(); - let node21 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node211, node212]).unwrap(); - let node22 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node221, node222]).unwrap(); + let node21 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node211, node212]).unwrap(); + let node22 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node221, node222]).unwrap(); - let node2 = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node21, node22]).unwrap(); + let node2 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node21, node22]).unwrap(); - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node1, node2]).unwrap() + taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node1, node2]).unwrap() } fn taffy_benchmarks(c: &mut Criterion) { diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center.rs index 344966582..02e99e266 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs index 1e738fc2c..8b53f95ed 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { 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 93ac76d80..7fd33dc84 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { 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 c3ebb92be..90a59bd1f 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs index 7bcc993e7..5774fc8a4 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs b/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs index 4d8aad6f7..519b2712b 100644 --- a/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs +++ b/benches/generated/absolute_layout_align_items_and_justify_content_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_align_items_center.rs b/benches/generated/absolute_layout_align_items_center.rs index 3718e7862..42a47b704 100644 --- a/benches/generated/absolute_layout_align_items_center.rs +++ b/benches/generated/absolute_layout_align_items_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), diff --git a/benches/generated/absolute_layout_align_items_center_on_child_only.rs b/benches/generated/absolute_layout_align_items_center_on_child_only.rs index b3255f3db..8c66a015f 100644 --- a/benches/generated/absolute_layout_align_items_center_on_child_only.rs +++ b/benches/generated/absolute_layout_align_items_center_on_child_only.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_child_order.rs b/benches/generated/absolute_layout_child_order.rs index 3e462b1d2..1d6cd9236 100644 --- a/benches/generated/absolute_layout_child_order.rs +++ b/benches/generated/absolute_layout_child_order.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(40f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(40f32), @@ -42,7 +42,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs b/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs index 09e4a2e2e..f41ac919a 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_column_container.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs b/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs index c474f3d61..57d00f435 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs b/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs index b8a21eed4..62ec02944 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_row_container.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs b/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs index e5ecf750b..93257439f 100644 --- a/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs +++ b/benches/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_justify_content_center.rs b/benches/generated/absolute_layout_justify_content_center.rs index 4ddd2ad9a..e690c852f 100644 --- a/benches/generated/absolute_layout_justify_content_center.rs +++ b/benches/generated/absolute_layout_justify_content_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), diff --git a/benches/generated/absolute_layout_no_size.rs b/benches/generated/absolute_layout_no_size.rs index 1eab3b39f..620baaae6 100644 --- a/benches/generated/absolute_layout_no_size.rs +++ b/benches/generated/absolute_layout_no_size.rs @@ -2,13 +2,13 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, ..Default::default() }, + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs b/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs index ef239db4c..19cea211c 100644 --- a/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs +++ b/benches/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -35,7 +35,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/absolute_layout_start_top_end_bottom.rs b/benches/generated/absolute_layout_start_top_end_bottom.rs index 4b6893821..0ab7e32a7 100644 --- a/benches/generated/absolute_layout_start_top_end_bottom.rs +++ b/benches/generated/absolute_layout_start_top_end_bottom.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -18,7 +18,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_width_height_end_bottom.rs b/benches/generated/absolute_layout_width_height_end_bottom.rs index 81117c492..add84bec5 100644 --- a/benches/generated/absolute_layout_width_height_end_bottom.rs +++ b/benches/generated/absolute_layout_width_height_end_bottom.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_width_height_start_top.rs b/benches/generated/absolute_layout_width_height_start_top.rs index b6d0001c0..e53564707 100644 --- a/benches/generated/absolute_layout_width_height_start_top.rs +++ b/benches/generated/absolute_layout_width_height_start_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), 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 960437e05..505acfb31 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/absolute_layout_within_border.rs b/benches/generated/absolute_layout_within_border.rs index b203573c8..00a5a60f3 100644 --- a/benches/generated/absolute_layout_within_border.rs +++ b/benches/generated/absolute_layout_within_border.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -40,7 +40,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -66,7 +66,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -92,7 +92,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_baseline.rs b/benches/generated/align_baseline.rs index d8c8487b8..3577a55b9 100644 --- a/benches/generated/align_baseline.rs +++ b/benches/generated/align_baseline.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_baseline_child_multiline.rs b/benches/generated/align_baseline_child_multiline.rs index fdf90b6bb..57da10452 100644 --- a/benches/generated/align_baseline_child_multiline.rs +++ b/benches/generated/align_baseline_child_multiline.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(60f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node11 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node12 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node13 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() @@ -77,7 +77,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/align_baseline_nested_child.rs b/benches/generated/align_baseline_nested_child.rs index 2cff4407a..b32cefed2 100644 --- a/benches/generated/align_baseline_nested_child.rs +++ b/benches/generated/align_baseline_nested_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -42,7 +42,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_center_should_size_based_on_content.rs b/benches/generated/align_center_should_size_based_on_content.rs index edee584a4..76607a35d 100644 --- a/benches/generated/align_center_should_size_based_on_content.rs +++ b/benches/generated/align_center_should_size_based_on_content.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -14,14 +14,11 @@ pub fn compute() { ) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, flex_grow: 0f32, flex_shrink: 1f32, @@ -32,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_content_space_around_single_line.rs b/benches/generated/align_content_space_around_single_line.rs index dc87dd725..b5ff3dd00 100644 --- a/benches/generated/align_content_space_around_single_line.rs +++ b/benches/generated/align_content_space_around_single_line.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_content_space_around_wrapped.rs b/benches/generated/align_content_space_around_wrapped.rs index ac5929d9f..fd151176f 100644 --- a/benches/generated/align_content_space_around_wrapped.rs +++ b/benches/generated/align_content_space_around_wrapped.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { diff --git a/benches/generated/align_content_space_between_single_line.rs b/benches/generated/align_content_space_between_single_line.rs index cfbf88319..d7740cff4 100644 --- a/benches/generated/align_content_space_between_single_line.rs +++ b/benches/generated/align_content_space_between_single_line.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceBetween, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_content_space_between_wrapped.rs b/benches/generated/align_content_space_between_wrapped.rs index b323363f7..eb93e40e2 100644 --- a/benches/generated/align_content_space_between_wrapped.rs +++ b/benches/generated/align_content_space_between_wrapped.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceBetween, size: taffy::geometry::Size { diff --git a/benches/generated/align_content_space_evenly_single_line.rs b/benches/generated/align_content_space_evenly_single_line.rs index e757c6eed..360ba2403 100644 --- a/benches/generated/align_content_space_evenly_single_line.rs +++ b/benches/generated/align_content_space_evenly_single_line.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceEvenly, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_content_space_evenly_wrapped.rs b/benches/generated/align_content_space_evenly_wrapped.rs index 79ee1cb2b..68fadb2ac 100644 --- a/benches/generated/align_content_space_evenly_wrapped.rs +++ b/benches/generated/align_content_space_evenly_wrapped.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceEvenly, size: taffy::geometry::Size { diff --git a/benches/generated/align_flex_start_with_shrinking_children.rs b/benches/generated/align_flex_start_with_shrinking_children.rs index 47f349f37..d7f062376 100644 --- a/benches/generated/align_flex_start_with_shrinking_children.rs +++ b/benches/generated/align_flex_start_with_shrinking_children.rs @@ -1,26 +1,20 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs b/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs index 47f349f37..d7f062376 100644 --- a/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs +++ b/benches/generated/align_flex_start_with_shrinking_children_with_stretch.rs @@ -1,26 +1,20 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/align_flex_start_with_stretching_children.rs b/benches/generated/align_flex_start_with_stretching_children.rs index 34e317b66..59a7feb16 100644 --- a/benches/generated/align_flex_start_with_stretching_children.rs +++ b/benches/generated/align_flex_start_with_stretching_children.rs @@ -1,21 +1,15 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/align_items_center.rs b/benches/generated/align_items_center.rs index 7001a45d8..f0bc75fff 100644 --- a/benches/generated/align_items_center.rs +++ b/benches/generated/align_items_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), 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 ffcef3a20..7350548a9 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,13 +20,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::Center, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs b/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs index a69d988dc..7d6170808 100644 --- a/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_center_child_without_margin_bigger_than_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(70f32), @@ -15,13 +15,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::Center, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/align_items_center_with_child_margin.rs b/benches/generated/align_items_center_with_child_margin.rs index b536dc4e5..bc263cbda 100644 --- a/benches/generated/align_items_center_with_child_margin.rs +++ b/benches/generated/align_items_center_with_child_margin.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_items_center_with_child_top.rs b/benches/generated/align_items_center_with_child_top.rs index 5126583e3..d60dbc3dd 100644 --- a/benches/generated/align_items_center_with_child_top.rs +++ b/benches/generated/align_items_center_with_child_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_items_flex_end.rs b/benches/generated/align_items_flex_end.rs index 9466c5e6c..5d4458d7d 100644 --- a/benches/generated/align_items_flex_end.rs +++ b/benches/generated/align_items_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), 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 1925f662f..1130768f1 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,13 +20,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs b/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs index 177d7e9fd..400183c4e 100644 --- a/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs +++ b/benches/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(70f32), @@ -15,13 +15,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/align_items_flex_start.rs b/benches/generated/align_items_flex_start.rs index d9561ecde..688bc6b66 100644 --- a/benches/generated/align_items_flex_start.rs +++ b/benches/generated/align_items_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_items_min_max.rs b/benches/generated/align_items_min_max.rs index 4ef05e6d2..60fd14ddd 100644 --- a/benches/generated/align_items_min_max.rs +++ b/benches/generated/align_items_min_max.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(60f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/align_items_stretch.rs b/benches/generated/align_items_stretch.rs index 65cbc654d..5b06b8504 100644 --- a/benches/generated/align_items_stretch.rs +++ b/benches/generated/align_items_stretch.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_self_baseline.rs b/benches/generated/align_self_baseline.rs index dba565636..e176ad9f2 100644 --- a/benches/generated/align_self_baseline.rs +++ b/benches/generated/align_self_baseline.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -43,7 +43,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_self_center.rs b/benches/generated/align_self_center.rs index 6bd8b33b0..2818e9b79 100644 --- a/benches/generated/align_self_center.rs +++ b/benches/generated/align_self_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_self_flex_end.rs b/benches/generated/align_self_flex_end.rs index da14b26e4..66bce9579 100644 --- a/benches/generated/align_self_flex_end.rs +++ b/benches/generated/align_self_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_self_flex_end_override_flex_start.rs b/benches/generated/align_self_flex_end_override_flex_start.rs index a9f309b6e..6904a1d54 100644 --- a/benches/generated/align_self_flex_end_override_flex_start.rs +++ b/benches/generated/align_self_flex_end_override_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_self_flex_start.rs b/benches/generated/align_self_flex_start.rs index 893aa18d9..8376f29cb 100644 --- a/benches/generated/align_self_flex_start.rs +++ b/benches/generated/align_self_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/align_strech_should_size_based_on_parent.rs b/benches/generated/align_strech_should_size_based_on_parent.rs index dbf3a402b..ca667357c 100644 --- a/benches/generated/align_strech_should_size_based_on_parent.rs +++ b/benches/generated/align_strech_should_size_based_on_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -14,14 +14,11 @@ pub fn compute() { ) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, flex_grow: 0f32, flex_shrink: 1f32, @@ -32,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/border_center_child.rs b/benches/generated/border_center_child.rs index 09e243fc1..7afa149d6 100644 --- a/benches/generated/border_center_child.rs +++ b/benches/generated/border_center_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/border_flex_child.rs b/benches/generated/border_flex_child.rs index 382a792ef..f6f311549 100644 --- a/benches/generated/border_flex_child.rs +++ b/benches/generated/border_flex_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/border_no_child.rs b/benches/generated/border_no_child.rs index 444422b9c..6a693aad4 100644 --- a/benches/generated/border_no_child.rs +++ b/benches/generated/border_no_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { border: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/border_stretch_child.rs b/benches/generated/border_stretch_child.rs index f830dccad..935776ddd 100644 --- a/benches/generated/border_stretch_child.rs +++ b/benches/generated/border_stretch_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/child_min_max_width_flexing.rs b/benches/generated/child_min_max_width_flexing.rs index 140e826cc..23231b4fa 100644 --- a/benches/generated/child_min_max_width_flexing.rs +++ b/benches/generated/child_min_max_width_flexing.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -14,7 +14,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), height: taffy::style::Dimension::Points(50f32), diff --git a/benches/generated/container_with_unsized_child.rs b/benches/generated/container_with_unsized_child.rs index 78047a38a..b15cd2568 100644 --- a/benches/generated/container_with_unsized_child.rs +++ b/benches/generated/container_with_unsized_child.rs @@ -1,9 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/display_none.rs b/benches/generated/display_none.rs index 8e37e5d64..d8595c205 100644 --- a/benches/generated/display_none.rs +++ b/benches/generated/display_none.rs @@ -1,16 +1,15 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { display: taffy::style::Display::None, flex_grow: 1f32, ..Default::default() }, + taffy::style::Style { display: taffy::style::Display::None, flex_grow: 1f32, ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/display_none_fixed_size.rs b/benches/generated/display_none_fixed_size.rs index c2aa37846..b87a4b87d 100644 --- a/benches/generated/display_none_fixed_size.rs +++ b/benches/generated/display_none_fixed_size.rs @@ -1,10 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -18,7 +17,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/display_none_with_child.rs b/benches/generated/display_none_with_child.rs index 2c226527a..05bf31ee0 100644 --- a/benches/generated/display_none_with_child.rs +++ b/benches/generated/display_none_with_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, @@ -38,7 +38,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -49,7 +49,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/display_none_with_margin.rs b/benches/generated/display_none_with_margin.rs index 275f80049..540afb303 100644 --- a/benches/generated/display_none_with_margin.rs +++ b/benches/generated/display_none_with_margin.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -21,11 +21,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/display_none_with_position.rs b/benches/generated/display_none_with_position.rs index fcc6b7b1d..65f3c090e 100644 --- a/benches/generated/display_none_with_position.rs +++ b/benches/generated/display_none_with_position.rs @@ -1,10 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, flex_grow: 1f32, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -15,7 +14,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs b/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs index 8607c2f60..d280ef47c 100644 --- a/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs +++ b/benches/generated/flex_basis_and_main_dimen_set_when_flexing.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_flex_grow_column.rs b/benches/generated/flex_basis_flex_grow_column.rs index 47dbc5026..250555137 100644 --- a/benches/generated/flex_basis_flex_grow_column.rs +++ b/benches/generated/flex_basis_flex_grow_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -10,11 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_flex_grow_row.rs b/benches/generated/flex_basis_flex_grow_row.rs index 14ccf3bc1..ecd292e4f 100644 --- a/benches/generated/flex_basis_flex_grow_row.rs +++ b/benches/generated/flex_basis_flex_grow_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -10,11 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_flex_shrink_column.rs b/benches/generated/flex_basis_flex_shrink_column.rs index 8d5cebcb3..9b0619558 100644 --- a/benches/generated/flex_basis_flex_shrink_column.rs +++ b/benches/generated/flex_basis_flex_shrink_column.rs @@ -2,19 +2,19 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, &[], ) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_flex_shrink_row.rs b/benches/generated/flex_basis_flex_shrink_row.rs index 262730791..bdc1bb790 100644 --- a/benches/generated/flex_basis_flex_shrink_row.rs +++ b/benches/generated/flex_basis_flex_shrink_row.rs @@ -2,19 +2,19 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, &[], ) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_larger_than_content_column.rs b/benches/generated/flex_basis_larger_than_content_column.rs index 88b5e287c..536c37f0f 100644 --- a/benches/generated/flex_basis_larger_than_content_column.rs +++ b/benches/generated/flex_basis_larger_than_content_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_larger_than_content_row.rs b/benches/generated/flex_basis_larger_than_content_row.rs index 4118a1e80..bb29fc572 100644 --- a/benches/generated/flex_basis_larger_than_content_row.rs +++ b/benches/generated/flex_basis_larger_than_content_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_overrides_main_size.rs b/benches/generated/flex_basis_overrides_main_size.rs index 6f4a533b6..e265d816b 100644 --- a/benches/generated/flex_basis_overrides_main_size.rs +++ b/benches/generated/flex_basis_overrides_main_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs index 6f24793ef..e0f52889d 100644 --- a/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(60f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_smaller_than_content_column.rs b/benches/generated/flex_basis_smaller_than_content_column.rs index 7f5ef79a0..1f71eb36c 100644 --- a/benches/generated/flex_basis_smaller_than_content_column.rs +++ b/benches/generated/flex_basis_smaller_than_content_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_smaller_than_content_row.rs b/benches/generated/flex_basis_smaller_than_content_row.rs index b0362bbad..dcf9cecba 100644 --- a/benches/generated/flex_basis_smaller_than_content_row.rs +++ b/benches/generated/flex_basis_smaller_than_content_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_smaller_than_main_dimen_column.rs b/benches/generated/flex_basis_smaller_than_main_dimen_column.rs index 4e516274e..9212dd0af 100644 --- a/benches/generated/flex_basis_smaller_than_main_dimen_column.rs +++ b/benches/generated/flex_basis_smaller_than_main_dimen_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_basis_smaller_than_main_dimen_row.rs b/benches/generated/flex_basis_smaller_than_main_dimen_row.rs index f91d98a68..5234bc529 100644 --- a/benches/generated/flex_basis_smaller_than_main_dimen_row.rs +++ b/benches/generated/flex_basis_smaller_than_main_dimen_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs index 91dc55a06..053fb4732 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs index 0a447e670..119fe56fe 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs index d18ae2186..0e6184e4b 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -48,6 +48,6 @@ pub fn compute() { &[node10], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0, node1]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0, node1]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs index f5c851a93..3b28ca909 100644 --- a/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/benches/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_basis_unconstraint_column.rs b/benches/generated/flex_basis_unconstraint_column.rs index 2519217d9..216a3ba10 100644 --- a/benches/generated/flex_basis_unconstraint_column.rs +++ b/benches/generated/flex_basis_unconstraint_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0], ) .unwrap(); diff --git a/benches/generated/flex_basis_unconstraint_row.rs b/benches/generated/flex_basis_unconstraint_row.rs index ccd968599..b6d31b93c 100644 --- a/benches/generated/flex_basis_unconstraint_row.rs +++ b/benches/generated/flex_basis_unconstraint_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -10,6 +10,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/flex_direction_column.rs b/benches/generated/flex_direction_column.rs index 61282af94..25659dcdf 100644 --- a/benches/generated/flex_direction_column.rs +++ b/benches/generated/flex_direction_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_direction_column_no_height.rs b/benches/generated/flex_direction_column_no_height.rs index c406e5110..65f538a4e 100644 --- a/benches/generated/flex_direction_column_no_height.rs +++ b/benches/generated/flex_direction_column_no_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_direction_column_reverse.rs b/benches/generated/flex_direction_column_reverse.rs index 639a777e6..20d76cc7e 100644 --- a/benches/generated/flex_direction_column_reverse.rs +++ b/benches/generated/flex_direction_column_reverse.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::ColumnReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_direction_row.rs b/benches/generated/flex_direction_row.rs index fb1b3e6c4..28769c015 100644 --- a/benches/generated/flex_direction_row.rs +++ b/benches/generated/flex_direction_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_direction_row_no_width.rs b/benches/generated/flex_direction_row_no_width.rs index ca2465608..8fb65d3c9 100644 --- a/benches/generated/flex_direction_row_no_width.rs +++ b/benches/generated/flex_direction_row_no_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_direction_row_reverse.rs b/benches/generated/flex_direction_row_reverse.rs index 85dce74e9..de8e29dad 100644 --- a/benches/generated/flex_direction_row_reverse.rs +++ b/benches/generated/flex_direction_row_reverse.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::RowReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_child.rs b/benches/generated/flex_grow_child.rs index 7cd4812c2..43902309d 100644 --- a/benches/generated/flex_grow_child.rs +++ b/benches/generated/flex_grow_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -11,6 +11,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/flex_grow_flex_basis_percent_min_max.rs b/benches/generated/flex_grow_flex_basis_percent_min_max.rs index aad73daf2..332118de0 100644 --- a/benches/generated/flex_grow_flex_basis_percent_min_max.rs +++ b/benches/generated/flex_grow_flex_basis_percent_min_max.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_grow_height_maximized.rs b/benches/generated/flex_grow_height_maximized.rs index 755838a43..e30025b6a 100644 --- a/benches/generated/flex_grow_height_maximized.rs +++ b/benches/generated/flex_grow_height_maximized.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, min_size: taffy::geometry::Size { @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_in_at_most_container.rs b/benches/generated/flex_grow_in_at_most_container.rs index 26ca4d70e..630ce7af7 100644 --- a/benches/generated/flex_grow_in_at_most_container.rs +++ b/benches/generated/flex_grow_in_at_most_container.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), ..Default::default() @@ -10,10 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_less_than_factor_one.rs b/benches/generated/flex_grow_less_than_factor_one.rs index de0f4c24b..284b25eea 100644 --- a/benches/generated/flex_grow_less_than_factor_one.rs +++ b/benches/generated/flex_grow_less_than_factor_one.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0.2f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(40f32), @@ -12,20 +12,14 @@ pub fn compute() { ) .unwrap(); let node1 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 0.2f32, flex_shrink: 0f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 0.2f32, flex_shrink: 0f32, ..Default::default() }, &[]) .unwrap(); let node2 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 0.4f32, flex_shrink: 0f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 0.4f32, flex_shrink: 0f32, ..Default::default() }, &[]) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/flex_grow_root_minimized.rs b/benches/generated/flex_grow_root_minimized.rs index a029c67f5..ce6a2f95c 100644 --- a/benches/generated/flex_grow_root_minimized.rs +++ b/benches/generated/flex_grow_root_minimized.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, min_size: taffy::geometry::Size { @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/benches/generated/flex_grow_shrink_at_most.rs b/benches/generated/flex_grow_shrink_at_most.rs index baaa11451..115720e8b 100644 --- a/benches/generated/flex_grow_shrink_at_most.rs +++ b/benches/generated/flex_grow_shrink_at_most.rs @@ -1,15 +1,12 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_to_min.rs b/benches/generated/flex_grow_to_min.rs index f7f5ab1db..805945b8a 100644 --- a/benches/generated/flex_grow_to_min.rs +++ b/benches/generated/flex_grow_to_min.rs @@ -1,14 +1,11 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -17,7 +14,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/benches/generated/flex_grow_within_constrained_max_column.rs b/benches/generated/flex_grow_within_constrained_max_column.rs index e355c3919..4279360db 100644 --- a/benches/generated/flex_grow_within_constrained_max_column.rs +++ b/benches/generated/flex_grow_within_constrained_max_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { diff --git a/benches/generated/flex_grow_within_constrained_max_row.rs b/benches/generated/flex_grow_within_constrained_max_row.rs index 076021612..22c62ebe7 100644 --- a/benches/generated/flex_grow_within_constrained_max_row.rs +++ b/benches/generated/flex_grow_within_constrained_max_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -34,7 +34,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_grow_within_constrained_max_width.rs b/benches/generated/flex_grow_within_constrained_max_width.rs index ffa3ad2d8..8bffddc5c 100644 --- a/benches/generated/flex_grow_within_constrained_max_width.rs +++ b/benches/generated/flex_grow_within_constrained_max_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/flex_grow_within_constrained_min_column.rs b/benches/generated/flex_grow_within_constrained_min_column.rs index 94f1b1965..6654f1baa 100644 --- a/benches/generated/flex_grow_within_constrained_min_column.rs +++ b/benches/generated/flex_grow_within_constrained_min_column.rs @@ -1,10 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -13,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_within_constrained_min_max_column.rs b/benches/generated/flex_grow_within_constrained_min_max_column.rs index 744ffa705..98b835fd8 100644 --- a/benches/generated/flex_grow_within_constrained_min_max_column.rs +++ b/benches/generated/flex_grow_within_constrained_min_max_column.rs @@ -1,10 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -13,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/benches/generated/flex_grow_within_constrained_min_row.rs b/benches/generated/flex_grow_within_constrained_min_row.rs index 7aef5b861..a73fe6986 100644 --- a/benches/generated/flex_grow_within_constrained_min_row.rs +++ b/benches/generated/flex_grow_within_constrained_min_row.rs @@ -1,10 +1,9 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -13,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/flex_grow_within_max_width.rs b/benches/generated/flex_grow_within_max_width.rs index addd843a6..4aa55752a 100644 --- a/benches/generated/flex_grow_within_max_width.rs +++ b/benches/generated/flex_grow_within_max_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/flex_root_ignored.rs b/benches/generated/flex_root_ignored.rs index 43ef51109..d9cac4cde 100644 --- a/benches/generated/flex_root_ignored.rs +++ b/benches/generated/flex_root_ignored.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs b/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs index 5ed22eb9c..5bf986d4a 100644 --- a/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs +++ b/benches/generated/flex_shrink_by_outer_margin_with_max_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { diff --git a/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs b/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs index c96b268fb..bcad0f489 100644 --- a/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs +++ b/benches/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/flex_shrink_flex_grow_row.rs b/benches/generated/flex_shrink_flex_grow_row.rs index 76f17470e..02f5f4f71 100644 --- a/benches/generated/flex_shrink_flex_grow_row.rs +++ b/benches/generated/flex_shrink_flex_grow_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/flex_shrink_to_zero.rs b/benches/generated/flex_shrink_to_zero.rs index e4db0e39f..50ae9c3d1 100644 --- a/benches/generated/flex_shrink_to_zero.rs +++ b/benches/generated/flex_shrink_to_zero.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(75f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/flex_wrap_align_stretch_fits_one_row.rs b/benches/generated/flex_wrap_align_stretch_fits_one_row.rs index 5cbed7ca5..d58880c41 100644 --- a/benches/generated/flex_wrap_align_stretch_fits_one_row.rs +++ b/benches/generated/flex_wrap_align_stretch_fits_one_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), diff --git a/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs b/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs index 34a69eb03..262d719a9 100644 --- a/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs +++ b/benches/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/flex_wrap_wrap_to_child_height.rs b/benches/generated/flex_wrap_wrap_to_child_height.rs index 9626bf45d..ab91e5469 100644 --- a/benches/generated/flex_wrap_wrap_to_child_height.rs +++ b/benches/generated/flex_wrap_wrap_to_child_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() @@ -35,7 +35,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -48,7 +48,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0, node1], ) .unwrap(); diff --git a/benches/generated/gap_column_gap_child_margins.rs b/benches/generated/gap_column_gap_child_margins.rs index 2a95d12f3..1a1b078d8 100644 --- a/benches/generated/gap_column_gap_child_margins.rs +++ b/benches/generated/gap_column_gap_child_margins.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -18,7 +18,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -34,7 +34,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/benches/generated/gap_column_gap_flexible.rs b/benches/generated/gap_column_gap_flexible.rs index 0c95be0fc..eb90596e3 100644 --- a/benches/generated/gap_column_gap_flexible.rs +++ b/benches/generated/gap_column_gap_flexible.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -35,7 +35,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(20f32), diff --git a/benches/generated/gap_column_gap_flexible_undefined_parent.rs b/benches/generated/gap_column_gap_flexible_undefined_parent.rs index c83163671..c676b3ecb 100644 --- a/benches/generated/gap_column_gap_flexible_undefined_parent.rs +++ b/benches/generated/gap_column_gap_flexible_undefined_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -35,7 +35,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(20f32), diff --git a/benches/generated/gap_column_gap_inflexible.rs b/benches/generated/gap_column_gap_inflexible.rs index eaae60b5e..0cf34b09a 100644 --- a/benches/generated/gap_column_gap_inflexible.rs +++ b/benches/generated/gap_column_gap_inflexible.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/benches/generated/gap_column_gap_inflexible_undefined_parent.rs b/benches/generated/gap_column_gap_inflexible_undefined_parent.rs index 8a7d66ced..004264c33 100644 --- a/benches/generated/gap_column_gap_inflexible_undefined_parent.rs +++ b/benches/generated/gap_column_gap_inflexible_undefined_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/gap_column_gap_justify_center.rs b/benches/generated/gap_column_gap_justify_center.rs index 6536fbdbe..12361d48c 100644 --- a/benches/generated/gap_column_gap_justify_center.rs +++ b/benches/generated/gap_column_gap_justify_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_justify_flex_end.rs b/benches/generated/gap_column_gap_justify_flex_end.rs index c79af24e5..ed12c8bc5 100644 --- a/benches/generated/gap_column_gap_justify_flex_end.rs +++ b/benches/generated/gap_column_gap_justify_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_justify_flex_start.rs b/benches/generated/gap_column_gap_justify_flex_start.rs index ef1b65759..a8eb57a8f 100644 --- a/benches/generated/gap_column_gap_justify_flex_start.rs +++ b/benches/generated/gap_column_gap_justify_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/gap_column_gap_justify_space_around.rs b/benches/generated/gap_column_gap_justify_space_around.rs index cd9b55104..14e501d61 100644 --- a/benches/generated/gap_column_gap_justify_space_around.rs +++ b/benches/generated/gap_column_gap_justify_space_around.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceAround, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_justify_space_between.rs b/benches/generated/gap_column_gap_justify_space_between.rs index 5850447f3..7be980213 100644 --- a/benches/generated/gap_column_gap_justify_space_between.rs +++ b/benches/generated/gap_column_gap_justify_space_between.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceBetween, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_justify_space_evenly.rs b/benches/generated/gap_column_gap_justify_space_evenly.rs index c4fea81c6..55ad0faaa 100644 --- a/benches/generated/gap_column_gap_justify_space_evenly.rs +++ b/benches/generated/gap_column_gap_justify_space_evenly.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceEvenly, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_mixed_flexible.rs b/benches/generated/gap_column_gap_mixed_flexible.rs index 7c9523d9a..a5e72d909 100644 --- a/benches/generated/gap_column_gap_mixed_flexible.rs +++ b/benches/generated/gap_column_gap_mixed_flexible.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -31,7 +31,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/benches/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs b/benches/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs index 9645e298a..36e79c1b8 100644 --- a/benches/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs +++ b/benches/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -43,7 +43,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/gap_column_gap_percentage_cyclic_shrinkable.rs b/benches/generated/gap_column_gap_percentage_cyclic_shrinkable.rs index e066e9dd1..ce3ad0a38 100644 --- a/benches/generated/gap_column_gap_percentage_cyclic_shrinkable.rs +++ b/benches/generated/gap_column_gap_percentage_cyclic_shrinkable.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs b/benches/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs index 888bf4262..c3992cc0d 100644 --- a/benches/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs +++ b/benches/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/gap_column_gap_percentage_flexible.rs b/benches/generated/gap_column_gap_percentage_flexible.rs index c6ff863f9..3e34fdb93 100644 --- a/benches/generated/gap_column_gap_percentage_flexible.rs +++ b/benches/generated/gap_column_gap_percentage_flexible.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -35,7 +35,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.1f32), height: taffy::style::Dimension::Points(20f32), diff --git a/benches/generated/gap_column_gap_percentage_inflexible.rs b/benches/generated/gap_column_gap_percentage_inflexible.rs index ac84f8e89..57c4dc63c 100644 --- a/benches/generated/gap_column_gap_percentage_inflexible.rs +++ b/benches/generated/gap_column_gap_percentage_inflexible.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/gap_column_gap_wrap_align_center.rs b/benches/generated/gap_column_gap_wrap_align_center.rs index 82fdd3698..ab21fafd6 100644 --- a/benches/generated/gap_column_gap_wrap_align_center.rs +++ b/benches/generated/gap_column_gap_wrap_align_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::Center, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_wrap_align_flex_end.rs b/benches/generated/gap_column_gap_wrap_align_flex_end.rs index 358f815c8..480c0a2da 100644 --- a/benches/generated/gap_column_gap_wrap_align_flex_end.rs +++ b/benches/generated/gap_column_gap_wrap_align_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::FlexEnd, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_wrap_align_flex_start.rs b/benches/generated/gap_column_gap_wrap_align_flex_start.rs index a418fb3c2..2fbfd4bc0 100644 --- a/benches/generated/gap_column_gap_wrap_align_flex_start.rs +++ b/benches/generated/gap_column_gap_wrap_align_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::FlexStart, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_wrap_align_space_around.rs b/benches/generated/gap_column_gap_wrap_align_space_around.rs index a85afb217..6ad4a8d5e 100644 --- a/benches/generated/gap_column_gap_wrap_align_space_around.rs +++ b/benches/generated/gap_column_gap_wrap_align_space_around.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceAround, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_wrap_align_space_between.rs b/benches/generated/gap_column_gap_wrap_align_space_between.rs index fb9e468af..7b40ef693 100644 --- a/benches/generated/gap_column_gap_wrap_align_space_between.rs +++ b/benches/generated/gap_column_gap_wrap_align_space_between.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceBetween, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_column_gap_wrap_align_stretch.rs b/benches/generated/gap_column_gap_wrap_align_stretch.rs index 2bcfbfb16..b642ef23c 100644 --- a/benches/generated/gap_column_gap_wrap_align_stretch.rs +++ b/benches/generated/gap_column_gap_wrap_align_stretch.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -42,7 +42,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -52,7 +52,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(5f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_column_row_gap_wrapping.rs b/benches/generated/gap_column_row_gap_wrapping.rs index 8ebec0c5b..e294f36b3 100644 --- a/benches/generated/gap_column_row_gap_wrapping.rs +++ b/benches/generated/gap_column_row_gap_wrapping.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node6 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -93,7 +93,7 @@ pub fn compute() { .unwrap(); let node7 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -106,7 +106,7 @@ pub fn compute() { .unwrap(); let node8 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -119,7 +119,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/gap_percentage_row_gap_wrapping.rs b/benches/generated/gap_percentage_row_gap_wrapping.rs index 3b43f9b56..df9827450 100644 --- a/benches/generated/gap_percentage_row_gap_wrapping.rs +++ b/benches/generated/gap_percentage_row_gap_wrapping.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -80,7 +80,7 @@ pub fn compute() { .unwrap(); let node6 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -93,7 +93,7 @@ pub fn compute() { .unwrap(); let node7 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -106,7 +106,7 @@ pub fn compute() { .unwrap(); let node8 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -119,7 +119,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/gap_row_gap_align_items_end.rs b/benches/generated/gap_row_gap_align_items_end.rs index 3cfb0840f..7d974558f 100644 --- a/benches/generated/gap_row_gap_align_items_end.rs +++ b/benches/generated/gap_row_gap_align_items_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -38,7 +38,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -47,7 +47,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -56,7 +56,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, gap: taffy::geometry::Size { diff --git a/benches/generated/gap_row_gap_align_items_stretch.rs b/benches/generated/gap_row_gap_align_items_stretch.rs index 208bbc903..a2a0b2188 100644 --- a/benches/generated/gap_row_gap_align_items_stretch.rs +++ b/benches/generated/gap_row_gap_align_items_stretch.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -38,7 +38,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -47,7 +47,7 @@ pub fn compute() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -56,7 +56,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/gap_row_gap_column_child_margins.rs b/benches/generated/gap_row_gap_column_child_margins.rs index e61d54292..851cc8834 100644 --- a/benches/generated/gap_row_gap_column_child_margins.rs +++ b/benches/generated/gap_row_gap_column_child_margins.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -18,7 +18,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -34,7 +34,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, gap: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/gap_row_gap_row_wrap_child_margins.rs b/benches/generated/gap_row_gap_row_wrap_child_margins.rs index 9d2aa1a58..77088b24c 100644 --- a/benches/generated/gap_row_gap_row_wrap_child_margins.rs +++ b/benches/generated/gap_row_gap_row_wrap_child_margins.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(2f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_center.rs b/benches/generated/justify_content_column_center.rs index ce88fb412..d41d0a526 100644 --- a/benches/generated/justify_content_column_center.rs +++ b/benches/generated/justify_content_column_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_flex_end.rs b/benches/generated/justify_content_column_flex_end.rs index 6e8d286ef..fcea1b606 100644 --- a/benches/generated/justify_content_column_flex_end.rs +++ b/benches/generated/justify_content_column_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_flex_start.rs b/benches/generated/justify_content_column_flex_start.rs index 61282af94..25659dcdf 100644 --- a/benches/generated/justify_content_column_flex_start.rs +++ b/benches/generated/justify_content_column_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/justify_content_column_min_height_and_margin_bottom.rs b/benches/generated/justify_content_column_min_height_and_margin_bottom.rs index 46902baff..81457c016 100644 --- a/benches/generated/justify_content_column_min_height_and_margin_bottom.rs +++ b/benches/generated/justify_content_column_min_height_and_margin_bottom.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_min_height_and_margin_top.rs b/benches/generated/justify_content_column_min_height_and_margin_top.rs index 67e88e4ac..e0e377db5 100644 --- a/benches/generated/justify_content_column_min_height_and_margin_top.rs +++ b/benches/generated/justify_content_column_min_height_and_margin_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_space_around.rs b/benches/generated/justify_content_column_space_around.rs index ba0dc217e..8069bdf64 100644 --- a/benches/generated/justify_content_column_space_around.rs +++ b/benches/generated/justify_content_column_space_around.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_space_between.rs b/benches/generated/justify_content_column_space_between.rs index a3632ffe5..acf2b059b 100644 --- a/benches/generated/justify_content_column_space_between.rs +++ b/benches/generated/justify_content_column_space_between.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_column_space_evenly.rs b/benches/generated/justify_content_column_space_evenly.rs index 92f73643f..797024d99 100644 --- a/benches/generated/justify_content_column_space_evenly.rs +++ b/benches/generated/justify_content_column_space_evenly.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_min_max.rs b/benches/generated/justify_content_min_max.rs index 387fda05a..b49e5e930 100644 --- a/benches/generated/justify_content_min_max.rs +++ b/benches/generated/justify_content_min_max.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(60f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs b/benches/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs index e5543c9dc..5a7110287 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), @@ -31,10 +31,10 @@ pub fn compute() { &[node000], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(1000f32), 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 cdfd0c37e..5854257d1 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(199f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), @@ -31,10 +31,10 @@ pub fn compute() { &[node000], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(1080f32), diff --git a/benches/generated/justify_content_overflow_min_max.rs b/benches/generated/justify_content_overflow_min_max.rs index 0a86e5557..64d0f88a5 100644 --- a/benches/generated/justify_content_overflow_min_max.rs +++ b/benches/generated/justify_content_overflow_min_max.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/benches/generated/justify_content_row_center.rs b/benches/generated/justify_content_row_center.rs index e6cb0a4e6..17e4b2287 100644 --- a/benches/generated/justify_content_row_center.rs +++ b/benches/generated/justify_content_row_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/justify_content_row_flex_end.rs b/benches/generated/justify_content_row_flex_end.rs index 016f1ff07..8d47f7965 100644 --- a/benches/generated/justify_content_row_flex_end.rs +++ b/benches/generated/justify_content_row_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/justify_content_row_flex_start.rs b/benches/generated/justify_content_row_flex_start.rs index fb1b3e6c4..28769c015 100644 --- a/benches/generated/justify_content_row_flex_start.rs +++ b/benches/generated/justify_content_row_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), 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 e124f3064..5accc9619 100644 --- a/benches/generated/justify_content_row_max_width_and_margin.rs +++ b/benches/generated/justify_content_row_max_width_and_margin.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), ..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 2ad32a450..635ed97dc 100644 --- a/benches/generated/justify_content_row_min_width_and_margin.rs +++ b/benches/generated/justify_content_row_min_width_and_margin.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/justify_content_row_space_around.rs b/benches/generated/justify_content_row_space_around.rs index dbcfd60f2..dc709010c 100644 --- a/benches/generated/justify_content_row_space_around.rs +++ b/benches/generated/justify_content_row_space_around.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/justify_content_row_space_between.rs b/benches/generated/justify_content_row_space_between.rs index 83dc9d3ca..34a1c95d2 100644 --- a/benches/generated/justify_content_row_space_between.rs +++ b/benches/generated/justify_content_row_space_between.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/justify_content_row_space_evenly.rs b/benches/generated/justify_content_row_space_evenly.rs index 2d903ad81..a8be8f580 100644 --- a/benches/generated/justify_content_row_space_evenly.rs +++ b/benches/generated/justify_content_row_space_evenly.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_and_flex_column.rs b/benches/generated/margin_and_flex_column.rs index fbf429687..b05d657a9 100644 --- a/benches/generated/margin_and_flex_column.rs +++ b/benches/generated/margin_and_flex_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_and_flex_row.rs b/benches/generated/margin_and_flex_row.rs index 503c15a1b..3a1d8f301 100644 --- a/benches/generated/margin_and_flex_row.rs +++ b/benches/generated/margin_and_flex_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_and_stretch_column.rs b/benches/generated/margin_and_stretch_column.rs index 50c5d872d..383924576 100644 --- a/benches/generated/margin_and_stretch_column.rs +++ b/benches/generated/margin_and_stretch_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_and_stretch_row.rs b/benches/generated/margin_and_stretch_row.rs index db0c16841..9cd29a2e3 100644 --- a/benches/generated/margin_and_stretch_row.rs +++ b/benches/generated/margin_and_stretch_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_auto_bottom.rs b/benches/generated/margin_auto_bottom.rs index 37e972dd3..29b827d77 100644 --- a/benches/generated/margin_auto_bottom.rs +++ b/benches/generated/margin_auto_bottom.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_bottom_and_top.rs b/benches/generated/margin_auto_bottom_and_top.rs index 335d86883..3648ce3a7 100644 --- a/benches/generated/margin_auto_bottom_and_top.rs +++ b/benches/generated/margin_auto_bottom_and_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_bottom_and_top_justify_center.rs b/benches/generated/margin_auto_bottom_and_top_justify_center.rs index e972bfdda..8fdb51e41 100644 --- a/benches/generated/margin_auto_bottom_and_top_justify_center.rs +++ b/benches/generated/margin_auto_bottom_and_top_justify_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_left.rs b/benches/generated/margin_auto_left.rs index 22b8c1424..c36f314e3 100644 --- a/benches/generated/margin_auto_left.rs +++ b/benches/generated/margin_auto_left.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_left_and_right.rs b/benches/generated/margin_auto_left_and_right.rs index c44ae56d1..2e0f3510a 100644 --- a/benches/generated/margin_auto_left_and_right.rs +++ b/benches/generated/margin_auto_left_and_right.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_left_and_right_column.rs b/benches/generated/margin_auto_left_and_right_column.rs index b38f53880..09416f8d3 100644 --- a/benches/generated/margin_auto_left_and_right_column.rs +++ b/benches/generated/margin_auto_left_and_right_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 b38f53880..09416f8d3 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_left_and_right_strech.rs b/benches/generated/margin_auto_left_and_right_strech.rs index c44ae56d1..2e0f3510a 100644 --- a/benches/generated/margin_auto_left_and_right_strech.rs +++ b/benches/generated/margin_auto_left_and_right_strech.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), 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 709f3ff0a..4d2d3bc2c 100644 --- a/benches/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/benches/generated/margin_auto_left_child_bigger_than_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), 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 0336162d8..2379f4b11 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), 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 00d4dd11c..4e24650ad 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), diff --git a/benches/generated/margin_auto_left_stretching_child.rs b/benches/generated/margin_auto_left_stretching_child.rs index f6199d64d..d9c32a695 100644 --- a/benches/generated/margin_auto_left_stretching_child.rs +++ b/benches/generated/margin_auto_left_stretching_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -27,7 +27,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_mutiple_children_column.rs b/benches/generated/margin_auto_mutiple_children_column.rs index 26d91a812..6217a212e 100644 --- a/benches/generated/margin_auto_mutiple_children_column.rs +++ b/benches/generated/margin_auto_mutiple_children_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -43,7 +43,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { diff --git a/benches/generated/margin_auto_mutiple_children_row.rs b/benches/generated/margin_auto_mutiple_children_row.rs index 2e5b0a2b2..8a257ccd6 100644 --- a/benches/generated/margin_auto_mutiple_children_row.rs +++ b/benches/generated/margin_auto_mutiple_children_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -43,7 +43,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_right.rs b/benches/generated/margin_auto_right.rs index 2ee093e64..81be597d4 100644 --- a/benches/generated/margin_auto_right.rs +++ b/benches/generated/margin_auto_right.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_top.rs b/benches/generated/margin_auto_top.rs index c5d17ed1e..e308e360c 100644 --- a/benches/generated/margin_auto_top.rs +++ b/benches/generated/margin_auto_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_top_and_bottom_strech.rs b/benches/generated/margin_auto_top_and_bottom_strech.rs index 1a1ba5c6d..13dd3f590 100644 --- a/benches/generated/margin_auto_top_and_bottom_strech.rs +++ b/benches/generated/margin_auto_top_and_bottom_strech.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_auto_top_stretching_child.rs b/benches/generated/margin_auto_top_stretching_child.rs index 256c17482..c08063041 100644 --- a/benches/generated/margin_auto_top_stretching_child.rs +++ b/benches/generated/margin_auto_top_stretching_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -27,7 +27,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/margin_bottom.rs b/benches/generated/margin_bottom.rs index b8f616070..828e5b635 100644 --- a/benches/generated/margin_bottom.rs +++ b/benches/generated/margin_bottom.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { 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 2c7a26ebf..0cfb7f8c1 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), diff --git a/benches/generated/margin_left.rs b/benches/generated/margin_left.rs index 825b6d243..7f36b2b27 100644 --- a/benches/generated/margin_left.rs +++ b/benches/generated/margin_left.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_right.rs b/benches/generated/margin_right.rs index c55b274c6..f3a88fa45 100644 --- a/benches/generated/margin_right.rs +++ b/benches/generated/margin_right.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_should_not_be_part_of_max_height.rs b/benches/generated/margin_should_not_be_part_of_max_height.rs index 65e0d1745..cc2898b05 100644 --- a/benches/generated/margin_should_not_be_part_of_max_height.rs +++ b/benches/generated/margin_should_not_be_part_of_max_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(250f32), height: taffy::style::Dimension::Points(250f32), 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 cc9439354..897ef2cc9 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(250f32), height: taffy::style::Dimension::Points(250f32), diff --git a/benches/generated/margin_top.rs b/benches/generated/margin_top.rs index dc4940e1d..993931106 100644 --- a/benches/generated/margin_top.rs +++ b/benches/generated/margin_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_with_sibling_column.rs b/benches/generated/margin_with_sibling_column.rs index ea897d4e4..2ae7855f9 100644 --- a/benches/generated/margin_with_sibling_column.rs +++ b/benches/generated/margin_with_sibling_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -10,11 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/margin_with_sibling_row.rs b/benches/generated/margin_with_sibling_row.rs index 8517b85e8..83ad1769a 100644 --- a/benches/generated/margin_with_sibling_row.rs +++ b/benches/generated/margin_with_sibling_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -10,11 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/max_height.rs b/benches/generated/max_height.rs index f8e38769b..cf419324d 100644 --- a/benches/generated/max_height.rs +++ b/benches/generated/max_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/max_height_overrides_height.rs b/benches/generated/max_height_overrides_height.rs index 5d7c681de..78e3baf5a 100644 --- a/benches/generated/max_height_overrides_height.rs +++ b/benches/generated/max_height_overrides_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), @@ -13,6 +13,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/max_height_overrides_height_on_root.rs b/benches/generated/max_height_overrides_height_on_root.rs index 1b3f8fa18..8284102c1 100644 --- a/benches/generated/max_height_overrides_height_on_root.rs +++ b/benches/generated/max_height_overrides_height_on_root.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/max_width.rs b/benches/generated/max_width.rs index a05390a3c..f87b2b1d0 100644 --- a/benches/generated/max_width.rs +++ b/benches/generated/max_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/max_width_overrides_width.rs b/benches/generated/max_width_overrides_width.rs index b414a81ea..1ab60b5f4 100644 --- a/benches/generated/max_width_overrides_width.rs +++ b/benches/generated/max_width_overrides_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -13,6 +13,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/max_width_overrides_width_on_root.rs b/benches/generated/max_width_overrides_width_on_root.rs index c70d57f63..39e2f7158 100644 --- a/benches/generated/max_width_overrides_width_on_root.rs +++ b/benches/generated/max_width_overrides_width_on_root.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/min_height.rs b/benches/generated/min_height.rs index 67e02af59..5230e63df 100644 --- a/benches/generated/min_height.rs +++ b/benches/generated/min_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(60f32), @@ -13,11 +13,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/min_height_overrides_height.rs b/benches/generated/min_height_overrides_height.rs index aaaef28a7..57140cd43 100644 --- a/benches/generated/min_height_overrides_height.rs +++ b/benches/generated/min_height_overrides_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), @@ -13,6 +13,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/min_height_overrides_height_on_root.rs b/benches/generated/min_height_overrides_height_on_root.rs index ec3a58f4c..0c9e5dc86 100644 --- a/benches/generated/min_height_overrides_height_on_root.rs +++ b/benches/generated/min_height_overrides_height_on_root.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/min_max_percent_no_width_height.rs b/benches/generated/min_max_percent_no_width_height.rs index 2b50af4f9..c8c28da56 100644 --- a/benches/generated/min_max_percent_no_width_height.rs +++ b/benches/generated/min_max_percent_no_width_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { min_size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.1f32), height: taffy::style::Dimension::Percent(0.1f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { diff --git a/benches/generated/min_width.rs b/benches/generated/min_width.rs index 1178ede5e..0f1653a48 100644 --- a/benches/generated/min_width.rs +++ b/benches/generated/min_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -10,11 +10,10 @@ pub fn compute() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/min_width_overrides_width.rs b/benches/generated/min_width_overrides_width.rs index 898a137c8..65ba68fc9 100644 --- a/benches/generated/min_width_overrides_width.rs +++ b/benches/generated/min_width_overrides_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -13,6 +13,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/min_width_overrides_width_on_root.rs b/benches/generated/min_width_overrides_width_on_root.rs index 7d64ab44b..d86c62907 100644 --- a/benches/generated/min_width_overrides_width_on_root.rs +++ b/benches/generated/min_width_overrides_width_on_root.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/nested_overflowing_child.rs b/benches/generated/nested_overflowing_child.rs index 45bd2a40c..a85edd890 100644 --- a/benches/generated/nested_overflowing_child.rs +++ b/benches/generated/nested_overflowing_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -13,10 +13,10 @@ pub fn compute() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/nested_overflowing_child_in_constraint_parent.rs b/benches/generated/nested_overflowing_child_in_constraint_parent.rs index 6cdba12de..95f659d36 100644 --- a/benches/generated/nested_overflowing_child_in_constraint_parent.rs +++ b/benches/generated/nested_overflowing_child_in_constraint_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/overflow_cross_axis.rs b/benches/generated/overflow_cross_axis.rs index 785a33785..06fe9b39e 100644 --- a/benches/generated/overflow_cross_axis.rs +++ b/benches/generated/overflow_cross_axis.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/overflow_main_axis.rs b/benches/generated/overflow_main_axis.rs index 0d78375f7..574a5e9a9 100644 --- a/benches/generated/overflow_main_axis.rs +++ b/benches/generated/overflow_main_axis.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/padding_align_end_child.rs b/benches/generated/padding_align_end_child.rs index 21de22d07..9a69f5fae 100644 --- a/benches/generated/padding_align_end_child.rs +++ b/benches/generated/padding_align_end_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/benches/generated/padding_center_child.rs b/benches/generated/padding_center_child.rs index 259b3ff17..d3c5f209f 100644 --- a/benches/generated/padding_center_child.rs +++ b/benches/generated/padding_center_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/benches/generated/padding_flex_child.rs b/benches/generated/padding_flex_child.rs index 6eb6fcd28..ea0f9fc12 100644 --- a/benches/generated/padding_flex_child.rs +++ b/benches/generated/padding_flex_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/padding_no_child.rs b/benches/generated/padding_no_child.rs index 3e02ec549..1efd79499 100644 --- a/benches/generated/padding_no_child.rs +++ b/benches/generated/padding_no_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { padding: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/padding_stretch_child.rs b/benches/generated/padding_stretch_child.rs index 973ccf954..edce37e35 100644 --- a/benches/generated/padding_stretch_child.rs +++ b/benches/generated/padding_stretch_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/parent_wrap_child_size_overflowing_parent.rs b/benches/generated/parent_wrap_child_size_overflowing_parent.rs index e2513b3b3..284f54286 100644 --- a/benches/generated/parent_wrap_child_size_overflowing_parent.rs +++ b/benches/generated/parent_wrap_child_size_overflowing_parent.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -24,7 +24,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/percent_absolute_position.rs b/benches/generated/percent_absolute_position.rs index 3fefd7602..f20b73599 100644 --- a/benches/generated/percent_absolute_position.rs +++ b/benches/generated/percent_absolute_position.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), @@ -38,7 +38,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), diff --git a/benches/generated/percent_within_flex_grow.rs b/benches/generated/percent_within_flex_grow.rs index c1f54d914..542b68694 100644 --- a/benches/generated/percent_within_flex_grow.rs +++ b/benches/generated/percent_within_flex_grow.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -11,7 +11,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, ..Default::default() @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(350f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/percentage_absolute_position.rs b/benches/generated/percentage_absolute_position.rs index 0e1c17e06..bc7792796 100644 --- a/benches/generated/percentage_absolute_position.rs +++ b/benches/generated/percentage_absolute_position.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -21,7 +21,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_container_in_wrapping_container.rs b/benches/generated/percentage_container_in_wrapping_container.rs index 8e2c9ef75..9739e7df6 100644 --- a/benches/generated/percentage_container_in_wrapping_container.rs +++ b/benches/generated/percentage_container_in_wrapping_container.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node001 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() @@ -38,13 +38,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, diff --git a/benches/generated/percentage_flex_basis.rs b/benches/generated/percentage_flex_basis.rs index 790314ff7..5e3f44987 100644 --- a/benches/generated/percentage_flex_basis.rs +++ b/benches/generated/percentage_flex_basis.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.25f32), ..Default::default() @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_cross.rs b/benches/generated/percentage_flex_basis_cross.rs index f90c6a285..5b59d51b9 100644 --- a/benches/generated/percentage_flex_basis_cross.rs +++ b/benches/generated/percentage_flex_basis_cross.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.25f32), ..Default::default() @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_cross_max_height.rs b/benches/generated/percentage_flex_basis_cross_max_height.rs index 7f760d527..df3130cdd 100644 --- a/benches/generated/percentage_flex_basis_cross_max_height.rs +++ b/benches/generated/percentage_flex_basis_cross_max_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_cross_max_width.rs b/benches/generated/percentage_flex_basis_cross_max_width.rs index df39905bb..3222bec07 100644 --- a/benches/generated/percentage_flex_basis_cross_max_width.rs +++ b/benches/generated/percentage_flex_basis_cross_max_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), max_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_cross_min_height.rs b/benches/generated/percentage_flex_basis_cross_min_height.rs index 8f58177e1..0a93c8c43 100644 --- a/benches/generated/percentage_flex_basis_cross_min_height.rs +++ b/benches/generated/percentage_flex_basis_cross_min_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Percent(0.6f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 2f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Percent(0.1f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_cross_min_width.rs b/benches/generated/percentage_flex_basis_cross_min_width.rs index e294c0e16..9e78dcfd3 100644 --- a/benches/generated/percentage_flex_basis_cross_min_width.rs +++ b/benches/generated/percentage_flex_basis_cross_min_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), min_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_flex_basis_main_max_height.rs b/benches/generated/percentage_flex_basis_main_max_height.rs index 4499e6c7b..7cf992063 100644 --- a/benches/generated/percentage_flex_basis_main_max_height.rs +++ b/benches/generated/percentage_flex_basis_main_max_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/benches/generated/percentage_flex_basis_main_max_width.rs b/benches/generated/percentage_flex_basis_main_max_width.rs index ba0f779d3..08926aa14 100644 --- a/benches/generated/percentage_flex_basis_main_max_width.rs +++ b/benches/generated/percentage_flex_basis_main_max_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), max_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/benches/generated/percentage_flex_basis_main_min_width.rs b/benches/generated/percentage_flex_basis_main_min_width.rs index 430ca85a1..debe374bd 100644 --- a/benches/generated/percentage_flex_basis_main_min_width.rs +++ b/benches/generated/percentage_flex_basis_main_min_width.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -16,7 +16,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), min_size: taffy::geometry::Size { @@ -30,7 +30,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), 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 0fa5aa058..95106134c 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, margin: taffy::geometry::Rect { @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 5b47dc9d0..64ae8e62c 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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), @@ -25,7 +25,7 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, margin: taffy::geometry::Rect { @@ -49,7 +49,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), @@ -78,7 +78,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -92,7 +92,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 8fc9adda3..a8605be3a 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 @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, padding: taffy::geometry::Rect { @@ -32,7 +32,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_position_bottom_right.rs b/benches/generated/percentage_position_bottom_right.rs index eb0930a34..a11561e2d 100644 --- a/benches/generated/percentage_position_bottom_right.rs +++ b/benches/generated/percentage_position_bottom_right.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.55f32), height: taffy::style::Dimension::Percent(0.15f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/percentage_position_left_top.rs b/benches/generated/percentage_position_left_top.rs index d939a3ec8..0ae91af23 100644 --- a/benches/generated/percentage_position_left_top.rs +++ b/benches/generated/percentage_position_left_top.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.45f32), height: taffy::style::Dimension::Percent(0.55f32), @@ -20,7 +20,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), height: taffy::style::Dimension::Points(400f32), 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 150d79cd6..25ecb1fc8 100644 --- a/benches/generated/percentage_size_based_on_parent_inner_size.rs +++ b/benches/generated/percentage_size_based_on_parent_inner_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: taffy::style::Dimension::Percent(0.5f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/benches/generated/percentage_size_of_flex_basis.rs b/benches/generated/percentage_size_of_flex_basis.rs index 874bd9b68..7d907f6ff 100644 --- a/benches/generated/percentage_size_of_flex_basis.rs +++ b/benches/generated/percentage_size_of_flex_basis.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), height: taffy::style::Dimension::Points(100f32), @@ -15,13 +15,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/percentage_width_height.rs b/benches/generated/percentage_width_height.rs index 22cc1a908..d5c89f5a1 100644 --- a/benches/generated/percentage_width_height.rs +++ b/benches/generated/percentage_width_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.3f32), height: taffy::style::Dimension::Percent(0.3f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/benches/generated/percentage_width_height_undefined_parent_size.rs b/benches/generated/percentage_width_height_undefined_parent_size.rs index fc606b240..3e4fdf978 100644 --- a/benches/generated/percentage_width_height_undefined_parent_size.rs +++ b/benches/generated/percentage_width_height_undefined_parent_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: taffy::style::Dimension::Percent(0.5f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0], ) .unwrap(); diff --git a/benches/generated/relative_position_should_not_nudge_siblings.rs b/benches/generated/relative_position_should_not_nudge_siblings.rs index 58f1bce75..abdbd651c 100644 --- a/benches/generated/relative_position_should_not_nudge_siblings.rs +++ b/benches/generated/relative_position_should_not_nudge_siblings.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() @@ -12,7 +12,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs b/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs index ea6443da5..088212a41 100644 --- a/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs +++ b/benches/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs @@ -1,18 +1,13 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node2 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node3 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node4 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node2 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node3 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node4 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(113f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs b/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs index 78c8aecdb..08d30daea 100644 --- a/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs +++ b/benches/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs @@ -1,14 +1,11 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node2 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node2 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_flex_basis_flex_shrink_row.rs b/benches/generated/rounding_flex_basis_flex_shrink_row.rs index bb3dc483c..67d022098 100644 --- a/benches/generated/rounding_flex_basis_flex_shrink_row.rs +++ b/benches/generated/rounding_flex_basis_flex_shrink_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -12,19 +12,19 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, &[], ) .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(101f32), height: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_flex_basis_overrides_main_size.rs b/benches/generated/rounding_flex_basis_overrides_main_size.rs index 0d44c7da0..b0df9f7ad 100644 --- a/benches/generated/rounding_flex_basis_overrides_main_size.rs +++ b/benches/generated/rounding_flex_basis_overrides_main_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_fractial_input_1.rs b/benches/generated/rounding_fractial_input_1.rs index 6770f0eaf..4521d6085 100644 --- a/benches/generated/rounding_fractial_input_1.rs +++ b/benches/generated/rounding_fractial_input_1.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_fractial_input_2.rs b/benches/generated/rounding_fractial_input_2.rs index f3d43a231..86388138f 100644 --- a/benches/generated/rounding_fractial_input_2.rs +++ b/benches/generated/rounding_fractial_input_2.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_fractial_input_3.rs b/benches/generated/rounding_fractial_input_3.rs index 6770f0eaf..4521d6085 100644 --- a/benches/generated/rounding_fractial_input_3.rs +++ b/benches/generated/rounding_fractial_input_3.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_fractial_input_4.rs b/benches/generated/rounding_fractial_input_4.rs index 6770f0eaf..4521d6085 100644 --- a/benches/generated/rounding_fractial_input_4.rs +++ b/benches/generated/rounding_fractial_input_4.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/benches/generated/rounding_total_fractial.rs b/benches/generated/rounding_total_fractial.rs index d9d5a980e..052e20e8f 100644 --- a/benches/generated/rounding_total_fractial.rs +++ b/benches/generated/rounding_total_fractial.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, @@ -13,7 +13,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.6f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(87.4f32), diff --git a/benches/generated/rounding_total_fractial_nested.rs b/benches/generated/rounding_total_fractial_nested.rs index 37b908499..0a94d6d37 100644 --- a/benches/generated/rounding_total_fractial_nested.rs +++ b/benches/generated/rounding_total_fractial_nested.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(9.9f32), ..Default::default() }, @@ -17,7 +17,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Points(0.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(1.1f32), ..Default::default() }, @@ -29,7 +29,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.6f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -51,7 +51,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, ..Default::default() @@ -61,7 +61,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(87.4f32), diff --git a/benches/generated/size_defined_by_child.rs b/benches/generated/size_defined_by_child.rs index 9b23a4c5e..4b3f8d8ad 100644 --- a/benches/generated/size_defined_by_child.rs +++ b/benches/generated/size_defined_by_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -13,6 +13,6 @@ pub fn compute() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/size_defined_by_child_with_border.rs b/benches/generated/size_defined_by_child_with_border.rs index 73d3e46cb..6c82516b8 100644 --- a/benches/generated/size_defined_by_child_with_border.rs +++ b/benches/generated/size_defined_by_child_with_border.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { border: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/size_defined_by_child_with_padding.rs b/benches/generated/size_defined_by_child_with_padding.rs index f13cf150d..0bcc26266 100644 --- a/benches/generated/size_defined_by_child_with_padding.rs +++ b/benches/generated/size_defined_by_child_with_padding.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { padding: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/benches/generated/size_defined_by_grand_child.rs b/benches/generated/size_defined_by_grand_child.rs index e2639e758..b9050d40e 100644 --- a/benches/generated/size_defined_by_grand_child.rs +++ b/benches/generated/size_defined_by_grand_child.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -13,7 +13,7 @@ pub fn compute() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs index f7f8f08a4..dc257695d 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_large_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs index 5b5e677b3..bdb7040cc 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_small_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs index a070f0691..c9f636a47 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -48,6 +48,6 @@ pub fn compute() { &[node10], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0, node1]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0, node1]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); } diff --git a/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs b/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs index 0efbbc13f..7861ce6dc 100644 --- a/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/benches/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -26,7 +26,7 @@ pub fn compute() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -50,7 +50,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() }, diff --git a/benches/generated/wrap_column.rs b/benches/generated/wrap_column.rs index 8b96e4f82..bafbea96a 100644 --- a/benches/generated/wrap_column.rs +++ b/benches/generated/wrap_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(31f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(32f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(33f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(34f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { diff --git a/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs b/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs index 59ef2e492..8ce5851dd 100644 --- a/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs +++ b/benches/generated/wrap_nodes_with_content_sizing_margin_cross.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -15,13 +15,13 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node000], ) .unwrap(); let node010 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -34,7 +34,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), ..Default::default() }, ..Default::default() @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), 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 1c35f7f45..540cffde6 100644 --- a/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/benches/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -15,13 +15,13 @@ pub fn compute() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node000], ) .unwrap(); let node010 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -34,7 +34,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -44,7 +44,7 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(85f32), ..Default::default() }, ..Default::default() @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), diff --git a/benches/generated/wrap_reverse_column.rs b/benches/generated/wrap_reverse_column.rs index 0d928e736..5d51feac0 100644 --- a/benches/generated/wrap_reverse_column.rs +++ b/benches/generated/wrap_reverse_column.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(31f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(32f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(33f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(34f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/benches/generated/wrap_reverse_column_fixed_size.rs b/benches/generated/wrap_reverse_column_fixed_size.rs index b5b073e90..890c5cc9a 100644 --- a/benches/generated/wrap_reverse_column_fixed_size.rs +++ b/benches/generated/wrap_reverse_column_fixed_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, align_items: taffy::style::AlignItems::Center, diff --git a/benches/generated/wrap_reverse_row.rs b/benches/generated/wrap_reverse_row.rs index 44711dd9f..11fde4b73 100644 --- a/benches/generated/wrap_reverse_row.rs +++ b/benches/generated/wrap_reverse_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(31f32), height: taffy::style::Dimension::Points(30f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(32f32), height: taffy::style::Dimension::Points(30f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(33f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(34f32), height: taffy::style::Dimension::Points(30f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_reverse_row_align_content_center.rs b/benches/generated/wrap_reverse_row_align_content_center.rs index 4d3d0aca0..163faaeb2 100644 --- a/benches/generated/wrap_reverse_row_align_content_center.rs +++ b/benches/generated/wrap_reverse_row_align_content_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/wrap_reverse_row_align_content_flex_start.rs b/benches/generated/wrap_reverse_row_align_content_flex_start.rs index 04b5cf0fc..018c40f4d 100644 --- a/benches/generated/wrap_reverse_row_align_content_flex_start.rs +++ b/benches/generated/wrap_reverse_row_align_content_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/wrap_reverse_row_align_content_space_around.rs b/benches/generated/wrap_reverse_row_align_content_space_around.rs index 6d971a78b..6dcaeb77a 100644 --- a/benches/generated/wrap_reverse_row_align_content_space_around.rs +++ b/benches/generated/wrap_reverse_row_align_content_space_around.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/wrap_reverse_row_align_content_stretch.rs b/benches/generated/wrap_reverse_row_align_content_stretch.rs index 2da326736..0e7acdcff 100644 --- a/benches/generated/wrap_reverse_row_align_content_stretch.rs +++ b/benches/generated/wrap_reverse_row_align_content_stretch.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_reverse_row_single_line_different_size.rs b/benches/generated/wrap_reverse_row_single_line_different_size.rs index 0e6911cee..985513f15 100644 --- a/benches/generated/wrap_reverse_row_single_line_different_size.rs +++ b/benches/generated/wrap_reverse_row_single_line_different_size.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() }, diff --git a/benches/generated/wrap_row.rs b/benches/generated/wrap_row.rs index 9c1a530f0..9995b1c30 100644 --- a/benches/generated/wrap_row.rs +++ b/benches/generated/wrap_row.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(31f32), height: taffy::style::Dimension::Points(30f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(32f32), height: taffy::style::Dimension::Points(30f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(33f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(34f32), height: taffy::style::Dimension::Points(30f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/benches/generated/wrap_row_align_items_center.rs b/benches/generated/wrap_row_align_items_center.rs index 4b050ba69..2d4927364 100644 --- a/benches/generated/wrap_row_align_items_center.rs +++ b/benches/generated/wrap_row_align_items_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/wrap_row_align_items_flex_end.rs b/benches/generated/wrap_row_align_items_flex_end.rs index c1af7ba88..f8bc96c60 100644 --- a/benches/generated/wrap_row_align_items_flex_end.rs +++ b/benches/generated/wrap_row_align_items_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -28,7 +28,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -41,7 +41,7 @@ pub fn compute() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -54,7 +54,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/benches/generated/wrapped_column_max_height.rs b/benches/generated/wrapped_column_max_height.rs index 446a4b264..8896ee392 100644 --- a/benches/generated/wrapped_column_max_height.rs +++ b/benches/generated/wrapped_column_max_height.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(500f32), @@ -19,7 +19,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -39,7 +39,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -52,7 +52,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, diff --git a/benches/generated/wrapped_column_max_height_flex.rs b/benches/generated/wrapped_column_max_height_flex.rs index bda0b9368..07efd6862 100644 --- a/benches/generated/wrapped_column_max_height_flex.rs +++ b/benches/generated/wrapped_column_max_height_flex.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -22,7 +22,7 @@ pub fn compute() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -45,7 +45,7 @@ pub fn compute() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -58,7 +58,7 @@ pub fn compute() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, diff --git a/benches/generated/wrapped_row_within_align_items_center.rs b/benches/generated/wrapped_row_within_align_items_center.rs index 752cbd4af..1ceb0c6a3 100644 --- a/benches/generated/wrapped_row_within_align_items_center.rs +++ b/benches/generated/wrapped_row_within_align_items_center.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -28,13 +28,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { diff --git a/benches/generated/wrapped_row_within_align_items_flex_end.rs b/benches/generated/wrapped_row_within_align_items_flex_end.rs index 8c752093b..9d047cfbe 100644 --- a/benches/generated/wrapped_row_within_align_items_flex_end.rs +++ b/benches/generated/wrapped_row_within_align_items_flex_end.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -28,13 +28,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { diff --git a/benches/generated/wrapped_row_within_align_items_flex_start.rs b/benches/generated/wrapped_row_within_align_items_flex_start.rs index 90d669947..dd95165d1 100644 --- a/benches/generated/wrapped_row_within_align_items_flex_start.rs +++ b/benches/generated/wrapped_row_within_align_items_flex_start.rs @@ -2,7 +2,7 @@ pub fn compute() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -15,7 +15,7 @@ pub fn compute() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -28,13 +28,13 @@ pub fn compute() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { diff --git a/examples/basic.rs b/examples/basic.rs index 5112aab99..80197fda3 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -3,13 +3,13 @@ use taffy::prelude::*; fn main() -> Result<(), taffy::error::TaffyError> { let mut taffy = Taffy::new(); - let child = taffy.new_leaf(FlexboxLayout { + let child = taffy.new_leaf(Style { size: Size { width: Dimension::Percent(0.5), height: Dimension::Auto }, ..Default::default() })?; let node = taffy.new_with_children( - FlexboxLayout { + Style { size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, justify_content: JustifyContent::Center, ..Default::default() diff --git a/examples/flexbox-gap.rs b/examples/flexbox-gap.rs index 26de3db3c..6992df90d 100644 --- a/examples/flexbox-gap.rs +++ b/examples/flexbox-gap.rs @@ -6,19 +6,14 @@ use taffy::prelude::*; fn main() -> Result<(), taffy::error::TaffyError> { let mut taffy = Taffy::new(); - let child_style = FlexboxLayout { - size: Size { width: Dimension::Points(20.0), height: Dimension::Points(20.0) }, - ..Default::default() - }; + let child_style = + Style { size: Size { width: Dimension::Points(20.0), height: Dimension::Points(20.0) }, ..Default::default() }; let child0 = taffy.new_leaf(child_style.clone())?; let child1 = taffy.new_leaf(child_style.clone())?; let child2 = taffy.new_leaf(child_style.clone())?; let root = taffy.new_with_children( - FlexboxLayout { - gap: Size { width: Dimension::Points(10.0), height: Dimension::Undefined }, - ..Default::default() - }, + Style { gap: Size { width: Dimension::Points(10.0), height: Dimension::Undefined }, ..Default::default() }, &[child0, child1, child2], )?; diff --git a/examples/nested.rs b/examples/nested.rs index 27cf24bce..56d22b12b 100644 --- a/examples/nested.rs +++ b/examples/nested.rs @@ -4,13 +4,13 @@ fn main() -> Result<(), taffy::error::TaffyError> { let mut taffy = Taffy::new(); // left - let child_t1 = taffy.new_leaf(FlexboxLayout { + let child_t1 = taffy.new_leaf(Style { size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, ..Default::default() })?; let div1 = taffy.new_with_children( - FlexboxLayout { + Style { size: Size { width: Dimension::Percent(0.5), height: Dimension::Percent(1.0) }, // justify_content: JustifyContent::Center, ..Default::default() @@ -19,13 +19,13 @@ fn main() -> Result<(), taffy::error::TaffyError> { )?; // right - let child_t2 = taffy.new_leaf(FlexboxLayout { + let child_t2 = taffy.new_leaf(Style { size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, ..Default::default() })?; let div2 = taffy.new_with_children( - FlexboxLayout { + Style { size: Size { width: Dimension::Percent(0.5), height: Dimension::Percent(1.0) }, // justify_content: JustifyContent::Center, ..Default::default() @@ -34,10 +34,7 @@ fn main() -> Result<(), taffy::error::TaffyError> { )?; let container = taffy.new_with_children( - FlexboxLayout { - size: Size { width: Dimension::Percent(1.0), height: Dimension::Percent(1.0) }, - ..Default::default() - }, + Style { size: Size { width: Dimension::Percent(1.0), height: Dimension::Percent(1.0) }, ..Default::default() }, &[div1, div2], )?; diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs index e46f9ea22..ff5252085 100644 --- a/scripts/gentest/src/main.rs +++ b/scripts/gentest/src/main.rs @@ -453,7 +453,7 @@ fn generate_node(ident: &str, node: &json::JsonValue) -> TokenStream { quote!( #children_body let #ident = taffy.new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { #display #direction #position_type diff --git a/src/compute/flexbox.rs b/src/compute/flexbox.rs index 47657a698..826485bce 100644 --- a/src/compute/flexbox.rs +++ b/src/compute/flexbox.rs @@ -10,7 +10,7 @@ use crate::math::MaybeMath; use crate::node::Node; use crate::resolve::{MaybeResolve, ResolveOrDefault}; use crate::style::{AlignContent, AlignSelf, Dimension, Display, FlexWrap, JustifyContent, PositionType}; -use crate::style::{FlexDirection, FlexboxLayout}; +use crate::style::{FlexDirection, Style}; use crate::sys::Vec; use crate::tree::LayoutTree; @@ -346,11 +346,7 @@ fn compute_preliminary( /// Compute constants that can be reused during the flexbox algorithm. #[inline] -fn compute_constants( - style: &FlexboxLayout, - node_size: Size>, - parent_size: Size, -) -> AlgoConstants { +fn compute_constants(style: &Style, node_size: Size>, parent_size: Size) -> AlgoConstants { let dir = style.flex_direction; let is_row = dir.is_row(); let is_column = dir.is_column(); @@ -1383,7 +1379,7 @@ fn align_flex_items_along_cross_axis( tree: &impl LayoutTree, node: Node, child: &mut FlexItem, - child_style: &FlexboxLayout, + child_style: &Style, free_space: f32, max_baseline: f32, constants: &AlgoConstants, @@ -1864,7 +1860,7 @@ mod tests { math::MaybeMath, prelude::{Rect, Size}, resolve::ResolveOrDefault, - style::{FlexWrap, FlexboxLayout}, + style::{FlexWrap, Style}, Taffy, }; @@ -1873,7 +1869,7 @@ mod tests { fn correct_constants() { let mut tree = Taffy::with_capacity(16); - let style = FlexboxLayout::default(); + let style = Style::default(); let node_id = tree.new_leaf(style).unwrap(); let node_size = Size::NONE; @@ -1920,8 +1916,7 @@ mod tests { fn hidden_layout_should_hide_recursively() { let mut taffy = Taffy::new(); - let style: FlexboxLayout = - FlexboxLayout { display: Flex, size: Size::from_points(50.0, 50.0), ..Default::default() }; + let style: Style = Style { display: Flex, size: Size::from_points(50.0, 50.0), ..Default::default() }; let grandchild_00 = taffy.new_leaf(style).unwrap(); @@ -1935,7 +1930,7 @@ mod tests { let root = taffy .new_with_children( - FlexboxLayout { display: Display::None, size: Size::from_points(50.0, 50.0), ..Default::default() }, + Style { display: Display::None, size: Size::from_points(50.0, 50.0), ..Default::default() }, &[child_00, child_01], ) .unwrap(); diff --git a/src/data.rs b/src/data.rs index 51e7ceb16..c21b09760 100644 --- a/src/data.rs +++ b/src/data.rs @@ -3,14 +3,14 @@ //! Used to compute layout for Taffy trees //! use crate::layout::{Cache, Layout}; -use crate::style::FlexboxLayout; +use crate::style::Style; /// Layout information for a given [`Node`](crate::node::Node) /// /// Stored in a [`Taffy`]. pub(crate) struct NodeData { /// The layout strategy used by this node - pub(crate) style: FlexboxLayout, + pub(crate) style: Style, /// The results of the layout computation pub(crate) layout: Layout, @@ -26,7 +26,7 @@ pub(crate) struct NodeData { impl NodeData { /// Create the data for a new node #[must_use] - pub const fn new(style: FlexboxLayout) -> Self { + pub const fn new(style: Style) -> Self { Self { style, size_cache: [None; 4], layout: Layout::new(), is_dirty: true, needs_measure: false } } diff --git a/src/node.rs b/src/node.rs index 6ee3f94cd..8ce6bcc8c 100644 --- a/src/node.rs +++ b/src/node.rs @@ -10,7 +10,7 @@ use crate::error::{TaffyError, TaffyResult}; use crate::geometry::Size; use crate::layout::{AvailableSpace, Cache, Layout}; use crate::prelude::LayoutTree; -use crate::style::FlexboxLayout; +use crate::style::Style; #[cfg(any(feature = "std", feature = "alloc"))] use crate::sys::Box; use crate::sys::{new_vec_with_capacity, ChildrenVec, Vec}; @@ -66,7 +66,7 @@ impl LayoutTree for Taffy { self.parents.get(node).copied().flatten() } - fn style(&self, node: Node) -> &FlexboxLayout { + fn style(&self, node: Node) -> &Style { &self.nodes[node].style } @@ -136,7 +136,7 @@ impl Taffy { } /// Creates and adds a new unattached leaf node to the tree, and returns the [`NodeId`] of the new node - pub fn new_leaf(&mut self, layout: FlexboxLayout) -> TaffyResult { + pub fn new_leaf(&mut self, layout: Style) -> TaffyResult { let id = self.nodes.insert(NodeData::new(layout)); let _ = self.children.insert(new_vec_with_capacity(0)); let _ = self.parents.insert(None); @@ -147,7 +147,7 @@ impl Taffy { /// Creates and adds a new unattached leaf node to the tree, and returns the [`NodeId`] of the new node /// /// Creates and adds a new leaf node with a supplied [`MeasureFunc`] - pub fn new_leaf_with_measure(&mut self, layout: FlexboxLayout, measure: MeasureFunc) -> TaffyResult { + pub fn new_leaf_with_measure(&mut self, layout: Style, measure: MeasureFunc) -> TaffyResult { let mut data = NodeData::new(layout); data.needs_measure = true; @@ -161,7 +161,7 @@ impl Taffy { } /// Creates and adds a new node, which may have any number of `children` - pub fn new_with_children(&mut self, layout: FlexboxLayout, children: &[Node]) -> TaffyResult { + pub fn new_with_children(&mut self, layout: Style, children: &[Node]) -> TaffyResult { let id = self.nodes.insert(NodeData::new(layout)); for child in children { @@ -307,14 +307,14 @@ impl Taffy { } /// Sets the [`Style`] of the provided `node` - pub fn set_style(&mut self, node: Node, style: FlexboxLayout) -> TaffyResult<()> { + pub fn set_style(&mut self, node: Node, style: Style) -> TaffyResult<()> { self.nodes[node].style = style; self.mark_dirty(node)?; Ok(()) } /// Gets the [`Style`] of the provided `node` - pub fn style(&self, node: Node) -> TaffyResult<&FlexboxLayout> { + pub fn style(&self, node: Node) -> TaffyResult<&Style> { Ok(&self.nodes[node].style) } @@ -392,7 +392,7 @@ mod tests { fn test_new_leaf() { let mut taffy = Taffy::new(); - let res = taffy.new_leaf(FlexboxLayout::default()); + let res = taffy.new_leaf(Style::default()); assert!(res.is_ok()); let node = res.unwrap(); @@ -404,7 +404,7 @@ mod tests { fn new_leaf_with_measure() { let mut taffy = Taffy::new(); - let res = taffy.new_leaf_with_measure(FlexboxLayout::default(), MeasureFunc::Raw(|_, _| Size::ZERO)); + let res = taffy.new_leaf_with_measure(Style::default(), MeasureFunc::Raw(|_, _| Size::ZERO)); assert!(res.is_ok()); let node = res.unwrap(); @@ -416,9 +416,9 @@ mod tests { #[test] fn test_new_with_children() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); // node should have two children assert_eq!(taffy.child_count(node).unwrap(), 2); @@ -430,7 +430,7 @@ mod tests { fn remove_node_should_remove() { let mut taffy = Taffy::new(); - let node = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let node = taffy.new_leaf(Style::default()).unwrap(); let _ = taffy.remove(node).unwrap(); } @@ -440,9 +440,9 @@ mod tests { let mut taffy = Taffy::new(); // Build a linear tree layout: <0> <- <1> <- <2> - let node2 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node1 = taffy.new_with_children(FlexboxLayout::default(), &[node2]).unwrap(); - let node0 = taffy.new_with_children(FlexboxLayout::default(), &[node1]).unwrap(); + let node2 = taffy.new_leaf(Style::default()).unwrap(); + let node1 = taffy.new_with_children(Style::default(), &[node2]).unwrap(); + let node0 = taffy.new_with_children(Style::default(), &[node1]).unwrap(); // Both node0 and node1 should have 1 child nodes assert_eq!(taffy.children(node0).unwrap().as_slice(), &[node1]); @@ -460,8 +460,8 @@ mod tests { fn remove_last_node() { let mut taffy = Taffy::new(); - let parent = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let parent = taffy.new_leaf(Style::default()).unwrap(); + let child = taffy.new_leaf(Style::default()).unwrap(); taffy.add_child(parent, child).unwrap(); taffy.remove(child).unwrap(); @@ -472,10 +472,7 @@ mod tests { fn set_measure() { let mut taffy = Taffy::new(); let node = taffy - .new_leaf_with_measure( - FlexboxLayout::default(), - MeasureFunc::Raw(|_, _| Size { width: 200.0, height: 200.0 }), - ) + .new_leaf_with_measure(Style::default(), MeasureFunc::Raw(|_, _| Size { width: 200.0, height: 200.0 })) .unwrap(); taffy.compute_layout(node, Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 200.0); @@ -489,14 +486,14 @@ mod tests { #[test] fn add_child() { let mut taffy = Taffy::new(); - let node = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let node = taffy.new_leaf(Style::default()).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 0); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); taffy.add_child(node, child0).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 1); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); taffy.add_child(node, child1).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 2); } @@ -505,16 +502,16 @@ mod tests { fn set_children() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 2); assert_eq!(taffy.children(node).unwrap()[0], child0); assert_eq!(taffy.children(node).unwrap()[1], child1); - let child2 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child3 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let child2 = taffy.new_leaf(Style::default()).unwrap(); + let child3 = taffy.new_leaf(Style::default()).unwrap(); taffy.set_children(node, &[child2, child3]).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 2); @@ -526,9 +523,9 @@ mod tests { #[test] fn remove_child() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 2); @@ -543,9 +540,9 @@ mod tests { #[test] fn remove_child_at_index() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 2); @@ -561,10 +558,10 @@ mod tests { fn replace_child_at_index() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0]).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0]).unwrap(); assert_eq!(taffy.child_count(node).unwrap(), 1); assert_eq!(taffy.children(node).unwrap()[0], child0); @@ -575,10 +572,10 @@ mod tests { #[test] fn test_child_at_index() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child2 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1, child2]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let child2 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1, child2]).unwrap(); assert!(if let Ok(result) = taffy.child_at_index(node, 0) { result == child0 } else { false }); assert!(if let Ok(result) = taffy.child_at_index(node, 1) { result == child1 } else { false }); @@ -587,9 +584,9 @@ mod tests { #[test] fn test_child_count() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); assert!(if let Ok(count) = taffy.child_count(node) { count == 2 } else { false }); assert!(if let Ok(count) = taffy.child_count(child0) { count == 0 } else { false }); @@ -600,9 +597,9 @@ mod tests { #[test] fn test_children() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); let mut children: sys::Vec = sys::Vec::new(); children.push(child0); @@ -617,18 +614,17 @@ mod tests { fn test_set_style() { let mut taffy = Taffy::new(); - let node = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let node = taffy.new_leaf(Style::default()).unwrap(); assert_eq!(taffy.style(node).unwrap().display, Display::Flex); - taffy.set_style(node, FlexboxLayout { display: Display::None, ..FlexboxLayout::default() }).unwrap(); + taffy.set_style(node, Style { display: Display::None, ..Style::default() }).unwrap(); assert_eq!(taffy.style(node).unwrap().display, Display::None); } #[test] fn test_style() { let mut taffy = Taffy::new(); - let style = - FlexboxLayout { display: Display::None, flex_direction: FlexDirection::RowReverse, ..Default::default() }; + let style = Style { display: Display::None, flex_direction: FlexDirection::RowReverse, ..Default::default() }; let node = taffy.new_leaf(style).unwrap(); @@ -639,7 +635,7 @@ mod tests { #[test] fn test_layout() { let mut taffy = Taffy::new(); - let node = taffy.new_leaf(FlexboxLayout::default()).unwrap(); + let node = taffy.new_leaf(Style::default()).unwrap(); // TODO: Improve this test? let res = taffy.layout(node); @@ -649,9 +645,9 @@ mod tests { #[test] fn test_mark_dirty() { let mut taffy = Taffy::new(); - let child0 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let child1 = taffy.new_leaf(FlexboxLayout::default()).unwrap(); - let node = taffy.new_with_children(FlexboxLayout::default(), &[child0, child1]).unwrap(); + let child0 = taffy.new_leaf(Style::default()).unwrap(); + let child1 = taffy.new_leaf(Style::default()).unwrap(); + let node = taffy.new_with_children(Style::default(), &[child0, child1]).unwrap(); taffy.compute_layout(node, Size::MAX_CONTENT).unwrap(); @@ -674,7 +670,7 @@ mod tests { #[test] fn compute_layout_should_produce_valid_result() { let mut taffy = Taffy::new(); - let node_result = taffy.new_leaf(FlexboxLayout { + let node_result = taffy.new_leaf(Style { size: Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, ..Default::default() }); diff --git a/src/prelude.rs b/src/prelude.rs index b3128f999..cf4297be7 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -6,8 +6,8 @@ pub use crate::{ layout::{AvailableSpace, Layout}, node::{Node, Taffy}, style::{ - AlignContent, AlignItems, AlignSelf, Dimension, Display, FlexDirection, FlexWrap, FlexboxLayout, - JustifyContent, PositionType, + AlignContent, AlignItems, AlignSelf, Dimension, Display, FlexDirection, FlexWrap, JustifyContent, PositionType, + Style, }, tree::LayoutTree, }; diff --git a/src/randomizable.rs b/src/randomizable.rs index 0a6b82389..f766abfe4 100644 --- a/src/randomizable.rs +++ b/src/randomizable.rs @@ -4,7 +4,7 @@ use rand::Rng; use crate::geometry::Size; use crate::style::Dimension; -use crate::style::FlexboxLayout; +use crate::style::Style; /// A trait for generating pseudo-random instances. pub trait Randomizeable { @@ -44,12 +44,12 @@ impl Randomizeable for Size { } } -impl Randomizeable for FlexboxLayout { +impl Randomizeable for Style { fn random(rng: &mut R) -> Self where R: Rng, { // TODO: Add more attributes - FlexboxLayout { size: Size::::random(rng), ..Default::default() } + Style { size: Size::::random(rng), ..Default::default() } } } diff --git a/src/style.rs b/src/style.rs index 5a9a99958..315097fc5 100644 --- a/src/style.rs +++ b/src/style.rs @@ -370,7 +370,7 @@ impl Default for Size { #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] #[cfg_attr(feature = "serde", serde(default))] -pub struct FlexboxLayout { +pub struct Style { /// What layout strategy should be used? pub display: Display, /// What should the `position` value of this struct use as a base offset? @@ -421,9 +421,9 @@ pub struct FlexboxLayout { pub aspect_ratio: Option, } -impl FlexboxLayout { +impl Style { /// The [`Default`] layout, in a form that can be used in const functions - pub const DEFAULT: FlexboxLayout = FlexboxLayout { + pub const DEFAULT: Style = Style { display: Display::Flex, position_type: PositionType::Relative, flex_direction: FlexDirection::Row, @@ -447,13 +447,13 @@ impl FlexboxLayout { }; } -impl Default for FlexboxLayout { +impl Default for Style { fn default() -> Self { - FlexboxLayout::DEFAULT + Style::DEFAULT } } -impl FlexboxLayout { +impl Style { /// If the `direction` is row-oriented, the min width. Otherwise the min height pub(crate) fn min_main_size(&self, direction: FlexDirection) -> Dimension { if direction.is_row() { @@ -536,7 +536,7 @@ impl FlexboxLayout { } /// Computes the final alignment of this item based on the parent's [`AlignItems`] and this item's [`AlignSelf`] - pub(crate) fn align_self(&self, parent: &FlexboxLayout) -> AlignSelf { + pub(crate) fn align_self(&self, parent: &Style) -> AlignSelf { // FUTURE WARNING: This function should never return AlignSelf::Auto // See #169 https://github.com/DioxusLabs/taffy/pull/169#issuecomment-1157698840 @@ -557,12 +557,12 @@ impl FlexboxLayout { #[allow(clippy::bool_assert_comparison)] #[cfg(test)] mod tests { - use super::FlexboxLayout; + use super::Style; use crate::geometry::Size; #[test] fn defaults_match() { - let old_defaults = FlexboxLayout { + let old_defaults = Style { display: Default::default(), position_type: Default::default(), flex_direction: Default::default(), @@ -585,8 +585,8 @@ mod tests { aspect_ratio: Default::default(), }; - assert_eq!(FlexboxLayout::DEFAULT, FlexboxLayout::default()); - assert_eq!(FlexboxLayout::DEFAULT, old_defaults); + assert_eq!(Style::DEFAULT, Style::default()); + assert_eq!(Style::DEFAULT, old_defaults); } mod test_flex_direction { @@ -620,73 +620,73 @@ mod tests { mod test_flexbox_layout { use crate::style::*; - fn layout_from_align_items(align: AlignItems) -> FlexboxLayout { - FlexboxLayout { align_items: align, ..Default::default() } + fn layout_from_align_items(align: AlignItems) -> Style { + Style { align_items: align, ..Default::default() } } - fn layout_from_align_self(align: AlignSelf) -> FlexboxLayout { - FlexboxLayout { align_self: align, ..Default::default() } + fn layout_from_align_self(align: AlignSelf) -> Style { + Style { align_self: align, ..Default::default() } } #[test] fn flexbox_layout_min_main_size() { - let layout = FlexboxLayout { min_size: Size::from_points(1.0, 2.0), ..Default::default() }; + let layout = Style { min_size: Size::from_points(1.0, 2.0), ..Default::default() }; assert_eq!(layout.min_main_size(FlexDirection::Row), Dimension::Points(1.0)); assert_eq!(layout.min_main_size(FlexDirection::Column), Dimension::Points(2.0)); } #[test] fn flexbox_layout_max_main_size() { - let layout = FlexboxLayout { max_size: Size::from_points(1.0, 2.0), ..Default::default() }; + let layout = Style { max_size: Size::from_points(1.0, 2.0), ..Default::default() }; assert_eq!(layout.max_main_size(FlexDirection::Row), Dimension::Points(1.0)); assert_eq!(layout.max_main_size(FlexDirection::Column), Dimension::Points(2.0)); } #[test] fn flexbox_layout_main_margin_start() { - let layout = FlexboxLayout { margin: Rect::top_from_points(2.0, 1.0), ..Default::default() }; + let layout = Style { margin: Rect::top_from_points(2.0, 1.0), ..Default::default() }; assert_eq!(layout.main_margin_start(FlexDirection::Row), Dimension::Points(2.0)); assert_eq!(layout.main_margin_start(FlexDirection::Column), Dimension::Points(1.0)); } #[test] fn flexbox_layout_main_margin_end() { - let layout = FlexboxLayout { margin: Rect::bot_from_points(2.0, 1.0), ..Default::default() }; + let layout = Style { margin: Rect::bot_from_points(2.0, 1.0), ..Default::default() }; assert_eq!(layout.main_margin_end(FlexDirection::Row), Dimension::Points(2.0)); assert_eq!(layout.main_margin_end(FlexDirection::Column), Dimension::Points(1.0)); } #[test] fn flexbox_layout_cross_size() { - let layout = FlexboxLayout { size: Size::from_points(1.0, 2.0), ..Default::default() }; + let layout = Style { size: Size::from_points(1.0, 2.0), ..Default::default() }; assert_eq!(layout.cross_size(FlexDirection::Row), Dimension::Points(2.0)); assert_eq!(layout.cross_size(FlexDirection::Column), Dimension::Points(1.0)); } #[test] fn flexbox_layout_min_cross_size() { - let layout = FlexboxLayout { min_size: Size::from_points(1.0, 2.0), ..Default::default() }; + let layout = Style { min_size: Size::from_points(1.0, 2.0), ..Default::default() }; assert_eq!(layout.min_cross_size(FlexDirection::Row), Dimension::Points(2.0)); assert_eq!(layout.min_cross_size(FlexDirection::Column), Dimension::Points(1.0)); } #[test] fn flexbox_layout_max_cross_size() { - let layout = FlexboxLayout { max_size: Size::from_points(1.0, 2.0), ..Default::default() }; + let layout = Style { max_size: Size::from_points(1.0, 2.0), ..Default::default() }; assert_eq!(layout.max_cross_size(FlexDirection::Row), Dimension::Points(2.0)); assert_eq!(layout.max_cross_size(FlexDirection::Column), Dimension::Points(1.0)); } #[test] fn flexbox_layout_cross_margin_start() { - let layout = FlexboxLayout { margin: Rect::top_from_points(2.0, 1.0), ..Default::default() }; + let layout = Style { margin: Rect::top_from_points(2.0, 1.0), ..Default::default() }; assert_eq!(layout.cross_margin_start(FlexDirection::Row), Dimension::Points(1.0)); assert_eq!(layout.cross_margin_start(FlexDirection::Column), Dimension::Points(2.0)); } #[test] fn flexbox_layout_cross_margin_end() { - let layout = FlexboxLayout { margin: Rect::bot_from_points(2.0, 1.0), ..Default::default() }; + let layout = Style { margin: Rect::bot_from_points(2.0, 1.0), ..Default::default() }; assert_eq!(layout.cross_margin_end(FlexDirection::Row), Dimension::Points(1.0)); assert_eq!(layout.cross_margin_end(FlexDirection::Column), Dimension::Points(2.0)); } diff --git a/src/tree.rs b/src/tree.rs index e3abfa3ae..cef20af1a 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -22,8 +22,8 @@ pub trait LayoutTree { // todo: allow abstractions over this so we don't prescribe how layout works // for reference, CSS cascades require context, and storing a full flexbox layout for each node could be inefficient // - /// Get the [`FlexboxLayout`] for this Node. - fn style(&self, node: Node) -> &FlexboxLayout; + /// Get the [`Style`] for this Node. + fn style(&self, node: Node) -> &Style; /// Get the node's output "Final Layout" fn layout(&self, node: Node) -> &Layout; diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center.rs index 5a0c73a00..98a9670a5 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ fn absolute_layout_align_items_and_justify_content_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs index 66e0ecc98..3d7029a99 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -21,7 +21,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { 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 589ac61f6..aff5cae8a 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 @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -18,7 +18,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { 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 7919a5847..5c1db0909 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 @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -18,7 +18,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs index 83882c8c5..354d6d591 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -18,7 +18,7 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs b/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs index 3aa3d51a3..5437bc880 100644 --- a/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs +++ b/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_align_items_center.rs b/tests/generated/absolute_layout_align_items_center.rs index 7cd46568c..9dbd89669 100644 --- a/tests/generated/absolute_layout_align_items_center.rs +++ b/tests/generated/absolute_layout_align_items_center.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ fn absolute_layout_align_items_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), diff --git a/tests/generated/absolute_layout_align_items_center_on_child_only.rs b/tests/generated/absolute_layout_align_items_center_on_child_only.rs index 9839de173..9202dc06f 100644 --- a/tests/generated/absolute_layout_align_items_center_on_child_only.rs +++ b/tests/generated/absolute_layout_align_items_center_on_child_only.rs @@ -3,7 +3,7 @@ fn absolute_layout_align_items_center_on_child_only() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn absolute_layout_align_items_center_on_child_only() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_child_order.rs b/tests/generated/absolute_layout_child_order.rs index 5d7d2c089..8880c472c 100644 --- a/tests/generated/absolute_layout_child_order.rs +++ b/tests/generated/absolute_layout_child_order.rs @@ -3,7 +3,7 @@ fn absolute_layout_child_order() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(40f32), @@ -16,7 +16,7 @@ fn absolute_layout_child_order() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -30,7 +30,7 @@ fn absolute_layout_child_order() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(40f32), @@ -43,7 +43,7 @@ fn absolute_layout_child_order() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs index cd19ddb46..a1bbc224b 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs @@ -3,7 +3,7 @@ fn absolute_layout_in_wrap_reverse_column_container() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn absolute_layout_in_wrap_reverse_column_container() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs index bb59af24d..e0cf89dd4 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs @@ -3,7 +3,7 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs index 7dec0421d..e6cff67ac 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs @@ -3,7 +3,7 @@ fn absolute_layout_in_wrap_reverse_row_container() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn absolute_layout_in_wrap_reverse_row_container() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs index 7d57eb42a..2e0d053bc 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs @@ -3,7 +3,7 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_justify_content_center.rs b/tests/generated/absolute_layout_justify_content_center.rs index ed183d65e..a6f48dbf8 100644 --- a/tests/generated/absolute_layout_justify_content_center.rs +++ b/tests/generated/absolute_layout_justify_content_center.rs @@ -3,7 +3,7 @@ fn absolute_layout_justify_content_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), @@ -17,7 +17,7 @@ fn absolute_layout_justify_content_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), diff --git a/tests/generated/absolute_layout_no_size.rs b/tests/generated/absolute_layout_no_size.rs index 75c41b2a5..a59e52c16 100644 --- a/tests/generated/absolute_layout_no_size.rs +++ b/tests/generated/absolute_layout_no_size.rs @@ -3,13 +3,13 @@ fn absolute_layout_no_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { position_type: taffy::style::PositionType::Absolute, ..Default::default() }, + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs b/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs index b9eaeded6..1e94e04ea 100644 --- a/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs +++ b/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs @@ -3,7 +3,7 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -18,7 +18,7 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -36,7 +36,7 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { @@ -51,7 +51,7 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/absolute_layout_start_top_end_bottom.rs b/tests/generated/absolute_layout_start_top_end_bottom.rs index 5e99c9f2a..e560766e7 100644 --- a/tests/generated/absolute_layout_start_top_end_bottom.rs +++ b/tests/generated/absolute_layout_start_top_end_bottom.rs @@ -3,7 +3,7 @@ fn absolute_layout_start_top_end_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, position: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -19,7 +19,7 @@ fn absolute_layout_start_top_end_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_width_height_end_bottom.rs b/tests/generated/absolute_layout_width_height_end_bottom.rs index 7e4a0dfa0..76a0924bd 100644 --- a/tests/generated/absolute_layout_width_height_end_bottom.rs +++ b/tests/generated/absolute_layout_width_height_end_bottom.rs @@ -3,7 +3,7 @@ fn absolute_layout_width_height_end_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -22,7 +22,7 @@ fn absolute_layout_width_height_end_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_width_height_start_top.rs b/tests/generated/absolute_layout_width_height_start_top.rs index b55a1ee61..90e88669f 100644 --- a/tests/generated/absolute_layout_width_height_start_top.rs +++ b/tests/generated/absolute_layout_width_height_start_top.rs @@ -3,7 +3,7 @@ fn absolute_layout_width_height_start_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -22,7 +22,7 @@ fn absolute_layout_width_height_start_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), 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 868f7e6f2..7c1058829 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 @@ -3,7 +3,7 @@ fn absolute_layout_width_height_start_top_end_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -24,7 +24,7 @@ fn absolute_layout_width_height_start_top_end_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/absolute_layout_within_border.rs b/tests/generated/absolute_layout_within_border.rs index f8a253940..78f8c5a35 100644 --- a/tests/generated/absolute_layout_within_border.rs +++ b/tests/generated/absolute_layout_within_border.rs @@ -3,7 +3,7 @@ fn absolute_layout_within_border() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -22,7 +22,7 @@ fn absolute_layout_within_border() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -41,7 +41,7 @@ fn absolute_layout_within_border() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -67,7 +67,7 @@ fn absolute_layout_within_border() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -93,7 +93,7 @@ fn absolute_layout_within_border() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_baseline.rs b/tests/generated/align_baseline.rs index ffdacfd41..c7a63a436 100644 --- a/tests/generated/align_baseline.rs +++ b/tests/generated/align_baseline.rs @@ -3,7 +3,7 @@ fn align_baseline() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ fn align_baseline() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn align_baseline() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_baseline_child_multiline.rs b/tests/generated/align_baseline_child_multiline.rs index 34135139f..e6f1cf41d 100644 --- a/tests/generated/align_baseline_child_multiline.rs +++ b/tests/generated/align_baseline_child_multiline.rs @@ -3,7 +3,7 @@ fn align_baseline_child_multiline() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node11 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node12 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node13 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() @@ -78,7 +78,7 @@ fn align_baseline_child_multiline() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/align_baseline_nested_child.rs b/tests/generated/align_baseline_nested_child.rs index 917bad407..2ef52b6d7 100644 --- a/tests/generated/align_baseline_nested_child.rs +++ b/tests/generated/align_baseline_nested_child.rs @@ -3,7 +3,7 @@ fn align_baseline_nested_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ fn align_baseline_nested_child() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_baseline_nested_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -43,7 +43,7 @@ fn align_baseline_nested_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_center_should_size_based_on_content.rs b/tests/generated/align_center_should_size_based_on_content.rs index 5921bf990..13a2ce2a7 100644 --- a/tests/generated/align_center_should_size_based_on_content.rs +++ b/tests/generated/align_center_should_size_based_on_content.rs @@ -3,7 +3,7 @@ fn align_center_should_size_based_on_content() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,14 +15,11 @@ fn align_center_should_size_based_on_content() { ) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, flex_grow: 0f32, flex_shrink: 1f32, @@ -33,7 +30,7 @@ fn align_center_should_size_based_on_content() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_content_space_around_single_line.rs b/tests/generated/align_content_space_around_single_line.rs index 0cdcc800c..d4b6d2568 100644 --- a/tests/generated/align_content_space_around_single_line.rs +++ b/tests/generated/align_content_space_around_single_line.rs @@ -3,7 +3,7 @@ fn align_content_space_around_single_line() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_around_single_line() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_content_space_around_wrapped.rs b/tests/generated/align_content_space_around_wrapped.rs index acf9718f5..c5b5fdf69 100644 --- a/tests/generated/align_content_space_around_wrapped.rs +++ b/tests/generated/align_content_space_around_wrapped.rs @@ -3,7 +3,7 @@ fn align_content_space_around_wrapped() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_around_wrapped() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { diff --git a/tests/generated/align_content_space_between_single_line.rs b/tests/generated/align_content_space_between_single_line.rs index 75f846ea4..c2c8804d4 100644 --- a/tests/generated/align_content_space_between_single_line.rs +++ b/tests/generated/align_content_space_between_single_line.rs @@ -3,7 +3,7 @@ fn align_content_space_between_single_line() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_between_single_line() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceBetween, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_content_space_between_wrapped.rs b/tests/generated/align_content_space_between_wrapped.rs index 1b978dd3f..d30813840 100644 --- a/tests/generated/align_content_space_between_wrapped.rs +++ b/tests/generated/align_content_space_between_wrapped.rs @@ -3,7 +3,7 @@ fn align_content_space_between_wrapped() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_between_wrapped() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceBetween, size: taffy::geometry::Size { diff --git a/tests/generated/align_content_space_evenly_single_line.rs b/tests/generated/align_content_space_evenly_single_line.rs index ed6b903b7..9c3f1cfaa 100644 --- a/tests/generated/align_content_space_evenly_single_line.rs +++ b/tests/generated/align_content_space_evenly_single_line.rs @@ -3,7 +3,7 @@ fn align_content_space_evenly_single_line() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_evenly_single_line() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_content: taffy::style::AlignContent::SpaceEvenly, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_content_space_evenly_wrapped.rs b/tests/generated/align_content_space_evenly_wrapped.rs index cb062fcec..6283490d2 100644 --- a/tests/generated/align_content_space_evenly_wrapped.rs +++ b/tests/generated/align_content_space_evenly_wrapped.rs @@ -3,7 +3,7 @@ fn align_content_space_evenly_wrapped() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -29,7 +29,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -42,7 +42,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -55,7 +55,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -68,7 +68,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -81,7 +81,7 @@ fn align_content_space_evenly_wrapped() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceEvenly, size: taffy::geometry::Size { diff --git a/tests/generated/align_flex_start_with_shrinking_children.rs b/tests/generated/align_flex_start_with_shrinking_children.rs index 2e0d9ea98..731929b13 100644 --- a/tests/generated/align_flex_start_with_shrinking_children.rs +++ b/tests/generated/align_flex_start_with_shrinking_children.rs @@ -2,26 +2,20 @@ fn align_flex_start_with_shrinking_children() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs b/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs index 23446b1e4..087f73268 100644 --- a/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs +++ b/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs @@ -2,26 +2,20 @@ fn align_flex_start_with_shrinking_children_with_stretch() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/align_flex_start_with_stretching_children.rs b/tests/generated/align_flex_start_with_stretching_children.rs index 9f2c6ba66..496da8fdd 100644 --- a/tests/generated/align_flex_start_with_stretching_children.rs +++ b/tests/generated/align_flex_start_with_stretching_children.rs @@ -2,21 +2,15 @@ fn align_flex_start_with_stretching_children() { let mut taffy = taffy::Taffy::new(); let node000 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/align_items_center.rs b/tests/generated/align_items_center.rs index 03e85aabe..40e74dc22 100644 --- a/tests/generated/align_items_center.rs +++ b/tests/generated/align_items_center.rs @@ -3,7 +3,7 @@ fn align_items_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_items_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), 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 e16534b94..4bc2b7a20 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 @@ -3,7 +3,7 @@ fn align_items_center_child_with_margin_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,13 +21,13 @@ fn align_items_center_child_with_margin_bigger_than_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::Center, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs index 62cb8d194..5b8cd441a 100644 --- a/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs @@ -3,7 +3,7 @@ fn align_items_center_child_without_margin_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(70f32), @@ -16,13 +16,13 @@ fn align_items_center_child_without_margin_bigger_than_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::Center, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::Center, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/align_items_center_with_child_margin.rs b/tests/generated/align_items_center_with_child_margin.rs index 356d9accc..3dc86233c 100644 --- a/tests/generated/align_items_center_with_child_margin.rs +++ b/tests/generated/align_items_center_with_child_margin.rs @@ -3,7 +3,7 @@ fn align_items_center_with_child_margin() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_items_center_with_child_margin() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_items_center_with_child_top.rs b/tests/generated/align_items_center_with_child_top.rs index 8c7ceac8a..e55868e00 100644 --- a/tests/generated/align_items_center_with_child_top.rs +++ b/tests/generated/align_items_center_with_child_top.rs @@ -3,7 +3,7 @@ fn align_items_center_with_child_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_items_center_with_child_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_items_flex_end.rs b/tests/generated/align_items_flex_end.rs index 1d440e7cc..09eb2891c 100644 --- a/tests/generated/align_items_flex_end.rs +++ b/tests/generated/align_items_flex_end.rs @@ -3,7 +3,7 @@ fn align_items_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_items_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), 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 f242cd130..2975d65f2 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 @@ -3,7 +3,7 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,13 +21,13 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs index fb6bf0f29..b023a1d7f 100644 --- a/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs +++ b/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs @@ -3,7 +3,7 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(70f32), @@ -16,13 +16,13 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/align_items_flex_start.rs b/tests/generated/align_items_flex_start.rs index 81be6d8df..5419717a5 100644 --- a/tests/generated/align_items_flex_start.rs +++ b/tests/generated/align_items_flex_start.rs @@ -3,7 +3,7 @@ fn align_items_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn align_items_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_items_min_max.rs b/tests/generated/align_items_min_max.rs index d7017c02b..c35fe6060 100644 --- a/tests/generated/align_items_min_max.rs +++ b/tests/generated/align_items_min_max.rs @@ -3,7 +3,7 @@ fn align_items_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ fn align_items_min_max() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/align_items_stretch.rs b/tests/generated/align_items_stretch.rs index c0fcfead8..89c78b866 100644 --- a/tests/generated/align_items_stretch.rs +++ b/tests/generated/align_items_stretch.rs @@ -3,7 +3,7 @@ fn align_items_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn align_items_stretch() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_self_baseline.rs b/tests/generated/align_self_baseline.rs index 50538a725..702bf4329 100644 --- a/tests/generated/align_self_baseline.rs +++ b/tests/generated/align_self_baseline.rs @@ -3,7 +3,7 @@ fn align_self_baseline() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn align_self_baseline() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(10f32), @@ -30,7 +30,7 @@ fn align_self_baseline() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Baseline, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -44,7 +44,7 @@ fn align_self_baseline() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_self_center.rs b/tests/generated/align_self_center.rs index 690e85c12..6a705b2a2 100644 --- a/tests/generated/align_self_center.rs +++ b/tests/generated/align_self_center.rs @@ -3,7 +3,7 @@ fn align_self_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_self_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_self_flex_end.rs b/tests/generated/align_self_flex_end.rs index a3dd48b42..ebdb903e7 100644 --- a/tests/generated/align_self_flex_end.rs +++ b/tests/generated/align_self_flex_end.rs @@ -3,7 +3,7 @@ fn align_self_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_self_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_self_flex_end_override_flex_start.rs b/tests/generated/align_self_flex_end_override_flex_start.rs index d3510aa68..992f56086 100644 --- a/tests/generated/align_self_flex_end_override_flex_start.rs +++ b/tests/generated/align_self_flex_end_override_flex_start.rs @@ -3,7 +3,7 @@ fn align_self_flex_end_override_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_self_flex_end_override_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_self_flex_start.rs b/tests/generated/align_self_flex_start.rs index 3845a4852..ad88302a4 100644 --- a/tests/generated/align_self_flex_start.rs +++ b/tests/generated/align_self_flex_start.rs @@ -3,7 +3,7 @@ fn align_self_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::style::AlignSelf::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn align_self_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/align_strech_should_size_based_on_parent.rs b/tests/generated/align_strech_should_size_based_on_parent.rs index 76e39082c..7e693c14f 100644 --- a/tests/generated/align_strech_should_size_based_on_parent.rs +++ b/tests/generated/align_strech_should_size_based_on_parent.rs @@ -3,7 +3,7 @@ fn align_strech_should_size_based_on_parent() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -15,14 +15,11 @@ fn align_strech_should_size_based_on_parent() { ) .unwrap(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[node000], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[node000]) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, flex_grow: 0f32, flex_shrink: 1f32, @@ -33,7 +30,7 @@ fn align_strech_should_size_based_on_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/border_center_child.rs b/tests/generated/border_center_child.rs index 3dd00d752..cefeb2a0c 100644 --- a/tests/generated/border_center_child.rs +++ b/tests/generated/border_center_child.rs @@ -3,7 +3,7 @@ fn border_center_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn border_center_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/border_flex_child.rs b/tests/generated/border_flex_child.rs index 176254f7f..fe7e8b934 100644 --- a/tests/generated/border_flex_child.rs +++ b/tests/generated/border_flex_child.rs @@ -3,7 +3,7 @@ fn border_flex_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn border_flex_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/border_no_child.rs b/tests/generated/border_no_child.rs index 16b4fa7b2..714e6c59d 100644 --- a/tests/generated/border_no_child.rs +++ b/tests/generated/border_no_child.rs @@ -3,7 +3,7 @@ fn border_no_child() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { border: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/border_stretch_child.rs b/tests/generated/border_stretch_child.rs index 84000aa37..f9b2b6890 100644 --- a/tests/generated/border_stretch_child.rs +++ b/tests/generated/border_stretch_child.rs @@ -3,7 +3,7 @@ fn border_stretch_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn border_stretch_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/child_min_max_width_flexing.rs b/tests/generated/child_min_max_width_flexing.rs index 6c43f6722..e10a4c8d4 100644 --- a/tests/generated/child_min_max_width_flexing.rs +++ b/tests/generated/child_min_max_width_flexing.rs @@ -3,7 +3,7 @@ fn child_min_max_width_flexing() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -15,7 +15,7 @@ fn child_min_max_width_flexing() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), @@ -27,7 +27,7 @@ fn child_min_max_width_flexing() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), height: taffy::style::Dimension::Points(50f32), diff --git a/tests/generated/container_with_unsized_child.rs b/tests/generated/container_with_unsized_child.rs index fd8d3da7e..c6cf15a16 100644 --- a/tests/generated/container_with_unsized_child.rs +++ b/tests/generated/container_with_unsized_child.rs @@ -1,10 +1,10 @@ #[test] fn container_with_unsized_child() { let mut taffy = taffy::Taffy::new(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/display_none.rs b/tests/generated/display_none.rs index 54539adbd..3207d6a43 100644 --- a/tests/generated/display_none.rs +++ b/tests/generated/display_none.rs @@ -1,17 +1,16 @@ #[test] fn display_none() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { display: taffy::style::Display::None, flex_grow: 1f32, ..Default::default() }, + taffy::style::Style { display: taffy::style::Display::None, flex_grow: 1f32, ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/display_none_fixed_size.rs b/tests/generated/display_none_fixed_size.rs index 45288ce04..0d83ae4cf 100644 --- a/tests/generated/display_none_fixed_size.rs +++ b/tests/generated/display_none_fixed_size.rs @@ -1,11 +1,10 @@ #[test] fn display_none_fixed_size() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -19,7 +18,7 @@ fn display_none_fixed_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/display_none_with_child.rs b/tests/generated/display_none_with_child.rs index 126c76c04..79afc0ce5 100644 --- a/tests/generated/display_none_with_child.rs +++ b/tests/generated/display_none_with_child.rs @@ -3,7 +3,7 @@ fn display_none_with_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ fn display_none_with_child() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -26,7 +26,7 @@ fn display_none_with_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, @@ -39,7 +39,7 @@ fn display_none_with_child() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -50,7 +50,7 @@ fn display_none_with_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/display_none_with_margin.rs b/tests/generated/display_none_with_margin.rs index 7c9b4e8df..7e93d882f 100644 --- a/tests/generated/display_none_with_margin.rs +++ b/tests/generated/display_none_with_margin.rs @@ -3,7 +3,7 @@ fn display_none_with_margin() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -22,11 +22,10 @@ fn display_none_with_margin() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/display_none_with_position.rs b/tests/generated/display_none_with_position.rs index 937637927..716c7ac46 100644 --- a/tests/generated/display_none_with_position.rs +++ b/tests/generated/display_none_with_position.rs @@ -1,11 +1,10 @@ #[test] fn display_none_with_position() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { display: taffy::style::Display::None, flex_grow: 1f32, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, @@ -16,7 +15,7 @@ fn display_none_with_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs b/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs index 14a4d679c..89aaf5870 100644 --- a/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs +++ b/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs @@ -3,7 +3,7 @@ fn flex_basis_and_main_dimen_set_when_flexing() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn flex_basis_and_main_dimen_set_when_flexing() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { @@ -33,7 +33,7 @@ fn flex_basis_and_main_dimen_set_when_flexing() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_flex_grow_column.rs b/tests/generated/flex_basis_flex_grow_column.rs index c14450946..4225248ed 100644 --- a/tests/generated/flex_basis_flex_grow_column.rs +++ b/tests/generated/flex_basis_flex_grow_column.rs @@ -3,7 +3,7 @@ fn flex_basis_flex_grow_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -11,11 +11,10 @@ fn flex_basis_flex_grow_column() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_flex_grow_row.rs b/tests/generated/flex_basis_flex_grow_row.rs index 1838dafca..a3d10e19d 100644 --- a/tests/generated/flex_basis_flex_grow_row.rs +++ b/tests/generated/flex_basis_flex_grow_row.rs @@ -3,7 +3,7 @@ fn flex_basis_flex_grow_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -11,11 +11,10 @@ fn flex_basis_flex_grow_row() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_flex_shrink_column.rs b/tests/generated/flex_basis_flex_shrink_column.rs index 8fa6b7d44..c86e05817 100644 --- a/tests/generated/flex_basis_flex_shrink_column.rs +++ b/tests/generated/flex_basis_flex_shrink_column.rs @@ -3,19 +3,19 @@ fn flex_basis_flex_shrink_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, &[], ) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_flex_shrink_row.rs b/tests/generated/flex_basis_flex_shrink_row.rs index 20b46fa22..aac1109eb 100644 --- a/tests/generated/flex_basis_flex_shrink_row.rs +++ b/tests/generated/flex_basis_flex_shrink_row.rs @@ -3,19 +3,19 @@ fn flex_basis_flex_shrink_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }, &[], ) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_larger_than_content_column.rs b/tests/generated/flex_basis_larger_than_content_column.rs index d01ca3f8d..10bf609a4 100644 --- a/tests/generated/flex_basis_larger_than_content_column.rs +++ b/tests/generated/flex_basis_larger_than_content_column.rs @@ -3,7 +3,7 @@ fn flex_basis_larger_than_content_column() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn flex_basis_larger_than_content_column() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -26,7 +26,7 @@ fn flex_basis_larger_than_content_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_larger_than_content_row.rs b/tests/generated/flex_basis_larger_than_content_row.rs index b2de58158..9a1abeda5 100644 --- a/tests/generated/flex_basis_larger_than_content_row.rs +++ b/tests/generated/flex_basis_larger_than_content_row.rs @@ -3,7 +3,7 @@ fn flex_basis_larger_than_content_row() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_larger_than_content_row() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -26,7 +26,7 @@ fn flex_basis_larger_than_content_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_overrides_main_size.rs b/tests/generated/flex_basis_overrides_main_size.rs index 7a65055da..e2993a256 100644 --- a/tests/generated/flex_basis_overrides_main_size.rs +++ b/tests/generated/flex_basis_overrides_main_size.rs @@ -3,7 +3,7 @@ fn flex_basis_overrides_main_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn flex_basis_overrides_main_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn flex_basis_overrides_main_size() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn flex_basis_overrides_main_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs index 727d76064..7b07c868e 100644 --- a/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs @@ -3,7 +3,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(60f32), @@ -27,7 +27,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -51,7 +51,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_smaller_than_content_column.rs b/tests/generated/flex_basis_smaller_than_content_column.rs index 163db2e47..4ffc91b85 100644 --- a/tests/generated/flex_basis_smaller_than_content_column.rs +++ b/tests/generated/flex_basis_smaller_than_content_column.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_than_content_column() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_than_content_column() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -26,7 +26,7 @@ fn flex_basis_smaller_than_content_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_smaller_than_content_row.rs b/tests/generated/flex_basis_smaller_than_content_row.rs index e1850c6a4..0bfe49c67 100644 --- a/tests/generated/flex_basis_smaller_than_content_row.rs +++ b/tests/generated/flex_basis_smaller_than_content_row.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_than_content_row() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_than_content_row() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() @@ -26,7 +26,7 @@ fn flex_basis_smaller_than_content_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs index 8bc4c2aef..fb1692acb 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_than_main_dimen_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn flex_basis_smaller_than_main_dimen_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs index afac6532c..e7afa021e 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_than_main_dimen_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(10f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn flex_basis_smaller_than_main_dimen_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs index abf5a2086..891791cb7 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -27,7 +27,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -51,7 +51,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs index c9dccd957..dc7276739 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -27,7 +27,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -51,7 +51,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs index cea30f911..331399ad7 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -27,7 +27,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -49,7 +49,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { &[node10], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0, node1]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0, node1]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 90f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs index 8ecbdd1ec..455adf3b7 100644 --- a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_very_large_size.rs @@ -3,7 +3,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -27,7 +27,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -51,7 +51,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_basis_unconstraint_column.rs b/tests/generated/flex_basis_unconstraint_column.rs index 894c9fd89..368c91fda 100644 --- a/tests/generated/flex_basis_unconstraint_column.rs +++ b/tests/generated/flex_basis_unconstraint_column.rs @@ -3,7 +3,7 @@ fn flex_basis_unconstraint_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn flex_basis_unconstraint_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0], ) .unwrap(); diff --git a/tests/generated/flex_basis_unconstraint_row.rs b/tests/generated/flex_basis_unconstraint_row.rs index 9292ddf98..8aebef00a 100644 --- a/tests/generated/flex_basis_unconstraint_row.rs +++ b/tests/generated/flex_basis_unconstraint_row.rs @@ -3,7 +3,7 @@ fn flex_basis_unconstraint_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -11,7 +11,7 @@ fn flex_basis_unconstraint_row() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 0f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/flex_direction_column.rs b/tests/generated/flex_direction_column.rs index 76d0ff16b..c84a50d3c 100644 --- a/tests/generated/flex_direction_column.rs +++ b/tests/generated/flex_direction_column.rs @@ -3,7 +3,7 @@ fn flex_direction_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_column() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_direction_column_no_height.rs b/tests/generated/flex_direction_column_no_height.rs index ec3ba0342..ff0edb7bc 100644 --- a/tests/generated/flex_direction_column_no_height.rs +++ b/tests/generated/flex_direction_column_no_height.rs @@ -3,7 +3,7 @@ fn flex_direction_column_no_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_column_no_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_column_no_height() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_column_no_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_direction_column_reverse.rs b/tests/generated/flex_direction_column_reverse.rs index cb429e2ea..0bd7d7b78 100644 --- a/tests/generated/flex_direction_column_reverse.rs +++ b/tests/generated/flex_direction_column_reverse.rs @@ -3,7 +3,7 @@ fn flex_direction_column_reverse() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_column_reverse() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_column_reverse() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_column_reverse() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::ColumnReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_direction_row.rs b/tests/generated/flex_direction_row.rs index 96697c9e0..0ea1ef7bc 100644 --- a/tests/generated/flex_direction_row.rs +++ b/tests/generated/flex_direction_row.rs @@ -3,7 +3,7 @@ fn flex_direction_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_row() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_direction_row_no_width.rs b/tests/generated/flex_direction_row_no_width.rs index de4ee8616..8f39d7bda 100644 --- a/tests/generated/flex_direction_row_no_width.rs +++ b/tests/generated/flex_direction_row_no_width.rs @@ -3,7 +3,7 @@ fn flex_direction_row_no_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_row_no_width() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_row_no_width() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_row_no_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_direction_row_reverse.rs b/tests/generated/flex_direction_row_reverse.rs index 5f5e482bb..6accc505b 100644 --- a/tests/generated/flex_direction_row_reverse.rs +++ b/tests/generated/flex_direction_row_reverse.rs @@ -3,7 +3,7 @@ fn flex_direction_row_reverse() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_direction_row_reverse() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_direction_row_reverse() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn flex_direction_row_reverse() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::RowReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_child.rs b/tests/generated/flex_grow_child.rs index 3ee325f47..0240f803b 100644 --- a/tests/generated/flex_grow_child.rs +++ b/tests/generated/flex_grow_child.rs @@ -3,7 +3,7 @@ fn flex_grow_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_grow_child() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 0f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/flex_grow_flex_basis_percent_min_max.rs b/tests/generated/flex_grow_flex_basis_percent_min_max.rs index 726ae1a80..a307e7e56 100644 --- a/tests/generated/flex_grow_flex_basis_percent_min_max.rs +++ b/tests/generated/flex_grow_flex_basis_percent_min_max.rs @@ -3,7 +3,7 @@ fn flex_grow_flex_basis_percent_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(0f32), @@ -16,7 +16,7 @@ fn flex_grow_flex_basis_percent_min_max() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), @@ -33,7 +33,7 @@ fn flex_grow_flex_basis_percent_min_max() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_grow_height_maximized.rs b/tests/generated/flex_grow_height_maximized.rs index 521081205..bd5a0c0c4 100644 --- a/tests/generated/flex_grow_height_maximized.rs +++ b/tests/generated/flex_grow_height_maximized.rs @@ -3,7 +3,7 @@ fn flex_grow_height_maximized() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_height_maximized() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -22,7 +22,7 @@ fn flex_grow_height_maximized() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, min_size: taffy::geometry::Size { @@ -40,7 +40,7 @@ fn flex_grow_height_maximized() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_in_at_most_container.rs b/tests/generated/flex_grow_in_at_most_container.rs index 54617f5e3..53e7e42e0 100644 --- a/tests/generated/flex_grow_in_at_most_container.rs +++ b/tests/generated/flex_grow_in_at_most_container.rs @@ -3,7 +3,7 @@ fn flex_grow_in_at_most_container() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0f32), ..Default::default() @@ -11,10 +11,10 @@ fn flex_grow_in_at_most_container() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_less_than_factor_one.rs b/tests/generated/flex_grow_less_than_factor_one.rs index 499a673ca..a020a35eb 100644 --- a/tests/generated/flex_grow_less_than_factor_one.rs +++ b/tests/generated/flex_grow_less_than_factor_one.rs @@ -3,7 +3,7 @@ fn flex_grow_less_than_factor_one() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0.2f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Points(40f32), @@ -13,20 +13,14 @@ fn flex_grow_less_than_factor_one() { ) .unwrap(); let node1 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 0.2f32, flex_shrink: 0f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 0.2f32, flex_shrink: 0f32, ..Default::default() }, &[]) .unwrap(); let node2 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 0.4f32, flex_shrink: 0f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 0.4f32, flex_shrink: 0f32, ..Default::default() }, &[]) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/flex_grow_root_minimized.rs b/tests/generated/flex_grow_root_minimized.rs index b341cb3b9..22e4a4f43 100644 --- a/tests/generated/flex_grow_root_minimized.rs +++ b/tests/generated/flex_grow_root_minimized.rs @@ -3,7 +3,7 @@ fn flex_grow_root_minimized() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_root_minimized() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -22,7 +22,7 @@ fn flex_grow_root_minimized() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, min_size: taffy::geometry::Size { @@ -40,7 +40,7 @@ fn flex_grow_root_minimized() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/tests/generated/flex_grow_shrink_at_most.rs b/tests/generated/flex_grow_shrink_at_most.rs index c855bd226..2294090bc 100644 --- a/tests/generated/flex_grow_shrink_at_most.rs +++ b/tests/generated/flex_grow_shrink_at_most.rs @@ -2,15 +2,12 @@ fn flex_grow_shrink_at_most() { let mut taffy = taffy::Taffy::new(); let node00 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_to_min.rs b/tests/generated/flex_grow_to_min.rs index e403c6f0e..a38cf2c7c 100644 --- a/tests/generated/flex_grow_to_min.rs +++ b/tests/generated/flex_grow_to_min.rs @@ -2,14 +2,11 @@ fn flex_grow_to_min() { let mut taffy = taffy::Taffy::new(); let node0 = taffy - .new_with_children( - taffy::style::FlexboxLayout { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, - &[], - ) + .new_with_children(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }, &[]) .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -18,7 +15,7 @@ fn flex_grow_to_min() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/tests/generated/flex_grow_within_constrained_max_column.rs b/tests/generated/flex_grow_within_constrained_max_column.rs index d41a26c8b..e07dc4ccf 100644 --- a/tests/generated/flex_grow_within_constrained_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_max_column.rs @@ -3,7 +3,7 @@ fn flex_grow_within_constrained_max_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_within_constrained_max_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -22,7 +22,7 @@ fn flex_grow_within_constrained_max_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { diff --git a/tests/generated/flex_grow_within_constrained_max_row.rs b/tests/generated/flex_grow_within_constrained_max_row.rs index 43bbd0adf..b2bf6fdab 100644 --- a/tests/generated/flex_grow_within_constrained_max_row.rs +++ b/tests/generated/flex_grow_within_constrained_max_row.rs @@ -3,7 +3,7 @@ fn flex_grow_within_constrained_max_row() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_within_constrained_max_row() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -22,7 +22,7 @@ fn flex_grow_within_constrained_max_row() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -35,7 +35,7 @@ fn flex_grow_within_constrained_max_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_grow_within_constrained_max_width.rs b/tests/generated/flex_grow_within_constrained_max_width.rs index 44ed7242c..e3ae53a44 100644 --- a/tests/generated/flex_grow_within_constrained_max_width.rs +++ b/tests/generated/flex_grow_within_constrained_max_width.rs @@ -3,7 +3,7 @@ fn flex_grow_within_constrained_max_width() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_within_constrained_max_width() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() @@ -25,7 +25,7 @@ fn flex_grow_within_constrained_max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/flex_grow_within_constrained_min_column.rs b/tests/generated/flex_grow_within_constrained_min_column.rs index 300d2fcea..67d87805e 100644 --- a/tests/generated/flex_grow_within_constrained_min_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_column.rs @@ -1,11 +1,10 @@ #[test] fn flex_grow_within_constrained_min_column() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -14,7 +13,7 @@ fn flex_grow_within_constrained_min_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_within_constrained_min_max_column.rs b/tests/generated/flex_grow_within_constrained_min_max_column.rs index b81186f8d..7fe5a193d 100644 --- a/tests/generated/flex_grow_within_constrained_min_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_max_column.rs @@ -1,11 +1,10 @@ #[test] fn flex_grow_within_constrained_min_max_column() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -14,7 +13,7 @@ fn flex_grow_within_constrained_min_max_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() diff --git a/tests/generated/flex_grow_within_constrained_min_row.rs b/tests/generated/flex_grow_within_constrained_min_row.rs index c7271287f..fcf497253 100644 --- a/tests/generated/flex_grow_within_constrained_min_row.rs +++ b/tests/generated/flex_grow_within_constrained_min_row.rs @@ -1,11 +1,10 @@ #[test] fn flex_grow_within_constrained_min_row() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -14,7 +13,7 @@ fn flex_grow_within_constrained_min_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/flex_grow_within_max_width.rs b/tests/generated/flex_grow_within_max_width.rs index 6b72c9ae5..d3b892060 100644 --- a/tests/generated/flex_grow_within_max_width.rs +++ b/tests/generated/flex_grow_within_max_width.rs @@ -3,7 +3,7 @@ fn flex_grow_within_max_width() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn flex_grow_within_max_width() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -25,7 +25,7 @@ fn flex_grow_within_max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/flex_root_ignored.rs b/tests/generated/flex_root_ignored.rs index 28babe408..27cdc61ba 100644 --- a/tests/generated/flex_root_ignored.rs +++ b/tests/generated/flex_root_ignored.rs @@ -3,7 +3,7 @@ fn flex_root_ignored() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(200f32), ..Default::default() @@ -13,7 +13,7 @@ fn flex_root_ignored() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -22,7 +22,7 @@ fn flex_root_ignored() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, min_size: taffy::geometry::Size { diff --git a/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs b/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs index 680f1e77a..438392f67 100644 --- a/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs +++ b/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs @@ -3,7 +3,7 @@ fn flex_shrink_by_outer_margin_with_max_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn flex_shrink_by_outer_margin_with_max_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { diff --git a/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs b/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs index 548cd24ed..f2f26ab9c 100644 --- a/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs +++ b/tests/generated/flex_shrink_flex_grow_child_flex_shrink_other_child.rs @@ -3,7 +3,7 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -33,7 +33,7 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/flex_shrink_flex_grow_row.rs b/tests/generated/flex_shrink_flex_grow_row.rs index 038f50e37..adcdf52ca 100644 --- a/tests/generated/flex_shrink_flex_grow_row.rs +++ b/tests/generated/flex_shrink_flex_grow_row.rs @@ -3,7 +3,7 @@ fn flex_shrink_flex_grow_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -18,7 +18,7 @@ fn flex_shrink_flex_grow_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { @@ -33,7 +33,7 @@ fn flex_shrink_flex_grow_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/flex_shrink_to_zero.rs b/tests/generated/flex_shrink_to_zero.rs index 01b45b241..be2a72f10 100644 --- a/tests/generated/flex_shrink_to_zero.rs +++ b/tests/generated/flex_shrink_to_zero.rs @@ -3,7 +3,7 @@ fn flex_shrink_to_zero() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn flex_shrink_to_zero() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -31,7 +31,7 @@ fn flex_shrink_to_zero() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -45,7 +45,7 @@ fn flex_shrink_to_zero() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(75f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs index b1ce99d2c..3916ee095 100644 --- a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs +++ b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs @@ -3,7 +3,7 @@ fn flex_wrap_align_stretch_fits_one_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn flex_wrap_align_stretch_fits_one_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn flex_wrap_align_stretch_fits_one_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), diff --git a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs index 208cde305..5a61bdd4a 100644 --- a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs +++ b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs @@ -3,7 +3,7 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), ..Default::default() }, @@ -25,7 +25,7 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/flex_wrap_wrap_to_child_height.rs b/tests/generated/flex_wrap_wrap_to_child_height.rs index 1df0f4ec2..b496f3c7f 100644 --- a/tests/generated/flex_wrap_wrap_to_child_height.rs +++ b/tests/generated/flex_wrap_wrap_to_child_height.rs @@ -3,7 +3,7 @@ fn flex_wrap_wrap_to_child_height() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn flex_wrap_wrap_to_child_height() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() @@ -26,7 +26,7 @@ fn flex_wrap_wrap_to_child_height() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() @@ -36,7 +36,7 @@ fn flex_wrap_wrap_to_child_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -49,7 +49,7 @@ fn flex_wrap_wrap_to_child_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0, node1], ) .unwrap(); diff --git a/tests/generated/gap_column_gap_child_margins.rs b/tests/generated/gap_column_gap_child_margins.rs index dfa78096f..388eb9ffe 100644 --- a/tests/generated/gap_column_gap_child_margins.rs +++ b/tests/generated/gap_column_gap_child_margins.rs @@ -3,7 +3,7 @@ fn gap_column_gap_child_margins() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -19,7 +19,7 @@ fn gap_column_gap_child_margins() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -35,7 +35,7 @@ fn gap_column_gap_child_margins() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -51,7 +51,7 @@ fn gap_column_gap_child_margins() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/tests/generated/gap_column_gap_flexible.rs b/tests/generated/gap_column_gap_flexible.rs index 20c054ad5..5c6b144ac 100644 --- a/tests/generated/gap_column_gap_flexible.rs +++ b/tests/generated/gap_column_gap_flexible.rs @@ -3,7 +3,7 @@ fn gap_column_gap_flexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ fn gap_column_gap_flexible() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -25,7 +25,7 @@ fn gap_column_gap_flexible() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -36,7 +36,7 @@ fn gap_column_gap_flexible() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(20f32), diff --git a/tests/generated/gap_column_gap_flexible_undefined_parent.rs b/tests/generated/gap_column_gap_flexible_undefined_parent.rs index cbb13a4ce..2ee351b94 100644 --- a/tests/generated/gap_column_gap_flexible_undefined_parent.rs +++ b/tests/generated/gap_column_gap_flexible_undefined_parent.rs @@ -3,7 +3,7 @@ fn gap_column_gap_flexible_undefined_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ fn gap_column_gap_flexible_undefined_parent() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -25,7 +25,7 @@ fn gap_column_gap_flexible_undefined_parent() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -36,7 +36,7 @@ fn gap_column_gap_flexible_undefined_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(20f32), diff --git a/tests/generated/gap_column_gap_inflexible.rs b/tests/generated/gap_column_gap_inflexible.rs index 6a563cc6a..8a404f670 100644 --- a/tests/generated/gap_column_gap_inflexible.rs +++ b/tests/generated/gap_column_gap_inflexible.rs @@ -3,7 +3,7 @@ fn gap_column_gap_inflexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_inflexible() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_inflexible() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_inflexible() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/tests/generated/gap_column_gap_inflexible_undefined_parent.rs b/tests/generated/gap_column_gap_inflexible_undefined_parent.rs index 0cf432d1d..a8ba17947 100644 --- a/tests/generated/gap_column_gap_inflexible_undefined_parent.rs +++ b/tests/generated/gap_column_gap_inflexible_undefined_parent.rs @@ -3,7 +3,7 @@ fn gap_column_gap_inflexible_undefined_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_inflexible_undefined_parent() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_inflexible_undefined_parent() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_inflexible_undefined_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/gap_column_gap_justify_center.rs b/tests/generated/gap_column_gap_justify_center.rs index 37ea4edf4..9304b34f7 100644 --- a/tests/generated/gap_column_gap_justify_center.rs +++ b/tests/generated/gap_column_gap_justify_center.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_justify_flex_end.rs b/tests/generated/gap_column_gap_justify_flex_end.rs index 855bacc8a..cc505c59f 100644 --- a/tests/generated/gap_column_gap_justify_flex_end.rs +++ b/tests/generated/gap_column_gap_justify_flex_end.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_flex_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_flex_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_justify_flex_start.rs b/tests/generated/gap_column_gap_justify_flex_start.rs index 835ef17bb..bf9729d05 100644 --- a/tests/generated/gap_column_gap_justify_flex_start.rs +++ b/tests/generated/gap_column_gap_justify_flex_start.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_flex_start() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_flex_start() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/gap_column_gap_justify_space_around.rs b/tests/generated/gap_column_gap_justify_space_around.rs index ab22c4f9c..82f79c5e0 100644 --- a/tests/generated/gap_column_gap_justify_space_around.rs +++ b/tests/generated/gap_column_gap_justify_space_around.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_space_around() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_space_around() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_space_around() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceAround, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_justify_space_between.rs b/tests/generated/gap_column_gap_justify_space_between.rs index e365c2cdf..91ae5ce00 100644 --- a/tests/generated/gap_column_gap_justify_space_between.rs +++ b/tests/generated/gap_column_gap_justify_space_between.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_space_between() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_space_between() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_space_between() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceBetween, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_justify_space_evenly.rs b/tests/generated/gap_column_gap_justify_space_evenly.rs index a937128c6..3e9d561de 100644 --- a/tests/generated/gap_column_gap_justify_space_evenly.rs +++ b/tests/generated/gap_column_gap_justify_space_evenly.rs @@ -3,7 +3,7 @@ fn gap_column_gap_justify_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_justify_space_evenly() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_justify_space_evenly() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_justify_space_evenly() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceEvenly, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_mixed_flexible.rs b/tests/generated/gap_column_gap_mixed_flexible.rs index b67fe9ed1..c28537692 100644 --- a/tests/generated/gap_column_gap_mixed_flexible.rs +++ b/tests/generated/gap_column_gap_mixed_flexible.rs @@ -3,7 +3,7 @@ fn gap_column_gap_mixed_flexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_mixed_flexible() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -23,7 +23,7 @@ fn gap_column_gap_mixed_flexible() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -32,7 +32,7 @@ fn gap_column_gap_mixed_flexible() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), diff --git a/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs b/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs index 70389ebbf..1297a5869 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs @@ -3,7 +3,7 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -30,7 +30,7 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -44,7 +44,7 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs b/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs index cfc20adec..1a87ebc85 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs @@ -3,7 +3,7 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -16,7 +16,7 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -29,7 +29,7 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(40f32), @@ -42,7 +42,7 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs b/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs index ff69fe5bb..62fcdceee 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs @@ -3,7 +3,7 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -31,7 +31,7 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), @@ -45,7 +45,7 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_percentage_flexible.rs b/tests/generated/gap_column_gap_percentage_flexible.rs index d89d81c6f..db34d50e3 100644 --- a/tests/generated/gap_column_gap_percentage_flexible.rs +++ b/tests/generated/gap_column_gap_percentage_flexible.rs @@ -3,7 +3,7 @@ fn gap_column_gap_percentage_flexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -14,7 +14,7 @@ fn gap_column_gap_percentage_flexible() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -25,7 +25,7 @@ fn gap_column_gap_percentage_flexible() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -36,7 +36,7 @@ fn gap_column_gap_percentage_flexible() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.1f32), height: taffy::style::Dimension::Points(20f32), diff --git a/tests/generated/gap_column_gap_percentage_inflexible.rs b/tests/generated/gap_column_gap_percentage_inflexible.rs index 3a3332688..8d2c64181 100644 --- a/tests/generated/gap_column_gap_percentage_inflexible.rs +++ b/tests/generated/gap_column_gap_percentage_inflexible.rs @@ -3,7 +3,7 @@ fn gap_column_gap_percentage_inflexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_column_gap_percentage_inflexible() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_column_gap_percentage_inflexible() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_column_gap_percentage_inflexible() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.2f32), ..Default::default() }, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/gap_column_gap_wrap_align_center.rs b/tests/generated/gap_column_gap_wrap_align_center.rs index 48335cd16..d83fa4a5f 100644 --- a/tests/generated/gap_column_gap_wrap_align_center.rs +++ b/tests/generated/gap_column_gap_wrap_align_center.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_gap_wrap_align_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::Center, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_wrap_align_flex_end.rs b/tests/generated/gap_column_gap_wrap_align_flex_end.rs index 284eab40c..89eccd8de 100644 --- a/tests/generated/gap_column_gap_wrap_align_flex_end.rs +++ b/tests/generated/gap_column_gap_wrap_align_flex_end.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_gap_wrap_align_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::FlexEnd, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_wrap_align_flex_start.rs b/tests/generated/gap_column_gap_wrap_align_flex_start.rs index 95e04e9ca..ad2ea92d0 100644 --- a/tests/generated/gap_column_gap_wrap_align_flex_start.rs +++ b/tests/generated/gap_column_gap_wrap_align_flex_start.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_gap_wrap_align_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::FlexStart, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_wrap_align_space_around.rs b/tests/generated/gap_column_gap_wrap_align_space_around.rs index 250ecfafc..55a58bbeb 100644 --- a/tests/generated/gap_column_gap_wrap_align_space_around.rs +++ b/tests/generated/gap_column_gap_wrap_align_space_around.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_gap_wrap_align_space_around() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceAround, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_wrap_align_space_between.rs b/tests/generated/gap_column_gap_wrap_align_space_between.rs index 5311320e2..2f354473a 100644 --- a/tests/generated/gap_column_gap_wrap_align_space_between.rs +++ b/tests/generated/gap_column_gap_wrap_align_space_between.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_gap_wrap_align_space_between() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: taffy::style::AlignContent::SpaceBetween, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_column_gap_wrap_align_stretch.rs b/tests/generated/gap_column_gap_wrap_align_stretch.rs index 2db5d8769..be1b3ca9c 100644 --- a/tests/generated/gap_column_gap_wrap_align_stretch.rs +++ b/tests/generated/gap_column_gap_wrap_align_stretch.rs @@ -3,7 +3,7 @@ fn gap_column_gap_wrap_align_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn gap_column_gap_wrap_align_stretch() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ fn gap_column_gap_wrap_align_stretch() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -33,7 +33,7 @@ fn gap_column_gap_wrap_align_stretch() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -43,7 +43,7 @@ fn gap_column_gap_wrap_align_stretch() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -53,7 +53,7 @@ fn gap_column_gap_wrap_align_stretch() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(5f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_column_row_gap_wrapping.rs b/tests/generated/gap_column_row_gap_wrapping.rs index c5868f95e..35293ce61 100644 --- a/tests/generated/gap_column_row_gap_wrapping.rs +++ b/tests/generated/gap_column_row_gap_wrapping.rs @@ -3,7 +3,7 @@ fn gap_column_row_gap_wrapping() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node6 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -94,7 +94,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node7 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -107,7 +107,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node8 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -120,7 +120,7 @@ fn gap_column_row_gap_wrapping() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/gap_percentage_row_gap_wrapping.rs b/tests/generated/gap_percentage_row_gap_wrapping.rs index 2ea1a9b3f..954f7e107 100644 --- a/tests/generated/gap_percentage_row_gap_wrapping.rs +++ b/tests/generated/gap_percentage_row_gap_wrapping.rs @@ -3,7 +3,7 @@ fn gap_percentage_row_gap_wrapping() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -16,7 +16,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -42,7 +42,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -55,7 +55,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -68,7 +68,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -81,7 +81,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node6 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -94,7 +94,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node7 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -107,7 +107,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node8 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -120,7 +120,7 @@ fn gap_percentage_row_gap_wrapping() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/gap_row_gap_align_items_end.rs b/tests/generated/gap_row_gap_align_items_end.rs index 210f60ab7..af22edb55 100644 --- a/tests/generated/gap_row_gap_align_items_end.rs +++ b/tests/generated/gap_row_gap_align_items_end.rs @@ -3,7 +3,7 @@ fn gap_row_gap_align_items_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -39,7 +39,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -48,7 +48,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -57,7 +57,7 @@ fn gap_row_gap_align_items_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, gap: taffy::geometry::Size { diff --git a/tests/generated/gap_row_gap_align_items_stretch.rs b/tests/generated/gap_row_gap_align_items_stretch.rs index a0846571b..b0c16545f 100644 --- a/tests/generated/gap_row_gap_align_items_stretch.rs +++ b/tests/generated/gap_row_gap_align_items_stretch.rs @@ -3,7 +3,7 @@ fn gap_row_gap_align_items_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -39,7 +39,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -48,7 +48,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node5 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), ..Default::default() }, ..Default::default() }, @@ -57,7 +57,7 @@ fn gap_row_gap_align_items_stretch() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/gap_row_gap_column_child_margins.rs b/tests/generated/gap_row_gap_column_child_margins.rs index 1c32592e7..16df50694 100644 --- a/tests/generated/gap_row_gap_column_child_margins.rs +++ b/tests/generated/gap_row_gap_column_child_margins.rs @@ -3,7 +3,7 @@ fn gap_row_gap_column_child_margins() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -19,7 +19,7 @@ fn gap_row_gap_column_child_margins() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -35,7 +35,7 @@ fn gap_row_gap_column_child_margins() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -51,7 +51,7 @@ fn gap_row_gap_column_child_margins() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, gap: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/gap_row_gap_row_wrap_child_margins.rs b/tests/generated/gap_row_gap_row_wrap_child_margins.rs index 3d796f606..34363cd26 100644 --- a/tests/generated/gap_row_gap_row_wrap_child_margins.rs +++ b/tests/generated/gap_row_gap_row_wrap_child_margins.rs @@ -3,7 +3,7 @@ fn gap_row_gap_row_wrap_child_margins() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(2f32), @@ -17,7 +17,7 @@ fn gap_row_gap_row_wrap_child_margins() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -31,7 +31,7 @@ fn gap_row_gap_row_wrap_child_margins() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), @@ -45,7 +45,7 @@ fn gap_row_gap_row_wrap_child_margins() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_center.rs b/tests/generated/justify_content_column_center.rs index ee9a6c517..7b883f0f3 100644 --- a/tests/generated/justify_content_column_center.rs +++ b/tests/generated/justify_content_column_center.rs @@ -3,7 +3,7 @@ fn justify_content_column_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_flex_end.rs b/tests/generated/justify_content_column_flex_end.rs index 87bc20b46..b3cc9be34 100644 --- a/tests/generated/justify_content_column_flex_end.rs +++ b/tests/generated/justify_content_column_flex_end.rs @@ -3,7 +3,7 @@ fn justify_content_column_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_flex_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_flex_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_flex_start.rs b/tests/generated/justify_content_column_flex_start.rs index 35bc060ee..3b132c8b7 100644 --- a/tests/generated/justify_content_column_flex_start.rs +++ b/tests/generated/justify_content_column_flex_start.rs @@ -3,7 +3,7 @@ fn justify_content_column_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_flex_start() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_flex_start() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/justify_content_column_min_height_and_margin_bottom.rs b/tests/generated/justify_content_column_min_height_and_margin_bottom.rs index a9898aa6a..4830d330a 100644 --- a/tests/generated/justify_content_column_min_height_and_margin_bottom.rs +++ b/tests/generated/justify_content_column_min_height_and_margin_bottom.rs @@ -3,7 +3,7 @@ fn justify_content_column_min_height_and_margin_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn justify_content_column_min_height_and_margin_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_min_height_and_margin_top.rs b/tests/generated/justify_content_column_min_height_and_margin_top.rs index 25d87c157..421918b97 100644 --- a/tests/generated/justify_content_column_min_height_and_margin_top.rs +++ b/tests/generated/justify_content_column_min_height_and_margin_top.rs @@ -3,7 +3,7 @@ fn justify_content_column_min_height_and_margin_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn justify_content_column_min_height_and_margin_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_space_around.rs b/tests/generated/justify_content_column_space_around.rs index 8d525b8e3..2089bd38d 100644 --- a/tests/generated/justify_content_column_space_around.rs +++ b/tests/generated/justify_content_column_space_around.rs @@ -3,7 +3,7 @@ fn justify_content_column_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_space_around() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_space_around() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_space_around() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_space_between.rs b/tests/generated/justify_content_column_space_between.rs index a418f2476..abea126ea 100644 --- a/tests/generated/justify_content_column_space_between.rs +++ b/tests/generated/justify_content_column_space_between.rs @@ -3,7 +3,7 @@ fn justify_content_column_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_space_between() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_space_between() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_space_between() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_column_space_evenly.rs b/tests/generated/justify_content_column_space_evenly.rs index 44439a9ce..34f4f447a 100644 --- a/tests/generated/justify_content_column_space_evenly.rs +++ b/tests/generated/justify_content_column_space_evenly.rs @@ -3,7 +3,7 @@ fn justify_content_column_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_column_space_evenly() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_column_space_evenly() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_column_space_evenly() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_min_max.rs b/tests/generated/justify_content_min_max.rs index 313e292e3..187b67119 100644 --- a/tests/generated/justify_content_min_max.rs +++ b/tests/generated/justify_content_min_max.rs @@ -3,7 +3,7 @@ fn justify_content_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: taffy::style::Dimension::Points(60f32), @@ -16,7 +16,7 @@ fn justify_content_min_max() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs b/tests/generated/justify_content_min_width_with_padding_child_width_greater_than_parent.rs index 3e1044832..fe4fd1903 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 @@ -3,7 +3,7 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), @@ -32,10 +32,10 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { &[node000], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(1000f32), 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 c756ccfb8..3a6973faa 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 @@ -3,7 +3,7 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(199f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), @@ -32,10 +32,10 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { &[node000], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(1080f32), diff --git a/tests/generated/justify_content_overflow_min_max.rs b/tests/generated/justify_content_overflow_min_max.rs index 2a842f45f..e98a59729 100644 --- a/tests/generated/justify_content_overflow_min_max.rs +++ b/tests/generated/justify_content_overflow_min_max.rs @@ -3,7 +3,7 @@ fn justify_content_overflow_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn justify_content_overflow_min_max() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -31,7 +31,7 @@ fn justify_content_overflow_min_max() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), @@ -45,7 +45,7 @@ fn justify_content_overflow_min_max() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { diff --git a/tests/generated/justify_content_row_center.rs b/tests/generated/justify_content_row_center.rs index 071e31af5..59b98b05f 100644 --- a/tests/generated/justify_content_row_center.rs +++ b/tests/generated/justify_content_row_center.rs @@ -3,7 +3,7 @@ fn justify_content_row_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/justify_content_row_flex_end.rs b/tests/generated/justify_content_row_flex_end.rs index 3093b5337..cf4b1fd32 100644 --- a/tests/generated/justify_content_row_flex_end.rs +++ b/tests/generated/justify_content_row_flex_end.rs @@ -3,7 +3,7 @@ fn justify_content_row_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_flex_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_flex_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/justify_content_row_flex_start.rs b/tests/generated/justify_content_row_flex_start.rs index c6cac3259..68dad366a 100644 --- a/tests/generated/justify_content_row_flex_start.rs +++ b/tests/generated/justify_content_row_flex_start.rs @@ -3,7 +3,7 @@ fn justify_content_row_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_flex_start() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_flex_start() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), 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 00cc477a6..d3108ffd7 100644 --- a/tests/generated/justify_content_row_max_width_and_margin.rs +++ b/tests/generated/justify_content_row_max_width_and_margin.rs @@ -3,7 +3,7 @@ fn justify_content_row_max_width_and_margin() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn justify_content_row_max_width_and_margin() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), ..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 9706892db..e41a9bae0 100644 --- a/tests/generated/justify_content_row_min_width_and_margin.rs +++ b/tests/generated/justify_content_row_min_width_and_margin.rs @@ -3,7 +3,7 @@ fn justify_content_row_min_width_and_margin() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(20f32), @@ -17,7 +17,7 @@ fn justify_content_row_min_width_and_margin() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/justify_content_row_space_around.rs b/tests/generated/justify_content_row_space_around.rs index dd1813906..ae8786d3a 100644 --- a/tests/generated/justify_content_row_space_around.rs +++ b/tests/generated/justify_content_row_space_around.rs @@ -3,7 +3,7 @@ fn justify_content_row_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_space_around() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_space_around() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_space_around() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/justify_content_row_space_between.rs b/tests/generated/justify_content_row_space_between.rs index 18383045a..0f1e0647d 100644 --- a/tests/generated/justify_content_row_space_between.rs +++ b/tests/generated/justify_content_row_space_between.rs @@ -3,7 +3,7 @@ fn justify_content_row_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_space_between() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_space_between() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_space_between() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceBetween, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/justify_content_row_space_evenly.rs b/tests/generated/justify_content_row_space_evenly.rs index 5c26f425e..505bdeb5f 100644 --- a/tests/generated/justify_content_row_space_evenly.rs +++ b/tests/generated/justify_content_row_space_evenly.rs @@ -3,7 +3,7 @@ fn justify_content_row_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn justify_content_row_space_evenly() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn justify_content_row_space_evenly() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -30,7 +30,7 @@ fn justify_content_row_space_evenly() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::SpaceEvenly, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_and_flex_column.rs b/tests/generated/margin_and_flex_column.rs index 8daa3577e..f4f04c736 100644 --- a/tests/generated/margin_and_flex_column.rs +++ b/tests/generated/margin_and_flex_column.rs @@ -3,7 +3,7 @@ fn margin_and_flex_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn margin_and_flex_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_and_flex_row.rs b/tests/generated/margin_and_flex_row.rs index 5a7acfdfd..1805c1e7d 100644 --- a/tests/generated/margin_and_flex_row.rs +++ b/tests/generated/margin_and_flex_row.rs @@ -3,7 +3,7 @@ fn margin_and_flex_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn margin_and_flex_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_and_stretch_column.rs b/tests/generated/margin_and_stretch_column.rs index 7882b63af..bd64e1781 100644 --- a/tests/generated/margin_and_stretch_column.rs +++ b/tests/generated/margin_and_stretch_column.rs @@ -3,7 +3,7 @@ fn margin_and_stretch_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn margin_and_stretch_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_and_stretch_row.rs b/tests/generated/margin_and_stretch_row.rs index dcf0b4372..45f089b25 100644 --- a/tests/generated/margin_and_stretch_row.rs +++ b/tests/generated/margin_and_stretch_row.rs @@ -3,7 +3,7 @@ fn margin_and_stretch_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), @@ -17,7 +17,7 @@ fn margin_and_stretch_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_auto_bottom.rs b/tests/generated/margin_auto_bottom.rs index fafcd9588..673dc957c 100644 --- a/tests/generated/margin_auto_bottom.rs +++ b/tests/generated/margin_auto_bottom.rs @@ -3,7 +3,7 @@ fn margin_auto_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_bottom() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ fn margin_auto_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_bottom_and_top.rs b/tests/generated/margin_auto_bottom_and_top.rs index ce9fcb455..e407838b1 100644 --- a/tests/generated/margin_auto_bottom_and_top.rs +++ b/tests/generated/margin_auto_bottom_and_top.rs @@ -3,7 +3,7 @@ fn margin_auto_bottom_and_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_bottom_and_top() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_bottom_and_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_bottom_and_top_justify_center.rs b/tests/generated/margin_auto_bottom_and_top_justify_center.rs index 25b350185..507dd0410 100644 --- a/tests/generated/margin_auto_bottom_and_top_justify_center.rs +++ b/tests/generated/margin_auto_bottom_and_top_justify_center.rs @@ -3,7 +3,7 @@ fn margin_auto_bottom_and_top_justify_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_bottom_and_top_justify_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_bottom_and_top_justify_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_left.rs b/tests/generated/margin_auto_left.rs index c6081d6ae..5f29cd458 100644 --- a/tests/generated/margin_auto_left.rs +++ b/tests/generated/margin_auto_left.rs @@ -3,7 +3,7 @@ fn margin_auto_left() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_left() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ fn margin_auto_left() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_left_and_right.rs b/tests/generated/margin_auto_left_and_right.rs index 44fa00c26..82615ade6 100644 --- a/tests/generated/margin_auto_left_and_right.rs +++ b/tests/generated/margin_auto_left_and_right.rs @@ -3,7 +3,7 @@ fn margin_auto_left_and_right() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_left_and_right() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_left_and_right() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_left_and_right_column.rs b/tests/generated/margin_auto_left_and_right_column.rs index ad5040f69..55ea91221 100644 --- a/tests/generated/margin_auto_left_and_right_column.rs +++ b/tests/generated/margin_auto_left_and_right_column.rs @@ -3,7 +3,7 @@ fn margin_auto_left_and_right_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_left_and_right_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_left_and_right_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 cdabf5979..3ae3efe05 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 @@ -3,7 +3,7 @@ fn margin_auto_left_and_right_column_and_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_left_and_right_column_and_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_left_and_right_column_and_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_left_and_right_strech.rs b/tests/generated/margin_auto_left_and_right_strech.rs index ee88bcc07..926df3b9e 100644 --- a/tests/generated/margin_auto_left_and_right_strech.rs +++ b/tests/generated/margin_auto_left_and_right_strech.rs @@ -3,7 +3,7 @@ fn margin_auto_left_and_right_strech() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_left_and_right_strech() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_left_and_right_strech() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), 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 500779db9..a8455180c 100644 --- a/tests/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_child_bigger_than_parent.rs @@ -3,7 +3,7 @@ fn margin_auto_left_child_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -17,7 +17,7 @@ fn margin_auto_left_child_bigger_than_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), 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 18f542d53..f3f4c4113 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 @@ -3,7 +3,7 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -21,7 +21,7 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), 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 fa5229007..924091246 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 @@ -3,7 +3,7 @@ fn margin_auto_left_right_child_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -21,7 +21,7 @@ fn margin_auto_left_right_child_bigger_than_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), diff --git a/tests/generated/margin_auto_left_stretching_child.rs b/tests/generated/margin_auto_left_stretching_child.rs index e69443822..3b0b789ee 100644 --- a/tests/generated/margin_auto_left_stretching_child.rs +++ b/tests/generated/margin_auto_left_stretching_child.rs @@ -3,7 +3,7 @@ fn margin_auto_left_stretching_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -15,7 +15,7 @@ fn margin_auto_left_stretching_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -28,7 +28,7 @@ fn margin_auto_left_stretching_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_mutiple_children_column.rs b/tests/generated/margin_auto_mutiple_children_column.rs index 353cf0a45..b8223d756 100644 --- a/tests/generated/margin_auto_mutiple_children_column.rs +++ b/tests/generated/margin_auto_mutiple_children_column.rs @@ -3,7 +3,7 @@ fn margin_auto_mutiple_children_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_mutiple_children_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -31,7 +31,7 @@ fn margin_auto_mutiple_children_column() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -44,7 +44,7 @@ fn margin_auto_mutiple_children_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { diff --git a/tests/generated/margin_auto_mutiple_children_row.rs b/tests/generated/margin_auto_mutiple_children_row.rs index 5748a700e..d349c3c28 100644 --- a/tests/generated/margin_auto_mutiple_children_row.rs +++ b/tests/generated/margin_auto_mutiple_children_row.rs @@ -3,7 +3,7 @@ fn margin_auto_mutiple_children_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_mutiple_children_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -31,7 +31,7 @@ fn margin_auto_mutiple_children_row() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -44,7 +44,7 @@ fn margin_auto_mutiple_children_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_right.rs b/tests/generated/margin_auto_right.rs index e8de0fd58..12d94a351 100644 --- a/tests/generated/margin_auto_right.rs +++ b/tests/generated/margin_auto_right.rs @@ -3,7 +3,7 @@ fn margin_auto_right() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_right() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ fn margin_auto_right() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_top.rs b/tests/generated/margin_auto_top.rs index 6ef76e809..193519e9e 100644 --- a/tests/generated/margin_auto_top.rs +++ b/tests/generated/margin_auto_top.rs @@ -3,7 +3,7 @@ fn margin_auto_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -17,7 +17,7 @@ fn margin_auto_top() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -30,7 +30,7 @@ fn margin_auto_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_top_and_bottom_strech.rs b/tests/generated/margin_auto_top_and_bottom_strech.rs index 59c2f1d6f..9fbfc8750 100644 --- a/tests/generated/margin_auto_top_and_bottom_strech.rs +++ b/tests/generated/margin_auto_top_and_bottom_strech.rs @@ -3,7 +3,7 @@ fn margin_auto_top_and_bottom_strech() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -21,7 +21,7 @@ fn margin_auto_top_and_bottom_strech() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -34,7 +34,7 @@ fn margin_auto_top_and_bottom_strech() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_auto_top_stretching_child.rs b/tests/generated/margin_auto_top_stretching_child.rs index 7e749cbea..7286517b3 100644 --- a/tests/generated/margin_auto_top_stretching_child.rs +++ b/tests/generated/margin_auto_top_stretching_child.rs @@ -3,7 +3,7 @@ fn margin_auto_top_stretching_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -15,7 +15,7 @@ fn margin_auto_top_stretching_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -28,7 +28,7 @@ fn margin_auto_top_stretching_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/margin_bottom.rs b/tests/generated/margin_bottom.rs index cad9c8691..b05894906 100644 --- a/tests/generated/margin_bottom.rs +++ b/tests/generated/margin_bottom.rs @@ -3,7 +3,7 @@ fn margin_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn margin_bottom() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { 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 8f433c83b..170fa2097 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 @@ -3,7 +3,7 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(72f32), height: taffy::style::Dimension::Points(72f32), @@ -21,7 +21,7 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(52f32), diff --git a/tests/generated/margin_left.rs b/tests/generated/margin_left.rs index 4ad816179..d0dda9559 100644 --- a/tests/generated/margin_left.rs +++ b/tests/generated/margin_left.rs @@ -3,7 +3,7 @@ fn margin_left() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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() }, ..Default::default() @@ -13,7 +13,7 @@ fn margin_left() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_right.rs b/tests/generated/margin_right.rs index 1d5d19154..cf513dae2 100644 --- a/tests/generated/margin_right.rs +++ b/tests/generated/margin_right.rs @@ -3,7 +3,7 @@ fn margin_right() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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() }, ..Default::default() @@ -13,7 +13,7 @@ fn margin_right() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_should_not_be_part_of_max_height.rs b/tests/generated/margin_should_not_be_part_of_max_height.rs index 753b797e8..879c7747d 100644 --- a/tests/generated/margin_should_not_be_part_of_max_height.rs +++ b/tests/generated/margin_should_not_be_part_of_max_height.rs @@ -3,7 +3,7 @@ fn margin_should_not_be_part_of_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -21,7 +21,7 @@ fn margin_should_not_be_part_of_max_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(250f32), height: taffy::style::Dimension::Points(250f32), 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 da1639186..fdc5e740a 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 @@ -3,7 +3,7 @@ fn margin_should_not_be_part_of_max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -21,7 +21,7 @@ fn margin_should_not_be_part_of_max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(250f32), height: taffy::style::Dimension::Points(250f32), diff --git a/tests/generated/margin_top.rs b/tests/generated/margin_top.rs index 3e52a0d89..c80a14d09 100644 --- a/tests/generated/margin_top.rs +++ b/tests/generated/margin_top.rs @@ -3,7 +3,7 @@ fn margin_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn margin_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_with_sibling_column.rs b/tests/generated/margin_with_sibling_column.rs index ac2c2a154..3a5823f3b 100644 --- a/tests/generated/margin_with_sibling_column.rs +++ b/tests/generated/margin_with_sibling_column.rs @@ -3,7 +3,7 @@ fn margin_with_sibling_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { bottom: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -11,11 +11,10 @@ fn margin_with_sibling_column() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/margin_with_sibling_row.rs b/tests/generated/margin_with_sibling_row.rs index a450c18b2..f4b618907 100644 --- a/tests/generated/margin_with_sibling_row.rs +++ b/tests/generated/margin_with_sibling_row.rs @@ -3,7 +3,7 @@ fn margin_with_sibling_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -11,11 +11,10 @@ fn margin_with_sibling_row() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/max_height.rs b/tests/generated/max_height.rs index 093fc24a7..e53570db0 100644 --- a/tests/generated/max_height.rs +++ b/tests/generated/max_height.rs @@ -3,7 +3,7 @@ fn max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ fn max_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/max_height_overrides_height.rs b/tests/generated/max_height_overrides_height.rs index 5014bd5f0..304b9b6fe 100644 --- a/tests/generated/max_height_overrides_height.rs +++ b/tests/generated/max_height_overrides_height.rs @@ -3,7 +3,7 @@ fn max_height_overrides_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), @@ -14,7 +14,7 @@ fn max_height_overrides_height() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 0f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/max_height_overrides_height_on_root.rs b/tests/generated/max_height_overrides_height_on_root.rs index b1b08ee74..6a93edc8a 100644 --- a/tests/generated/max_height_overrides_height_on_root.rs +++ b/tests/generated/max_height_overrides_height_on_root.rs @@ -3,7 +3,7 @@ fn max_height_overrides_height_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/max_width.rs b/tests/generated/max_width.rs index a96ed4a46..a5d567af2 100644 --- a/tests/generated/max_width.rs +++ b/tests/generated/max_width.rs @@ -3,7 +3,7 @@ fn max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/max_width_overrides_width.rs b/tests/generated/max_width_overrides_width.rs index 27d939bbe..41c185c6c 100644 --- a/tests/generated/max_width_overrides_width.rs +++ b/tests/generated/max_width_overrides_width.rs @@ -3,7 +3,7 @@ fn max_width_overrides_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -14,7 +14,7 @@ fn max_width_overrides_width() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); assert_eq!(taffy.layout(node).unwrap().size.height, 0f32); diff --git a/tests/generated/max_width_overrides_width_on_root.rs b/tests/generated/max_width_overrides_width_on_root.rs index 8d58c23ce..6bbc42556 100644 --- a/tests/generated/max_width_overrides_width_on_root.rs +++ b/tests/generated/max_width_overrides_width_on_root.rs @@ -3,7 +3,7 @@ fn max_width_overrides_width_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/min_height.rs b/tests/generated/min_height.rs index 20642cf40..0aaa9b9bf 100644 --- a/tests/generated/min_height.rs +++ b/tests/generated/min_height.rs @@ -3,7 +3,7 @@ fn min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(60f32), @@ -14,11 +14,10 @@ fn min_height() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/min_height_overrides_height.rs b/tests/generated/min_height_overrides_height.rs index 703b3dd37..4cdd882b2 100644 --- a/tests/generated/min_height_overrides_height.rs +++ b/tests/generated/min_height_overrides_height.rs @@ -3,7 +3,7 @@ fn min_height_overrides_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), @@ -14,7 +14,7 @@ fn min_height_overrides_height() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 0f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/min_height_overrides_height_on_root.rs b/tests/generated/min_height_overrides_height_on_root.rs index 6e4d3f790..145b53b84 100644 --- a/tests/generated/min_height_overrides_height_on_root.rs +++ b/tests/generated/min_height_overrides_height_on_root.rs @@ -3,7 +3,7 @@ fn min_height_overrides_height_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/min_max_percent_no_width_height.rs b/tests/generated/min_max_percent_no_width_height.rs index 137da0ff1..ea81b430d 100644 --- a/tests/generated/min_max_percent_no_width_height.rs +++ b/tests/generated/min_max_percent_no_width_height.rs @@ -3,7 +3,7 @@ fn min_max_percent_no_width_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { min_size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.1f32), height: taffy::style::Dimension::Percent(0.1f32), @@ -21,7 +21,7 @@ fn min_max_percent_no_width_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { diff --git a/tests/generated/min_width.rs b/tests/generated/min_width.rs index 6e667819f..b0f6b8759 100644 --- a/tests/generated/min_width.rs +++ b/tests/generated/min_width.rs @@ -3,7 +3,7 @@ fn min_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), ..Default::default() }, ..Default::default() @@ -11,11 +11,10 @@ fn min_width() { &[], ) .unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/min_width_overrides_width.rs b/tests/generated/min_width_overrides_width.rs index fb53f55e9..934e8ba12 100644 --- a/tests/generated/min_width_overrides_width.rs +++ b/tests/generated/min_width_overrides_width.rs @@ -3,7 +3,7 @@ fn min_width_overrides_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), @@ -14,7 +14,7 @@ fn min_width_overrides_width() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); assert_eq!(taffy.layout(node).unwrap().size.height, 0f32); diff --git a/tests/generated/min_width_overrides_width_on_root.rs b/tests/generated/min_width_overrides_width_on_root.rs index 8d3680a02..aa295a67c 100644 --- a/tests/generated/min_width_overrides_width_on_root.rs +++ b/tests/generated/min_width_overrides_width_on_root.rs @@ -3,7 +3,7 @@ fn min_width_overrides_width_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), ..Default::default() }, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/nested_overflowing_child.rs b/tests/generated/nested_overflowing_child.rs index e0f13d64e..25cd10e12 100644 --- a/tests/generated/nested_overflowing_child.rs +++ b/tests/generated/nested_overflowing_child.rs @@ -3,7 +3,7 @@ fn nested_overflowing_child() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -14,10 +14,10 @@ fn nested_overflowing_child() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/nested_overflowing_child_in_constraint_parent.rs b/tests/generated/nested_overflowing_child_in_constraint_parent.rs index 9455af10a..cd9236278 100644 --- a/tests/generated/nested_overflowing_child_in_constraint_parent.rs +++ b/tests/generated/nested_overflowing_child_in_constraint_parent.rs @@ -3,7 +3,7 @@ fn nested_overflowing_child_in_constraint_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -16,7 +16,7 @@ fn nested_overflowing_child_in_constraint_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -29,7 +29,7 @@ fn nested_overflowing_child_in_constraint_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/overflow_cross_axis.rs b/tests/generated/overflow_cross_axis.rs index c3219b693..0c23af9de 100644 --- a/tests/generated/overflow_cross_axis.rs +++ b/tests/generated/overflow_cross_axis.rs @@ -3,7 +3,7 @@ fn overflow_cross_axis() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), @@ -16,7 +16,7 @@ fn overflow_cross_axis() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/overflow_main_axis.rs b/tests/generated/overflow_main_axis.rs index c17e76a0a..2f2332d64 100644 --- a/tests/generated/overflow_main_axis.rs +++ b/tests/generated/overflow_main_axis.rs @@ -3,7 +3,7 @@ fn overflow_main_axis() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn overflow_main_axis() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/padding_align_end_child.rs b/tests/generated/padding_align_end_child.rs index ae83ac03e..eb9a72ce6 100644 --- a/tests/generated/padding_align_end_child.rs +++ b/tests/generated/padding_align_end_child.rs @@ -3,7 +3,7 @@ fn padding_align_end_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -23,7 +23,7 @@ fn padding_align_end_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::FlexEnd, justify_content: taffy::style::JustifyContent::FlexEnd, size: taffy::geometry::Size { diff --git a/tests/generated/padding_center_child.rs b/tests/generated/padding_center_child.rs index 058f7beb2..60b577d85 100644 --- a/tests/generated/padding_center_child.rs +++ b/tests/generated/padding_center_child.rs @@ -3,7 +3,7 @@ fn padding_center_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn padding_center_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { diff --git a/tests/generated/padding_flex_child.rs b/tests/generated/padding_flex_child.rs index 196a61b99..d4036dd21 100644 --- a/tests/generated/padding_flex_child.rs +++ b/tests/generated/padding_flex_child.rs @@ -3,7 +3,7 @@ fn padding_flex_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn padding_flex_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/padding_no_child.rs b/tests/generated/padding_no_child.rs index 721ec017b..32d3bbf4a 100644 --- a/tests/generated/padding_no_child.rs +++ b/tests/generated/padding_no_child.rs @@ -3,7 +3,7 @@ fn padding_no_child() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { padding: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/padding_stretch_child.rs b/tests/generated/padding_stretch_child.rs index 732cfe470..27eb797c4 100644 --- a/tests/generated/padding_stretch_child.rs +++ b/tests/generated/padding_stretch_child.rs @@ -3,7 +3,7 @@ fn padding_stretch_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn padding_stretch_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/parent_wrap_child_size_overflowing_parent.rs b/tests/generated/parent_wrap_child_size_overflowing_parent.rs index 4ab71693b..98ca5ee3c 100644 --- a/tests/generated/parent_wrap_child_size_overflowing_parent.rs +++ b/tests/generated/parent_wrap_child_size_overflowing_parent.rs @@ -3,7 +3,7 @@ fn parent_wrap_child_size_overflowing_parent() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(200f32), @@ -16,7 +16,7 @@ fn parent_wrap_child_size_overflowing_parent() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -25,7 +25,7 @@ fn parent_wrap_child_size_overflowing_parent() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/percent_absolute_position.rs b/tests/generated/percent_absolute_position.rs index 7ab74e52f..67b0b30b0 100644 --- a/tests/generated/percent_absolute_position.rs +++ b/tests/generated/percent_absolute_position.rs @@ -3,7 +3,7 @@ fn percent_absolute_position() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn percent_absolute_position() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn percent_absolute_position() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), @@ -39,7 +39,7 @@ fn percent_absolute_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), diff --git a/tests/generated/percent_within_flex_grow.rs b/tests/generated/percent_within_flex_grow.rs index e7056b794..82e02748c 100644 --- a/tests/generated/percent_within_flex_grow.rs +++ b/tests/generated/percent_within_flex_grow.rs @@ -3,7 +3,7 @@ fn percent_within_flex_grow() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -12,7 +12,7 @@ fn percent_within_flex_grow() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() }, @@ -21,7 +21,7 @@ fn percent_within_flex_grow() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, ..Default::default() @@ -31,7 +31,7 @@ fn percent_within_flex_grow() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, @@ -40,7 +40,7 @@ fn percent_within_flex_grow() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(350f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/percentage_absolute_position.rs b/tests/generated/percentage_absolute_position.rs index 8de8676a3..a6f694302 100644 --- a/tests/generated/percentage_absolute_position.rs +++ b/tests/generated/percentage_absolute_position.rs @@ -3,7 +3,7 @@ fn percentage_absolute_position() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), @@ -22,7 +22,7 @@ fn percentage_absolute_position() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_container_in_wrapping_container.rs b/tests/generated/percentage_container_in_wrapping_container.rs index 32116220e..2fba90057 100644 --- a/tests/generated/percentage_container_in_wrapping_container.rs +++ b/tests/generated/percentage_container_in_wrapping_container.rs @@ -3,7 +3,7 @@ fn percentage_container_in_wrapping_container() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -16,7 +16,7 @@ fn percentage_container_in_wrapping_container() { .unwrap(); let node001 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: taffy::style::Dimension::Points(50f32), @@ -29,7 +29,7 @@ fn percentage_container_in_wrapping_container() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { justify_content: taffy::style::JustifyContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), ..Default::default() }, ..Default::default() @@ -39,13 +39,13 @@ fn percentage_container_in_wrapping_container() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, justify_content: taffy::style::JustifyContent::Center, diff --git a/tests/generated/percentage_flex_basis.rs b/tests/generated/percentage_flex_basis.rs index cd58b2f57..da6c9e427 100644 --- a/tests/generated/percentage_flex_basis.rs +++ b/tests/generated/percentage_flex_basis.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), ..Default::default() @@ -13,7 +13,7 @@ fn percentage_flex_basis() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.25f32), ..Default::default() @@ -23,7 +23,7 @@ fn percentage_flex_basis() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_cross.rs b/tests/generated/percentage_flex_basis_cross.rs index fd1b0d8ee..d8e61a515 100644 --- a/tests/generated/percentage_flex_basis_cross.rs +++ b/tests/generated/percentage_flex_basis_cross.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_cross() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), ..Default::default() @@ -13,7 +13,7 @@ fn percentage_flex_basis_cross() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.25f32), ..Default::default() @@ -23,7 +23,7 @@ fn percentage_flex_basis_cross() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_cross_max_height.rs b/tests/generated/percentage_flex_basis_cross_max_height.rs index c5399b5b5..ee6255625 100644 --- a/tests/generated/percentage_flex_basis_cross_max_height.rs +++ b/tests/generated/percentage_flex_basis_cross_max_height.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_cross_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_cross_max_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_cross_max_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_cross_max_width.rs b/tests/generated/percentage_flex_basis_cross_max_width.rs index 2a351ea4a..6c6e517c9 100644 --- a/tests/generated/percentage_flex_basis_cross_max_width.rs +++ b/tests/generated/percentage_flex_basis_cross_max_width.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_cross_max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_cross_max_width() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), max_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_cross_max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_cross_min_height.rs b/tests/generated/percentage_flex_basis_cross_min_height.rs index 1316e22e2..56b007929 100644 --- a/tests/generated/percentage_flex_basis_cross_min_height.rs +++ b/tests/generated/percentage_flex_basis_cross_min_height.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_cross_min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Percent(0.6f32), @@ -16,7 +16,7 @@ fn percentage_flex_basis_cross_min_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 2f32, min_size: taffy::geometry::Size { height: taffy::style::Dimension::Percent(0.1f32), @@ -29,7 +29,7 @@ fn percentage_flex_basis_cross_min_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_cross_min_width.rs b/tests/generated/percentage_flex_basis_cross_min_width.rs index 667eec234..fdda48056 100644 --- a/tests/generated/percentage_flex_basis_cross_min_width.rs +++ b/tests/generated/percentage_flex_basis_cross_min_width.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_cross_min_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), min_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_cross_min_width() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_cross_min_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_flex_basis_main_max_height.rs b/tests/generated/percentage_flex_basis_main_max_height.rs index 537c8e107..255932dee 100644 --- a/tests/generated/percentage_flex_basis_main_max_height.rs +++ b/tests/generated/percentage_flex_basis_main_max_height.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_main_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_main_max_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_main_max_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/tests/generated/percentage_flex_basis_main_max_width.rs b/tests/generated/percentage_flex_basis_main_max_width.rs index 7198f9b14..3d2860eed 100644 --- a/tests/generated/percentage_flex_basis_main_max_width.rs +++ b/tests/generated/percentage_flex_basis_main_max_width.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_main_max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), max_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_main_max_width() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), max_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_main_max_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/tests/generated/percentage_flex_basis_main_min_width.rs b/tests/generated/percentage_flex_basis_main_min_width.rs index 81954391f..3aee3efd0 100644 --- a/tests/generated/percentage_flex_basis_main_min_width.rs +++ b/tests/generated/percentage_flex_basis_main_min_width.rs @@ -3,7 +3,7 @@ fn percentage_flex_basis_main_min_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -17,7 +17,7 @@ fn percentage_flex_basis_main_min_width() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), min_size: taffy::geometry::Size { @@ -31,7 +31,7 @@ fn percentage_flex_basis_main_min_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), 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 91bbe1ecf..6dd8ac242 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 @@ -3,7 +3,7 @@ fn percentage_margin_should_calculate_based_only_on_width() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn percentage_margin_should_calculate_based_only_on_width() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, margin: taffy::geometry::Rect { @@ -33,7 +33,7 @@ fn percentage_margin_should_calculate_based_only_on_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 923d37094..e43016e93 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 @@ -3,7 +3,7 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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), @@ -26,7 +26,7 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), ..Default::default() }, margin: taffy::geometry::Rect { @@ -50,7 +50,7 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, flex_basis: taffy::style::Dimension::Percent(0.1f32), @@ -79,7 +79,7 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Percent(0.15f32), min_size: taffy::geometry::Size { @@ -93,7 +93,7 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), 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 e793b31c6..613eb75dd 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 @@ -3,7 +3,7 @@ fn percentage_padding_should_calculate_based_only_on_width() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn percentage_padding_should_calculate_based_only_on_width() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, padding: taffy::geometry::Rect { @@ -33,7 +33,7 @@ fn percentage_padding_should_calculate_based_only_on_width() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_position_bottom_right.rs b/tests/generated/percentage_position_bottom_right.rs index acf215c59..2bf181f49 100644 --- a/tests/generated/percentage_position_bottom_right.rs +++ b/tests/generated/percentage_position_bottom_right.rs @@ -3,7 +3,7 @@ fn percentage_position_bottom_right() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.55f32), height: taffy::style::Dimension::Percent(0.15f32), @@ -21,7 +21,7 @@ fn percentage_position_bottom_right() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), height: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/percentage_position_left_top.rs b/tests/generated/percentage_position_left_top.rs index bd355beb9..9a2cdc3e1 100644 --- a/tests/generated/percentage_position_left_top.rs +++ b/tests/generated/percentage_position_left_top.rs @@ -3,7 +3,7 @@ fn percentage_position_left_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.45f32), height: taffy::style::Dimension::Percent(0.55f32), @@ -21,7 +21,7 @@ fn percentage_position_left_top() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), height: taffy::style::Dimension::Points(400f32), 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 53ae1e987..687a6902a 100644 --- a/tests/generated/percentage_size_based_on_parent_inner_size.rs +++ b/tests/generated/percentage_size_based_on_parent_inner_size.rs @@ -3,7 +3,7 @@ fn percentage_size_based_on_parent_inner_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: taffy::style::Dimension::Percent(0.5f32), @@ -16,7 +16,7 @@ fn percentage_size_based_on_parent_inner_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), diff --git a/tests/generated/percentage_size_of_flex_basis.rs b/tests/generated/percentage_size_of_flex_basis.rs index b3f8c649c..cbbc85880 100644 --- a/tests/generated/percentage_size_of_flex_basis.rs +++ b/tests/generated/percentage_size_of_flex_basis.rs @@ -3,7 +3,7 @@ fn percentage_size_of_flex_basis() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), height: taffy::style::Dimension::Points(100f32), @@ -16,13 +16,13 @@ fn percentage_size_of_flex_basis() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/percentage_width_height.rs b/tests/generated/percentage_width_height.rs index a211b187d..32fba1c47 100644 --- a/tests/generated/percentage_width_height.rs +++ b/tests/generated/percentage_width_height.rs @@ -3,7 +3,7 @@ fn percentage_width_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.3f32), height: taffy::style::Dimension::Percent(0.3f32), @@ -16,7 +16,7 @@ fn percentage_width_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(400f32), diff --git a/tests/generated/percentage_width_height_undefined_parent_size.rs b/tests/generated/percentage_width_height_undefined_parent_size.rs index 500f75aeb..fe205d0ec 100644 --- a/tests/generated/percentage_width_height_undefined_parent_size.rs +++ b/tests/generated/percentage_width_height_undefined_parent_size.rs @@ -3,7 +3,7 @@ fn percentage_width_height_undefined_parent_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: taffy::style::Dimension::Percent(0.5f32), @@ -16,7 +16,7 @@ fn percentage_width_height_undefined_parent_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node0], ) .unwrap(); diff --git a/tests/generated/relative_position_should_not_nudge_siblings.rs b/tests/generated/relative_position_should_not_nudge_siblings.rs index 66232cfa1..d0939e37d 100644 --- a/tests/generated/relative_position_should_not_nudge_siblings.rs +++ b/tests/generated/relative_position_should_not_nudge_siblings.rs @@ -3,7 +3,7 @@ fn relative_position_should_not_nudge_siblings() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() @@ -13,7 +13,7 @@ fn relative_position_should_not_nudge_siblings() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, position: taffy::geometry::Rect { top: taffy::style::Dimension::Points(15f32), ..Default::default() }, ..Default::default() @@ -23,7 +23,7 @@ fn relative_position_should_not_nudge_siblings() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs b/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs index e0d3f3b49..84ed60631 100644 --- a/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs +++ b/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs @@ -1,19 +1,14 @@ #[test] fn rounding_flex_basis_flex_grow_row_prime_number_width() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node2 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node3 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node4 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node2 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node3 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node4 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(113f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs b/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs index 9a4cb4a35..1a0504dd8 100644 --- a/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs +++ b/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs @@ -1,15 +1,12 @@ #[test] fn rounding_flex_basis_flex_grow_row_width_of_100() { let mut taffy = taffy::Taffy::new(); - let node0 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node1 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); - let node2 = - taffy.new_with_children(taffy::style::FlexboxLayout { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node1 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); + let node2 = taffy.new_with_children(taffy::style::Style { flex_grow: 1f32, ..Default::default() }, &[]).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_flex_basis_flex_shrink_row.rs b/tests/generated/rounding_flex_basis_flex_shrink_row.rs index a927ea5b8..db1737b3e 100644 --- a/tests/generated/rounding_flex_basis_flex_shrink_row.rs +++ b/tests/generated/rounding_flex_basis_flex_shrink_row.rs @@ -3,7 +3,7 @@ fn rounding_flex_basis_flex_shrink_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() @@ -13,19 +13,19 @@ fn rounding_flex_basis_flex_shrink_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, &[], ) .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }, &[], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(101f32), height: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_flex_basis_overrides_main_size.rs b/tests/generated/rounding_flex_basis_overrides_main_size.rs index 07f0d5696..1041241f8 100644 --- a/tests/generated/rounding_flex_basis_overrides_main_size.rs +++ b/tests/generated/rounding_flex_basis_overrides_main_size.rs @@ -3,7 +3,7 @@ fn rounding_flex_basis_overrides_main_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_flex_basis_overrides_main_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_flex_basis_overrides_main_size() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_flex_basis_overrides_main_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_fractial_input_1.rs b/tests/generated/rounding_fractial_input_1.rs index b69e46062..1e81b8cfe 100644 --- a/tests/generated/rounding_fractial_input_1.rs +++ b/tests/generated/rounding_fractial_input_1.rs @@ -3,7 +3,7 @@ fn rounding_fractial_input_1() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_fractial_input_1() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_fractial_input_1() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_fractial_input_1() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_fractial_input_2.rs b/tests/generated/rounding_fractial_input_2.rs index d549fa8e6..8ea29d4f2 100644 --- a/tests/generated/rounding_fractial_input_2.rs +++ b/tests/generated/rounding_fractial_input_2.rs @@ -3,7 +3,7 @@ fn rounding_fractial_input_2() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_fractial_input_2() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_fractial_input_2() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_fractial_input_2() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_fractial_input_3.rs b/tests/generated/rounding_fractial_input_3.rs index 6bb873ff4..c6153a048 100644 --- a/tests/generated/rounding_fractial_input_3.rs +++ b/tests/generated/rounding_fractial_input_3.rs @@ -3,7 +3,7 @@ fn rounding_fractial_input_3() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_fractial_input_3() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_fractial_input_3() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_fractial_input_3() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_fractial_input_4.rs b/tests/generated/rounding_fractial_input_4.rs index 456262d46..243725b43 100644 --- a/tests/generated/rounding_fractial_input_4.rs +++ b/tests/generated/rounding_fractial_input_4.rs @@ -3,7 +3,7 @@ fn rounding_fractial_input_4() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(50f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_fractial_input_4() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_fractial_input_4() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_fractial_input_4() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), diff --git a/tests/generated/rounding_total_fractial.rs b/tests/generated/rounding_total_fractial.rs index ebe489c98..a2bd44c01 100644 --- a/tests/generated/rounding_total_fractial.rs +++ b/tests/generated/rounding_total_fractial.rs @@ -3,7 +3,7 @@ fn rounding_total_fractial() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(20.3f32), ..Default::default() }, @@ -14,7 +14,7 @@ fn rounding_total_fractial() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.6f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -24,7 +24,7 @@ fn rounding_total_fractial() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, ..Default::default() @@ -34,7 +34,7 @@ fn rounding_total_fractial() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(87.4f32), diff --git a/tests/generated/rounding_total_fractial_nested.rs b/tests/generated/rounding_total_fractial_nested.rs index 51c62caf1..e9fa43e59 100644 --- a/tests/generated/rounding_total_fractial_nested.rs +++ b/tests/generated/rounding_total_fractial_nested.rs @@ -3,7 +3,7 @@ fn rounding_total_fractial_nested() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_basis: taffy::style::Dimension::Points(0.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(9.9f32), ..Default::default() }, @@ -18,7 +18,7 @@ fn rounding_total_fractial_nested() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 4f32, flex_basis: taffy::style::Dimension::Points(0.3f32), size: taffy::geometry::Size { height: taffy::style::Dimension::Points(1.1f32), ..Default::default() }, @@ -30,7 +30,7 @@ fn rounding_total_fractial_nested() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 0.7f32, flex_basis: taffy::style::Dimension::Points(50.3f32), @@ -42,7 +42,7 @@ fn rounding_total_fractial_nested() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.6f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -52,7 +52,7 @@ fn rounding_total_fractial_nested() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1.1f32, size: taffy::geometry::Size { height: taffy::style::Dimension::Points(10.7f32), ..Default::default() }, ..Default::default() @@ -62,7 +62,7 @@ fn rounding_total_fractial_nested() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(87.4f32), diff --git a/tests/generated/size_defined_by_child.rs b/tests/generated/size_defined_by_child.rs index 9788d31d5..819245f1d 100644 --- a/tests/generated/size_defined_by_child.rs +++ b/tests/generated/size_defined_by_child.rs @@ -3,7 +3,7 @@ fn size_defined_by_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -14,7 +14,7 @@ fn size_defined_by_child() { &[], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/size_defined_by_child_with_border.rs b/tests/generated/size_defined_by_child_with_border.rs index 9e38635e5..d897bcf66 100644 --- a/tests/generated/size_defined_by_child_with_border.rs +++ b/tests/generated/size_defined_by_child_with_border.rs @@ -3,7 +3,7 @@ fn size_defined_by_child_with_border() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn size_defined_by_child_with_border() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { border: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/size_defined_by_child_with_padding.rs b/tests/generated/size_defined_by_child_with_padding.rs index 2397b3544..99c148f03 100644 --- a/tests/generated/size_defined_by_child_with_padding.rs +++ b/tests/generated/size_defined_by_child_with_padding.rs @@ -3,7 +3,7 @@ fn size_defined_by_child_with_padding() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn size_defined_by_child_with_padding() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { padding: taffy::geometry::Rect { start: taffy::style::Dimension::Points(10f32), end: taffy::style::Dimension::Points(10f32), diff --git a/tests/generated/size_defined_by_grand_child.rs b/tests/generated/size_defined_by_grand_child.rs index 8ef37ad8e..01c97e36f 100644 --- a/tests/generated/size_defined_by_grand_child.rs +++ b/tests/generated/size_defined_by_grand_child.rs @@ -3,7 +3,7 @@ fn size_defined_by_grand_child() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -14,8 +14,8 @@ fn size_defined_by_grand_child() { &[], ) .unwrap(); - let node0 = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node00]).unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0]).unwrap(); + let node0 = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node00]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 100f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs index 270e96f56..12e442fb2 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_large_size.rs @@ -3,7 +3,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -27,7 +27,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -51,7 +51,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs index abbb2b6e2..421ff8369 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs @@ -3,7 +3,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -27,7 +27,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -51,7 +51,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs index bf2e63f04..5db102eed 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs @@ -3,7 +3,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -27,7 +27,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -49,7 +49,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { &[node10], ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[node0, node1]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[node0, node1]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 0f32); assert_eq!(taffy.layout(node).unwrap().size.height, 100f32); diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs index c47ad475e..d8cf45347 100644 --- a/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs +++ b/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs @@ -3,7 +3,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: taffy::style::Dimension::Points(100f32), @@ -16,7 +16,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -27,7 +27,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node10 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: taffy::style::Dimension::Points(100f32), @@ -40,7 +40,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), ..Default::default() }, @@ -51,7 +51,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), ..Default::default() }, ..Default::default() }, diff --git a/tests/generated/wrap_column.rs b/tests/generated/wrap_column.rs index fe6c4bfca..fcf7dc03c 100644 --- a/tests/generated/wrap_column.rs +++ b/tests/generated/wrap_column.rs @@ -3,7 +3,7 @@ fn wrap_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(31f32), @@ -16,7 +16,7 @@ fn wrap_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(32f32), @@ -29,7 +29,7 @@ fn wrap_column() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(33f32), @@ -42,7 +42,7 @@ fn wrap_column() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(34f32), @@ -55,7 +55,7 @@ fn wrap_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { diff --git a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs index a17472f75..e23464ecb 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs @@ -3,7 +3,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -16,13 +16,13 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node000], ) .unwrap(); let node010 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -35,7 +35,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, margin: taffy::geometry::Rect { top: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -45,7 +45,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), ..Default::default() }, ..Default::default() @@ -55,7 +55,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), 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 1d79fab8e..475e001a6 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -3,7 +3,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -16,13 +16,13 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .unwrap(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, &[node000], ) .unwrap(); let node010 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: taffy::style::Dimension::Points(40f32), @@ -35,7 +35,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, margin: taffy::geometry::Rect { end: taffy::style::Dimension::Points(10f32), ..Default::default() }, ..Default::default() @@ -45,7 +45,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(85f32), ..Default::default() }, ..Default::default() @@ -55,7 +55,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(500f32), diff --git a/tests/generated/wrap_reverse_column.rs b/tests/generated/wrap_reverse_column.rs index fe408e72e..57f0765b2 100644 --- a/tests/generated/wrap_reverse_column.rs +++ b/tests/generated/wrap_reverse_column.rs @@ -3,7 +3,7 @@ fn wrap_reverse_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(31f32), @@ -16,7 +16,7 @@ fn wrap_reverse_column() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(32f32), @@ -29,7 +29,7 @@ fn wrap_reverse_column() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(33f32), @@ -42,7 +42,7 @@ fn wrap_reverse_column() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(34f32), @@ -55,7 +55,7 @@ fn wrap_reverse_column() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { diff --git a/tests/generated/wrap_reverse_column_fixed_size.rs b/tests/generated/wrap_reverse_column_fixed_size.rs index b53541d5f..064d9acb4 100644 --- a/tests/generated/wrap_reverse_column_fixed_size.rs +++ b/tests/generated/wrap_reverse_column_fixed_size.rs @@ -3,7 +3,7 @@ fn wrap_reverse_column_fixed_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_column_fixed_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_column_fixed_size() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_column_fixed_size() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_column_fixed_size() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_column_fixed_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, align_items: taffy::style::AlignItems::Center, diff --git a/tests/generated/wrap_reverse_row.rs b/tests/generated/wrap_reverse_row.rs index 5545e02d1..88c2347c9 100644 --- a/tests/generated/wrap_reverse_row.rs +++ b/tests/generated/wrap_reverse_row.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(31f32), height: taffy::style::Dimension::Points(30f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(32f32), height: taffy::style::Dimension::Points(30f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(33f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(34f32), height: taffy::style::Dimension::Points(30f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_reverse_row_align_content_center.rs b/tests/generated/wrap_reverse_row_align_content_center.rs index a34a890d6..b1904e337 100644 --- a/tests/generated/wrap_reverse_row_align_content_center.rs +++ b/tests/generated/wrap_reverse_row_align_content_center.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row_align_content_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row_align_content_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row_align_content_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row_align_content_center() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row_align_content_center() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_row_align_content_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/wrap_reverse_row_align_content_flex_start.rs b/tests/generated/wrap_reverse_row_align_content_flex_start.rs index ae6ef8e4e..90a80c195 100644 --- a/tests/generated/wrap_reverse_row_align_content_flex_start.rs +++ b/tests/generated/wrap_reverse_row_align_content_flex_start.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row_align_content_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row_align_content_flex_start() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row_align_content_flex_start() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row_align_content_flex_start() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row_align_content_flex_start() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_row_align_content_flex_start() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/wrap_reverse_row_align_content_space_around.rs b/tests/generated/wrap_reverse_row_align_content_space_around.rs index b6270ac59..ec94b1d6d 100644 --- a/tests/generated/wrap_reverse_row_align_content_space_around.rs +++ b/tests/generated/wrap_reverse_row_align_content_space_around.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row_align_content_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row_align_content_space_around() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row_align_content_space_around() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row_align_content_space_around() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row_align_content_space_around() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_row_align_content_space_around() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::SpaceAround, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/wrap_reverse_row_align_content_stretch.rs b/tests/generated/wrap_reverse_row_align_content_stretch.rs index c8ae023b9..92227e738 100644 --- a/tests/generated/wrap_reverse_row_align_content_stretch.rs +++ b/tests/generated/wrap_reverse_row_align_content_stretch.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row_align_content_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row_align_content_stretch() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row_align_content_stretch() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row_align_content_stretch() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row_align_content_stretch() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_row_align_content_stretch() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_reverse_row_single_line_different_size.rs b/tests/generated/wrap_reverse_row_single_line_different_size.rs index 0ae653d7e..814a1db77 100644 --- a/tests/generated/wrap_reverse_row_single_line_different_size.rs +++ b/tests/generated/wrap_reverse_row_single_line_different_size.rs @@ -3,7 +3,7 @@ fn wrap_reverse_row_single_line_different_size() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_reverse_row_single_line_different_size() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_reverse_row_single_line_different_size() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_reverse_row_single_line_different_size() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(40f32), @@ -55,7 +55,7 @@ fn wrap_reverse_row_single_line_different_size() { .unwrap(); let node4 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(50f32), @@ -68,7 +68,7 @@ fn wrap_reverse_row_single_line_different_size() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: taffy::style::AlignContent::FlexStart, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), ..Default::default() }, diff --git a/tests/generated/wrap_row.rs b/tests/generated/wrap_row.rs index 6dcbf256a..facf62294 100644 --- a/tests/generated/wrap_row.rs +++ b/tests/generated/wrap_row.rs @@ -3,7 +3,7 @@ fn wrap_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(31f32), height: taffy::style::Dimension::Points(30f32), @@ -16,7 +16,7 @@ fn wrap_row() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(32f32), height: taffy::style::Dimension::Points(30f32), @@ -29,7 +29,7 @@ fn wrap_row() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(33f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_row() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(34f32), height: taffy::style::Dimension::Points(30f32), @@ -55,7 +55,7 @@ fn wrap_row() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, ..Default::default() diff --git a/tests/generated/wrap_row_align_items_center.rs b/tests/generated/wrap_row_align_items_center.rs index 7830687d4..4b4b070fd 100644 --- a/tests/generated/wrap_row_align_items_center.rs +++ b/tests/generated/wrap_row_align_items_center.rs @@ -3,7 +3,7 @@ fn wrap_row_align_items_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_row_align_items_center() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_row_align_items_center() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_row_align_items_center() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -55,7 +55,7 @@ fn wrap_row_align_items_center() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/wrap_row_align_items_flex_end.rs b/tests/generated/wrap_row_align_items_flex_end.rs index 17d1e6288..5cfc053d6 100644 --- a/tests/generated/wrap_row_align_items_flex_end.rs +++ b/tests/generated/wrap_row_align_items_flex_end.rs @@ -3,7 +3,7 @@ fn wrap_row_align_items_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(10f32), @@ -16,7 +16,7 @@ fn wrap_row_align_items_flex_end() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(20f32), @@ -29,7 +29,7 @@ fn wrap_row_align_items_flex_end() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -42,7 +42,7 @@ fn wrap_row_align_items_flex_end() { .unwrap(); let node3 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: taffy::style::Dimension::Points(30f32), @@ -55,7 +55,7 @@ fn wrap_row_align_items_flex_end() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), ..Default::default() }, diff --git a/tests/generated/wrapped_column_max_height.rs b/tests/generated/wrapped_column_max_height.rs index da71f395f..6cf2231bb 100644 --- a/tests/generated/wrapped_column_max_height.rs +++ b/tests/generated/wrapped_column_max_height.rs @@ -3,7 +3,7 @@ fn wrapped_column_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(500f32), @@ -20,7 +20,7 @@ fn wrapped_column_max_height() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: taffy::style::Dimension::Points(200f32), @@ -40,7 +40,7 @@ fn wrapped_column_max_height() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -53,7 +53,7 @@ fn wrapped_column_max_height() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, diff --git a/tests/generated/wrapped_column_max_height_flex.rs b/tests/generated/wrapped_column_max_height_flex.rs index d47bad589..815d915dd 100644 --- a/tests/generated/wrapped_column_max_height_flex.rs +++ b/tests/generated/wrapped_column_max_height_flex.rs @@ -3,7 +3,7 @@ fn wrapped_column_max_height_flex() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -23,7 +23,7 @@ fn wrapped_column_max_height_flex() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), @@ -46,7 +46,7 @@ fn wrapped_column_max_height_flex() { .unwrap(); let node2 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: taffy::style::Dimension::Points(100f32), @@ -59,7 +59,7 @@ fn wrapped_column_max_height_flex() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, align_items: taffy::style::AlignItems::Center, diff --git a/tests/generated/wrapped_row_within_align_items_center.rs b/tests/generated/wrapped_row_within_align_items_center.rs index 0d6ae9838..d1d41fcae 100644 --- a/tests/generated/wrapped_row_within_align_items_center.rs +++ b/tests/generated/wrapped_row_within_align_items_center.rs @@ -3,7 +3,7 @@ fn wrapped_row_within_align_items_center() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -16,7 +16,7 @@ fn wrapped_row_within_align_items_center() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -29,13 +29,13 @@ fn wrapped_row_within_align_items_center() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::Center, size: taffy::geometry::Size { diff --git a/tests/generated/wrapped_row_within_align_items_flex_end.rs b/tests/generated/wrapped_row_within_align_items_flex_end.rs index 8e83067c6..822843e00 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_end.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_end.rs @@ -3,7 +3,7 @@ fn wrapped_row_within_align_items_flex_end() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -16,7 +16,7 @@ fn wrapped_row_within_align_items_flex_end() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -29,13 +29,13 @@ fn wrapped_row_within_align_items_flex_end() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexEnd, size: taffy::geometry::Size { diff --git a/tests/generated/wrapped_row_within_align_items_flex_start.rs b/tests/generated/wrapped_row_within_align_items_flex_start.rs index ffa97ba4d..5ff00f0e8 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_start.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_start.rs @@ -3,7 +3,7 @@ fn wrapped_row_within_align_items_flex_start() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(150f32), height: taffy::style::Dimension::Points(80f32), @@ -16,7 +16,7 @@ fn wrapped_row_within_align_items_flex_start() { .unwrap(); let node01 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: taffy::style::Dimension::Points(80f32), @@ -29,13 +29,13 @@ fn wrapped_row_within_align_items_flex_start() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, + taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, ..Default::default() }, &[node00, node01], ) .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: taffy::style::AlignItems::FlexStart, size: taffy::geometry::Size { diff --git a/tests/measure.rs b/tests/measure.rs index d89e06218..4561618ea 100644 --- a/tests/measure.rs +++ b/tests/measure.rs @@ -7,7 +7,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let node = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -27,7 +27,7 @@ mod measure { let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -35,7 +35,7 @@ mod measure { ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[child]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[child]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(node).unwrap().size.width, 100.0); @@ -50,7 +50,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -60,7 +60,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), ..Default::default() }, ..Default::default() }, @@ -82,7 +82,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -92,7 +92,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + 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), @@ -118,7 +118,7 @@ mod measure { fn measure_child_with_flex_grow() { let mut taffy = taffy::node::Taffy::new(); let child0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), height: taffy::style::Dimension::Points(50.0), @@ -129,7 +129,7 @@ mod measure { let child1 = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { flex_grow: 1.0, ..Default::default() }, + taffy::style::Style { flex_grow: 1.0, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(10.0), height: known_dimensions.height.unwrap_or(50.0), @@ -139,7 +139,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, ..Default::default() }, @@ -157,7 +157,7 @@ mod measure { fn measure_child_with_flex_shrink() { let mut taffy = taffy::node::Taffy::new(); let child0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), height: taffy::style::Dimension::Points(50.0), @@ -169,7 +169,7 @@ mod measure { let child1 = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(50.0), @@ -179,7 +179,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, ..Default::default() }, @@ -197,7 +197,7 @@ mod measure { fn remeasure_child_after_growing() { let mut taffy = taffy::node::Taffy::new(); let child0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), height: taffy::style::Dimension::Points(50.0), @@ -208,7 +208,7 @@ mod measure { let child1 = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { flex_grow: 1.0, ..Default::default() }, + taffy::style::Style { flex_grow: 1.0, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| { let width = known_dimensions.width.unwrap_or(10.0); let height = known_dimensions.height.unwrap_or(width * 2.0); @@ -219,7 +219,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() @@ -239,7 +239,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), height: taffy::style::Dimension::Points(50.0), @@ -251,7 +251,7 @@ mod measure { let child1 = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| { let width = known_dimensions.width.unwrap_or(100.0); let height = known_dimensions.height.unwrap_or(width * 2.0); @@ -262,7 +262,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), ..Default::default() }, align_items: taffy::style::AlignItems::FlexStart, ..Default::default() @@ -283,7 +283,7 @@ mod measure { let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| { let height = known_dimensions.height.unwrap_or(50.0); let width = known_dimensions.width.unwrap_or(height); @@ -294,7 +294,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), height: taffy::style::Dimension::Points(100.0), @@ -316,7 +316,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50.0), ..Default::default() }, ..Default::default() }, @@ -327,7 +327,7 @@ mod measure { ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[child]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[child]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(child).unwrap().size.width, 50.0); @@ -339,7 +339,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { height: taffy::style::Dimension::Points(50.0), ..Default::default() }, ..Default::default() }, @@ -350,7 +350,7 @@ mod measure { ) .unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[child]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[child]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(taffy.layout(child).unwrap().size.width, 100.0); @@ -361,7 +361,7 @@ mod measure { fn flex_basis_overrides_measure() { let mut taffy = taffy::node::Taffy::new(); let child0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50.0), flex_grow: 1.0, ..Default::default() @@ -370,7 +370,7 @@ mod measure { let child1 = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { + taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50.0), flex_grow: 1.0, ..Default::default() @@ -384,7 +384,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200.0), height: taffy::style::Dimension::Points(100.0), @@ -408,7 +408,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(50.0), height: known_dimensions.height.unwrap_or(50.0), @@ -418,7 +418,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), height: taffy::style::Dimension::Points(100.0), @@ -440,10 +440,7 @@ mod measure { let mut taffy = taffy::node::Taffy::new(); let child = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { - position_type: taffy::style::PositionType::Absolute, - ..Default::default() - }, + taffy::style::Style { position_type: taffy::style::PositionType::Absolute, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| taffy::geometry::Size { width: known_dimensions.width.unwrap_or(50.0), height: known_dimensions.height.unwrap_or(50.0), @@ -453,7 +450,7 @@ mod measure { let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), height: taffy::style::Dimension::Points(100.0), @@ -473,11 +470,11 @@ mod measure { #[test] fn ignore_invalid_measure() { let mut taffy = taffy::node::Taffy::new(); - let child = taffy.new_leaf(taffy::style::FlexboxLayout { flex_grow: 1.0, ..Default::default() }).unwrap(); + let child = taffy.new_leaf(taffy::style::Style { flex_grow: 1.0, ..Default::default() }).unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100.0), height: taffy::style::Dimension::Points(100.0), @@ -503,7 +500,7 @@ mod measure { let grandchild = taffy .new_leaf_with_measure( - taffy::style::FlexboxLayout { ..Default::default() }, + taffy::style::Style { ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| { NUM_MEASURES.fetch_add(1, atomic::Ordering::SeqCst); taffy::geometry::Size { @@ -514,10 +511,9 @@ mod measure { ) .unwrap(); - let child = - taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[grandchild]).unwrap(); + let child = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[grandchild]).unwrap(); - let node = taffy.new_with_children(taffy::style::FlexboxLayout { ..Default::default() }, &[child]).unwrap(); + let node = taffy.new_with_children(taffy::style::Style { ..Default::default() }, &[child]).unwrap(); taffy.compute_layout(node, taffy::geometry::Size::MAX_CONTENT).unwrap(); assert_eq!(NUM_MEASURES.load(atomic::Ordering::SeqCst), 1); diff --git a/tests/relayout.rs b/tests/relayout.rs index 53a29a16a..1eef2539e 100644 --- a/tests/relayout.rs +++ b/tests/relayout.rs @@ -5,14 +5,14 @@ use taffy::style::Dimension; fn relayout() { let mut taffy = taffy::Taffy::new(); let node1 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: Dimension::Points(8f32), height: Dimension::Points(80f32) }, ..Default::default() }) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { align_self: taffy::prelude::AlignSelf::Center, size: taffy::geometry::Size { width: Dimension::Auto, height: Dimension::Auto }, // size: taffy::geometry::Size { width: Dimension::Percent(1.0), height: Dimension::Percent(1.0) }, @@ -23,7 +23,7 @@ fn relayout() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: Dimension::Percent(1f32), height: Dimension::Percent(1f32) }, ..Default::default() }, diff --git a/tests/root_constraints.rs b/tests/root_constraints.rs index 4c99b80ad..b12ecbc7f 100644 --- a/tests/root_constraints.rs +++ b/tests/root_constraints.rs @@ -6,7 +6,7 @@ mod root_constraints { fn root_with_percentage_size() { let mut taffy = taffy::node::Taffy::new(); let node = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1.0), height: taffy::style::Dimension::Percent(1.0), @@ -33,7 +33,7 @@ mod root_constraints { #[test] fn root_with_no_size() { let mut taffy = taffy::node::Taffy::new(); - let node = taffy.new_leaf(taffy::style::FlexboxLayout { ..Default::default() }).unwrap(); + let node = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); taffy .compute_layout( @@ -54,7 +54,7 @@ mod root_constraints { fn root_with_larger_size() { let mut taffy = taffy::node::Taffy::new(); let node = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200.0), height: taffy::style::Dimension::Points(200.0), diff --git a/tests/simple_child.rs b/tests/simple_child.rs index a56e9b31f..0098f681a 100644 --- a/tests/simple_child.rs +++ b/tests/simple_child.rs @@ -4,7 +4,7 @@ use taffy::{geometry::Point, layout::AvailableSpace, style::Dimension}; fn simple_child() { let mut taffy = taffy::Taffy::new(); let node0_0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { align_self: taffy::prelude::AlignSelf::Center, size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, ..Default::default() @@ -12,7 +12,7 @@ fn simple_child() { .unwrap(); let node0 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, ..Default::default() }, @@ -20,14 +20,14 @@ fn simple_child() { ) .unwrap(); let node1_0 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { align_self: taffy::prelude::AlignSelf::Center, size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, ..Default::default() }) .unwrap(); let node1_1 = taffy - .new_leaf(taffy::style::FlexboxLayout { + .new_leaf(taffy::style::Style { align_self: taffy::prelude::AlignSelf::Center, size: taffy::geometry::Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, ..Default::default() @@ -35,7 +35,7 @@ fn simple_child() { .unwrap(); let node1 = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: Dimension::Undefined, height: Dimension::Undefined }, ..Default::default() }, @@ -44,7 +44,7 @@ fn simple_child() { .unwrap(); let node = taffy .new_with_children( - taffy::style::FlexboxLayout { + taffy::style::Style { size: taffy::geometry::Size { width: Dimension::Percent(100.0), height: Dimension::Percent(100.0) }, ..Default::default() },