From 55abeaf2e7bbc9fe38a2fb09708fbbce5b6af90b Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Fri, 21 Apr 2023 23:02:49 +0200 Subject: [PATCH] Rename `Points`/`points` to `Length`/`length` in many APIs (#459) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ⚠️ This is a fairly disruptive breaking changes, although the fix for users is mostly search-and-replace. The old name for this one-dimensional length: * Suggests PostScript points, but is documented as an abstract unit: “Users of Taffy may define what they correspond to in their application (pixels, logical pixels, mm, etc) as they see fit.” * Is spelled similar to the two-dimensional `Point` though its meaning is unrelated. * In CSS syntax, `1px = 0.75pt` but the former is much more commonly used. When [parsing CSS into a `Style`](https://github.com/DioxusLabs/taffy/issues/440) we’ll probably want the default mapping to be `1px` => 1f32 abstract unit, so naming the abstract unit "points" would be confusing. --- README.md | 6 +- RELEASES.md | 26 ++++ benches/benches/flexbox.rs | 4 +- benches/benches/grid.rs | 10 +- benches/src/random_style.rs | 2 +- benches/src/yoga_helpers.rs | 2 +- docs/morphorm-style-properties.md | 2 +- examples/basic.rs | 2 +- examples/flexbox_gap.rs | 4 +- examples/grid_holy_grail.rs | 8 +- examples/nested.rs | 4 +- scripts/gentest/src/main.rs | 16 +-- scripts/gentest/test_helper.js | 32 ++--- src/compute/grid/explicit_grid.rs | 70 +++++----- src/compute/grid/types/grid_track.rs | 6 +- src/compute/grid/util/test_helpers.rs | 2 +- src/compute/mod.rs | 4 +- src/geometry.rs | 6 +- src/prelude.rs | 2 +- src/style/dimension.rs | 70 +++++----- src/style/grid.rs | 38 +++--- src/style_helpers.rs | 129 +++++++++--------- src/tree/taffy_tree/tree.rs | 2 +- src/util/resolve.rs | 72 +++++----- tests/border_and_padding.rs | 6 +- ...ct_ratio_overrides_height_of_full_inset.rs | 4 +- .../absolute_aspect_ratio_fill_height.rs | 4 +- ...ute_aspect_ratio_fill_height_from_inset.rs | 4 +- .../absolute_aspect_ratio_fill_max_height.rs | 6 +- .../absolute_aspect_ratio_fill_max_width.rs | 6 +- .../absolute_aspect_ratio_fill_min_height.rs | 6 +- .../absolute_aspect_ratio_fill_min_width.rs | 6 +- .../absolute_aspect_ratio_fill_width.rs | 4 +- ...lute_aspect_ratio_fill_width_from_inset.rs | 4 +- ...ute_aspect_ratio_height_overrides_inset.rs | 4 +- ...lute_aspect_ratio_width_overrides_inset.rs | 4 +- .../absolute_child_with_cross_margin.rs | 20 +-- .../absolute_child_with_main_margin.rs | 10 +- .../absolute_child_with_max_height.rs | 12 +- ...max_height_larger_shrinkable_grandchild.rs | 12 +- ..._align_items_and_justify_content_center.rs | 8 +- ...tify_content_center_and_bottom_position.rs | 10 +- ...ustify_content_center_and_left_position.rs | 10 +- ...stify_content_center_and_right_position.rs | 10 +- ...justify_content_center_and_top_position.rs | 10 +- ...lign_items_and_justify_content_flex_end.rs | 8 +- .../absolute_layout_align_items_center.rs | 8 +- ...layout_align_items_center_on_child_only.rs | 8 +- .../generated/absolute_layout_child_order.rs | 16 +-- ...layout_in_wrap_reverse_column_container.rs | 8 +- ..._wrap_reverse_column_container_flex_end.rs | 8 +- ...te_layout_in_wrap_reverse_row_container.rs | 8 +- ..._in_wrap_reverse_row_container_flex_end.rs | 8 +- .../absolute_layout_justify_content_center.rs | 8 +- tests/generated/absolute_layout_no_size.rs | 4 +- ...ercentage_bottom_based_on_parent_height.rs | 14 +- .../absolute_layout_percentage_height.rs | 10 +- ...lute_layout_row_width_height_end_bottom.rs | 12 +- .../absolute_layout_start_top_end_bottom.rs | 12 +- ...absolute_layout_width_height_end_bottom.rs | 12 +- .../absolute_layout_width_height_start_top.rs | 12 +- ...ayout_width_height_start_top_end_bottom.rs | 16 +-- .../absolute_layout_within_border.rs | 68 ++++----- .../generated/absolute_margin_bottom_left.rs | 12 +- .../absolute_minmax_bottom_right_max.rs | 16 +-- .../absolute_minmax_bottom_right_min_max.rs | 16 +-- ...e_minmax_bottom_right_min_max_preferred.rs | 20 +-- ...solute_minmax_top_left_bottom_right_max.rs | 16 +-- ...te_minmax_top_left_bottom_right_min_max.rs | 20 +-- ...olute_padding_border_overrides_max_size.rs | 20 +-- .../absolute_padding_border_overrides_size.rs | 20 +-- tests/generated/align_baseline.rs | 12 +- tests/generated/align_baseline_child.rs | 16 +-- .../generated/align_baseline_child_margin.rs | 32 ++--- .../align_baseline_child_margin_percent.rs | 16 +-- .../align_baseline_child_multiline.rs | 24 ++-- ...ild_multiline_no_override_on_secondline.rs | 28 ++-- ...align_baseline_child_multiline_override.rs | 28 ++-- .../generated/align_baseline_child_padding.rs | 32 ++--- tests/generated/align_baseline_child_top.rs | 18 +-- tests/generated/align_baseline_child_top2.rs | 18 +-- tests/generated/align_baseline_column.rs | 12 +- .../align_baseline_double_nested_child.rs | 20 +-- tests/generated/align_baseline_multiline.rs | 28 ++-- .../align_baseline_multiline_column.rs | 28 ++-- .../align_baseline_multiline_column2.rs | 28 ++-- ...align_baseline_multiline_row_and_column.rs | 28 ++-- .../generated/align_baseline_nested_child.rs | 16 +-- .../generated/align_baseline_nested_column.rs | 20 +-- ...ign_center_should_size_based_on_content.rs | 8 +- tests/generated/align_content_flex_end.rs | 24 ++-- tests/generated/align_content_flex_start.rs | 24 ++-- .../align_content_flex_start_with_flex.rs | 16 +-- ...t_flex_start_without_height_on_children.rs | 18 +-- ...nt_not_stretch_with_align_items_stretch.rs | 12 +- .../align_content_space_around_single_line.rs | 28 ++-- .../align_content_space_around_wrapped.rs | 28 ++-- ...align_content_space_between_single_line.rs | 28 ++-- .../align_content_space_between_wrapped.rs | 28 ++-- .../align_content_space_evenly_single_line.rs | 28 ++-- .../align_content_space_evenly_wrapped.rs | 28 ++-- tests/generated/align_content_spacearound.rs | 24 ++-- tests/generated/align_content_spacebetween.rs | 24 ++-- tests/generated/align_content_stretch.rs | 14 +- .../generated/align_content_stretch_column.rs | 14 +- ...t_stretch_is_not_overriding_align_items.rs | 8 +- tests/generated/align_content_stretch_row.rs | 14 +- ...align_content_stretch_row_with_children.rs | 14 +- ...n_content_stretch_row_with_fixed_height.rs | 16 +-- .../align_content_stretch_row_with_flex.rs | 14 +- ...content_stretch_row_with_flex_no_shrink.rs | 14 +- .../align_content_stretch_row_with_margin.rs | 30 ++-- ...ign_content_stretch_row_with_max_height.rs | 16 +-- ...ign_content_stretch_row_with_min_height.rs | 16 +-- .../align_content_stretch_row_with_padding.rs | 30 ++-- ...ign_content_stretch_row_with_single_row.rs | 8 +- ...lign_flex_start_with_shrinking_children.rs | 4 +- ...rt_with_shrinking_children_with_stretch.rs | 4 +- ...ign_flex_start_with_stretching_children.rs | 4 +- tests/generated/align_items_center.rs | 8 +- ...er_child_with_margin_bigger_than_parent.rs | 12 +- ...child_without_margin_bigger_than_parent.rs | 8 +- ...ign_items_center_justify_content_center.rs | 14 +- ...align_items_center_min_max_with_padding.rs | 16 +-- .../align_items_center_with_child_margin.rs | 10 +- .../align_items_center_with_child_top.rs | 10 +- tests/generated/align_items_flex_end.rs | 8 +- ...nd_child_with_margin_bigger_than_parent.rs | 12 +- ...child_without_margin_bigger_than_parent.rs | 8 +- tests/generated/align_items_flex_start.rs | 8 +- tests/generated/align_items_min_max.rs | 10 +- tests/generated/align_items_stretch.rs | 6 +- .../align_items_stretch_min_cross.rs | 6 +- tests/generated/align_self_baseline.rs | 16 +-- tests/generated/align_self_center.rs | 8 +- .../align_self_center_undefined_max_height.rs | 12 +- tests/generated/align_self_flex_end.rs | 8 +- ...align_self_flex_end_override_flex_start.rs | 8 +- tests/generated/align_self_flex_start.rs | 8 +- ...ign_stretch_should_size_based_on_parent.rs | 8 +- tests/generated/android_news_feed.rs | 38 +++--- .../aspect_ratio_flex_column_fill_height.rs | 6 +- ...spect_ratio_flex_column_fill_max_height.rs | 6 +- ...aspect_ratio_flex_column_fill_max_width.rs | 6 +- ...spect_ratio_flex_column_fill_min_height.rs | 6 +- ...aspect_ratio_flex_column_fill_min_width.rs | 6 +- .../aspect_ratio_flex_column_fill_width.rs | 6 +- ...spect_ratio_flex_column_fill_width_flex.rs | 6 +- ...t_ratio_flex_column_stretch_fill_height.rs | 6 +- ...tio_flex_column_stretch_fill_max_height.rs | 6 +- ...atio_flex_column_stretch_fill_max_width.rs | 6 +- ...ct_ratio_flex_column_stretch_fill_width.rs | 6 +- .../aspect_ratio_flex_row_fill_height.rs | 6 +- .../aspect_ratio_flex_row_fill_max_height.rs | 6 +- .../aspect_ratio_flex_row_fill_max_width.rs | 6 +- .../aspect_ratio_flex_row_fill_min_height.rs | 6 +- .../aspect_ratio_flex_row_fill_min_width.rs | 6 +- .../aspect_ratio_flex_row_fill_width.rs | 6 +- .../aspect_ratio_flex_row_fill_width_flex.rs | 6 +- ...pect_ratio_flex_row_stretch_fill_height.rs | 6 +- ..._ratio_flex_row_stretch_fill_max_height.rs | 6 +- ...t_ratio_flex_row_stretch_fill_max_width.rs | 6 +- ...spect_ratio_flex_row_stretch_fill_width.rs | 6 +- tests/generated/bevy_issue_7976_3_level.rs | 32 ++--- tests/generated/bevy_issue_7976_4_level.rs | 32 ++--- tests/generated/bevy_issue_7976_reduced.rs | 4 +- tests/generated/bevy_issue_8017.rs | 24 ++-- tests/generated/bevy_issue_8017_reduced.rs | 8 +- tests/generated/bevy_issue_8082.rs | 52 +++---- tests/generated/bevy_issue_8082_percent.rs | 20 +-- tests/generated/border_center_child.rs | 12 +- .../generated/border_container_match_child.rs | 12 +- tests/generated/border_flex_child.rs | 14 +- tests/generated/border_no_child.rs | 8 +- tests/generated/border_no_size.rs | 8 +- tests/generated/border_stretch_child.rs | 14 +- .../generated/child_min_max_width_flexing.rs | 10 +- .../generated/child_with_padding_align_end.rs | 16 +-- .../generated/container_with_unsized_child.rs | 4 +- tests/generated/display_none.rs | 4 +- .../generated/display_none_absolute_child.rs | 12 +- tests/generated/display_none_fixed_size.rs | 8 +- tests/generated/display_none_only_node.rs | 4 +- tests/generated/display_none_with_child.rs | 6 +- tests/generated/display_none_with_margin.rs | 16 +-- tests/generated/display_none_with_position.rs | 6 +- .../display_none_with_position_absolute.rs | 8 +- ...to_height_of_its_overflow_hidden_parent.rs | 12 +- ...x_basis_and_main_dimen_set_when_flexing.rs | 14 +- .../generated/flex_basis_flex_grow_column.rs | 6 +- tests/generated/flex_basis_flex_grow_row.rs | 6 +- .../flex_basis_flex_shrink_column.rs | 8 +- tests/generated/flex_basis_flex_shrink_row.rs | 8 +- .../flex_basis_larger_than_content_column.rs | 8 +- .../flex_basis_larger_than_content_row.rs | 8 +- .../flex_basis_overrides_main_size.rs | 12 +- ..._then_content_with_flex_grow_large_size.rs | 14 +- .../flex_basis_smaller_than_content_column.rs | 8 +- .../flex_basis_smaller_than_content_row.rs | 8 +- ...ex_basis_smaller_than_main_dimen_column.rs | 8 +- .../flex_basis_smaller_than_main_dimen_row.rs | 8 +- ..._then_content_with_flex_grow_large_size.rs | 14 +- ..._then_content_with_flex_grow_small_size.rs | 14 +- ...ontent_with_flex_grow_unconstraint_size.rs | 12 +- ..._content_with_flex_grow_very_large_size.rs | 14 +- .../flex_basis_unconstraint_column.rs | 4 +- .../generated/flex_basis_unconstraint_row.rs | 4 +- .../flex_basis_zero_undefined_main_size.rs | 6 +- .../flex_column_relative_all_sides.rs | 14 +- tests/generated/flex_direction_column.rs | 10 +- .../flex_direction_column_no_height.rs | 8 +- .../flex_direction_column_reverse.rs | 10 +- ...flex_direction_column_reverse_no_height.rs | 8 +- tests/generated/flex_direction_row.rs | 10 +- .../generated/flex_direction_row_no_width.rs | 8 +- tests/generated/flex_direction_row_reverse.rs | 10 +- tests/generated/flex_grow_child.rs | 4 +- .../flex_grow_flex_basis_percent_min_max.rs | 14 +- tests/generated/flex_grow_height_maximized.rs | 12 +- .../flex_grow_in_at_most_container.rs | 6 +- .../flex_grow_less_than_factor_one.rs | 6 +- tests/generated/flex_grow_root_minimized.rs | 14 +- tests/generated/flex_grow_shrink_at_most.rs | 4 +- tests/generated/flex_grow_to_min.rs | 8 +- ...flex_grow_within_constrained_max_column.rs | 8 +- .../flex_grow_within_constrained_max_row.rs | 10 +- .../flex_grow_within_constrained_max_width.rs | 8 +- ...flex_grow_within_constrained_min_column.rs | 4 +- ..._grow_within_constrained_min_max_column.rs | 6 +- .../flex_grow_within_constrained_min_row.rs | 6 +- tests/generated/flex_grow_within_max_width.rs | 8 +- tests/generated/flex_root_ignored.rs | 10 +- .../generated/flex_row_relative_all_sides.rs | 14 +- ...ex_shrink_by_outer_margin_with_max_size.rs | 10 +- ...flex_grow_child_flex_shrink_other_child.rs | 12 +- tests/generated/flex_shrink_flex_grow_row.rs | 12 +- tests/generated/flex_shrink_to_zero.rs | 14 +- .../flex_wrap_align_stretch_fits_one_row.rs | 8 +- ...ren_with_min_main_overriding_flex_basis.rs | 14 +- .../flex_wrap_wrap_to_child_height.rs | 10 +- .../generated/gap_column_gap_child_margins.rs | 18 +-- .../gap_column_gap_determines_parent_width.rs | 10 +- tests/generated/gap_column_gap_flexible.rs | 8 +- ...ap_column_gap_flexible_undefined_parent.rs | 6 +- tests/generated/gap_column_gap_inflexible.rs | 12 +- ..._column_gap_inflexible_undefined_parent.rs | 10 +- .../gap_column_gap_justify_center.rs | 12 +- .../gap_column_gap_justify_flex_end.rs | 12 +- .../gap_column_gap_justify_flex_start.rs | 12 +- .../gap_column_gap_justify_space_around.rs | 12 +- .../gap_column_gap_justify_space_between.rs | 12 +- .../gap_column_gap_justify_space_evenly.rs | 12 +- .../gap_column_gap_mixed_flexible.rs | 10 +- ..._percentage_cyclic_partially_shrinkable.rs | 12 +- ...column_gap_percentage_cyclic_shrinkable.rs | 12 +- ...lumn_gap_percentage_cyclic_unshrinkable.rs | 12 +- .../gap_column_gap_percentage_flexible.rs | 6 +- ...mn_gap_percentage_flexible_with_padding.rs | 14 +- .../gap_column_gap_percentage_inflexible.rs | 10 +- .../gap_column_gap_row_gap_wrapping.rs | 42 +++--- .../gap_column_gap_wrap_align_center.rs | 32 ++--- .../gap_column_gap_wrap_align_flex_end.rs | 32 ++--- .../gap_column_gap_wrap_align_flex_start.rs | 32 ++--- .../gap_column_gap_wrap_align_space_around.rs | 32 ++--- ...gap_column_gap_wrap_align_space_between.rs | 32 ++--- .../gap_column_gap_wrap_align_stretch.rs | 16 +-- .../generated/gap_column_row_gap_wrapping.rs | 42 +++--- .../gap_percentage_row_gap_wrapping.rs | 40 +++--- .../generated/gap_row_gap_align_items_end.rs | 20 +-- .../gap_row_gap_align_items_stretch.rs | 20 +-- .../gap_row_gap_column_child_margins.rs | 18 +-- .../gap_row_gap_determines_parent_height.rs | 10 +- .../gap_row_gap_row_wrap_child_margins.rs | 24 ++-- .../grid_absolute_align_self_sized_all.rs | 40 +++--- tests/generated/grid_absolute_column_end.rs | 20 +-- tests/generated/grid_absolute_column_start.rs | 20 +-- .../grid_absolute_container_bottom_left.rs | 16 +-- ...d_absolute_container_bottom_left_margin.rs | 28 ++-- ...absolute_container_left_overrides_right.rs | 18 +-- .../grid_absolute_container_left_right.rs | 16 +-- ...id_absolute_container_left_right_margin.rs | 24 ++-- ...id_absolute_container_negative_position.rs | 20 +-- ...lute_container_negative_position_margin.rs | 36 ++--- .../grid_absolute_container_top_bottom.rs | 16 +-- ...id_absolute_container_top_bottom_margin.rs | 24 ++-- .../grid_absolute_container_top_right.rs | 16 +-- ...rid_absolute_container_top_right_margin.rs | 24 ++-- .../grid_absolute_justify_self_sized_all.rs | 40 +++--- .../grid_absolute_layout_within_border.rs | 68 ++++----- ...id_absolute_layout_within_border_static.rs | 52 +++---- tests/generated/grid_absolute_row_end.rs | 20 +-- tests/generated/grid_absolute_row_start.rs | 20 +-- .../grid_absolute_top_overrides_bottom.rs | 18 +-- tests/generated/grid_absolute_with_padding.rs | 20 +-- .../grid_absolute_with_padding_and_margin.rs | 36 ++--- tests/generated/grid_align_content_center.rs | 8 +- tests/generated/grid_align_content_end.rs | 8 +- ...d_align_content_end_with_padding_border.rs | 24 ++-- .../grid_align_content_space_around.rs | 8 +- ...ontent_space_around_with_padding_border.rs | 24 ++-- .../grid_align_content_space_between.rs | 8 +- ...ntent_space_between_with_padding_border.rs | 24 ++-- .../grid_align_content_space_evenly.rs | 8 +- ...ontent_space_evenly_with_padding_border.rs | 24 ++-- tests/generated/grid_align_content_start.rs | 8 +- ...align_content_start_with_padding_border.rs | 24 ++-- tests/generated/grid_align_items_baseline.rs | 12 +- .../grid_align_items_baseline_child.rs | 16 +-- .../grid_align_items_baseline_child_margin.rs | 32 ++--- ...ign_items_baseline_child_margin_percent.rs | 16 +-- ...id_align_items_baseline_child_multiline.rs | 24 ++-- ...ild_multiline_no_override_on_secondline.rs | 28 ++-- ...items_baseline_child_multiline_override.rs | 28 ++-- ...grid_align_items_baseline_child_padding.rs | 32 ++--- .../grid_align_items_baseline_child_top.rs | 18 +-- .../grid_align_items_baseline_child_top2.rs | 18 +-- .../grid_align_items_baseline_complex.rs | 52 +++---- ...lign_items_baseline_double_nested_child.rs | 20 +-- .../grid_align_items_baseline_multiline.rs | 28 ++-- ...d_align_items_baseline_multiline_column.rs | 28 ++-- ...items_baseline_multiline_row_and_column.rs | 28 ++-- ...grid_align_items_baseline_nested_column.rs | 20 +-- .../grid_align_items_sized_center.rs | 16 +-- tests/generated/grid_align_items_sized_end.rs | 16 +-- .../generated/grid_align_items_sized_start.rs | 16 +-- .../grid_align_items_sized_stretch.rs | 16 +-- tests/generated/grid_align_self_sized_all.rs | 40 +++--- ...ct_ratio_overrides_height_of_full_inset.rs | 4 +- ...t_ratio_absolute_fill_height_from_inset.rs | 4 +- ...ct_ratio_absolute_fill_width_from_inset.rs | 4 +- ...t_ratio_absolute_height_overrides_inset.rs | 4 +- ...ct_ratio_absolute_width_overrides_inset.rs | 4 +- ..._aspect_ratio_child_fill_content_height.rs | 2 +- ...d_aspect_ratio_child_fill_content_width.rs | 2 +- .../grid_aspect_ratio_fill_child_height.rs | 6 +- ...grid_aspect_ratio_fill_child_max_height.rs | 6 +- .../grid_aspect_ratio_fill_child_max_width.rs | 6 +- ...grid_aspect_ratio_fill_child_min_height.rs | 6 +- .../grid_aspect_ratio_fill_child_min_width.rs | 6 +- .../grid_aspect_ratio_fill_child_width.rs | 6 +- ...spect_ratio_overriden_by_explicit_sizes.rs | 8 +- ..._ratio_overriden_by_explicit_sizes_flex.rs | 8 +- .../grid_auto_columns_fixed_width.rs | 8 +- tests/generated/grid_auto_fill_fixed_size.rs | 8 +- .../grid_auto_fill_with_empty_auto_track.rs | 8 +- .../grid_auto_fit_with_empty_auto_track.rs | 8 +- tests/generated/grid_auto_single_item.rs | 6 +- .../grid_auto_single_item_fixed_width.rs | 8 +- ...le_item_fixed_width_with_definite_width.rs | 8 +- .../grid_auto_takes_precedence_over_fr.rs | 6 +- tests/generated/grid_basic.rs | 8 +- tests/generated/grid_basic_implicit_tracks.rs | 8 +- tests/generated/grid_basic_with_overflow.rs | 8 +- tests/generated/grid_basic_with_padding.rs | 12 +- .../generated/grid_display_none_fixed_size.rs | 8 +- ...d_fit_content_percent_definite_argument.rs | 4 +- ...it_content_percent_definite_max_content.rs | 4 +- ...it_content_percent_definite_min_content.rs | 4 +- ...fit_content_percent_indefinite_argument.rs | 2 +- ..._content_percent_indefinite_max_content.rs | 2 +- ...t_percent_indefinite_max_content_hidden.rs | 2 +- ..._content_percent_indefinite_min_content.rs | 2 +- ...t_percent_indefinite_min_content_hidden.rs | 2 +- .../grid_fit_content_points_argument.rs | 4 +- .../grid_fit_content_points_max_content.rs | 4 +- .../grid_fit_content_points_min_content.rs | 4 +- ...d_fit_content_points_min_content_hidden.rs | 4 +- ...id_fr_fixed_size_no_content_proportions.rs | 4 +- ...d_size_no_content_proportions_sub_1_sum.rs | 4 +- .../grid_fr_fixed_size_single_item.rs | 10 +- .../grid_fr_no_sized_items_indefinite.rs | 4 +- .../grid_fr_single_item_indefinite.rs | 6 +- tests/generated/grid_fr_span_2_proportion.rs | 4 +- .../grid_fr_span_2_proportion_sub_1_sum.rs | 4 +- ...pan_2_proportion_with_non_spanned_track.rs | 4 +- .../grid_fr_span_2_proportion_zero_sum.rs | 4 +- ...portion_zero_sum_with_non_spanned_track.rs | 4 +- tests/generated/grid_gap.rs | 12 +- tests/generated/grid_hidden.rs | 8 +- .../generated/grid_justify_content_center.rs | 8 +- ...tify_content_center_with_padding_border.rs | 24 ++-- tests/generated/grid_justify_content_end.rs | 8 +- ...justify_content_end_with_padding_border.rs | 24 ++-- .../grid_justify_content_space_around.rs | 8 +- ...ontent_space_around_with_padding_border.rs | 24 ++-- .../grid_justify_content_space_between.rs | 8 +- ...ntent_space_between_with_padding_border.rs | 24 ++-- .../grid_justify_content_space_evenly.rs | 8 +- ...ontent_space_evenly_with_padding_border.rs | 24 ++-- tests/generated/grid_justify_content_start.rs | 8 +- ...stify_content_start_with_padding_border.rs | 24 ++-- .../grid_justify_items_sized_center.rs | 16 +-- .../generated/grid_justify_items_sized_end.rs | 16 +-- .../grid_justify_items_sized_start.rs | 16 +-- .../grid_justify_items_sized_stretch.rs | 16 +-- .../generated/grid_justify_self_sized_all.rs | 40 +++--- tests/generated/grid_margins_auto_margins.rs | 28 ++-- ...d_margins_auto_margins_override_stretch.rs | 12 +- tests/generated/grid_margins_fixed_center.rs | 24 ++-- tests/generated/grid_margins_fixed_end.rs | 24 ++-- tests/generated/grid_margins_fixed_start.rs | 24 ++-- tests/generated/grid_margins_fixed_stretch.rs | 24 ++-- .../generated/grid_margins_percent_center.rs | 8 +- tests/generated/grid_margins_percent_end.rs | 8 +- tests/generated/grid_margins_percent_start.rs | 8 +- .../generated/grid_margins_percent_stretch.rs | 8 +- .../grid_max_content_maximum_single_item.rs | 4 +- .../generated/grid_max_content_single_item.rs | 4 +- ...rid_max_content_single_item_margin_auto.rs | 4 +- ...id_max_content_single_item_margin_fixed.rs | 12 +- ..._max_content_single_item_margin_percent.rs | 4 +- .../grid_max_content_single_item_span_2.rs | 4 +- ...ax_content_single_item_span_2_gap_fixed.rs | 6 +- ...single_item_span_2_gap_percent_definite.rs | 6 +- ...ngle_item_span_2_gap_percent_indefinite.rs | 4 +- .../generated/grid_min_content_flex_column.rs | 2 +- tests/generated/grid_min_content_flex_row.rs | 2 +- .../grid_min_content_flex_single_item.rs | 6 +- ...in_content_flex_single_item_margin_auto.rs | 6 +- ...n_content_flex_single_item_margin_fixed.rs | 22 +-- ...content_flex_single_item_margin_percent.rs | 6 +- .../grid_min_content_maximum_single_item.rs | 4 +- .../generated/grid_min_content_single_item.rs | 4 +- .../generated/grid_minmax_auto_fixed_10px.rs | 4 +- .../generated/grid_minmax_auto_max_content.rs | 2 +- .../generated/grid_minmax_auto_min_content.rs | 2 +- .../grid_minmax_auto_percent_definite.rs | 4 +- .../grid_minmax_auto_percent_indefinite.rs | 2 +- ...d_minmax_column_fixed_width_above_range.rs | 6 +- ...d_minmax_column_fixed_width_below_range.rs | 6 +- ..._minmax_column_fixed_width_within_range.rs | 6 +- .../grid_minmax_column_indefinite.rs | 4 +- .../grid_minmax_column_with_auto_fixed.rs | 6 +- .../grid_minmax_column_with_fr_fixed.rs | 6 +- .../generated/grid_minmax_max_content_1fr.rs | 2 +- .../generated/grid_minmax_max_content_auto.rs | 2 +- .../grid_minmax_max_content_fixed_10px.rs | 4 +- .../grid_minmax_max_content_min_content.rs | 2 +- ...rid_minmax_max_content_percent_definite.rs | 4 +- ...d_minmax_max_content_percent_indefinite.rs | 2 +- .../generated/grid_minmax_min_content_1fr.rs | 2 +- .../generated/grid_minmax_min_content_auto.rs | 2 +- .../grid_minmax_min_content_fixed_10px.rs | 4 +- .../grid_minmax_min_content_max_content.rs | 2 +- ...rid_minmax_min_content_percent_definite.rs | 4 +- ...d_minmax_min_content_percent_indefinite.rs | 2 +- tests/generated/grid_out_of_order_items.rs | 20 +-- .../grid_overflow_inline_axis_hidden.rs | 4 +- .../grid_overflow_inline_axis_visible.rs | 4 +- tests/generated/grid_overflow_rows.rs | 4 +- ...ing_border_overrides_container_max_size.rs | 20 +-- ...padding_border_overrides_container_size.rs | 20 +-- .../grid_padding_border_overrides_max_size.rs | 20 +-- .../grid_padding_border_overrides_min_size.rs | 20 +-- .../grid_padding_border_overrides_size.rs | 20 +-- .../grid_percent_item_inside_stretch_item.rs | 4 +- ...t_items_nested_inside_stretch_alignment.rs | 2 +- .../grid_percent_items_nested_moderate.rs | 26 ++-- .../grid_percent_items_nested_with_margin.rs | 2 +- ...ercent_items_nested_with_padding_margin.rs | 36 ++--- .../grid_percent_items_width_and_margin.rs | 18 +-- .../grid_percent_items_width_and_padding.rs | 2 +- .../grid_percent_tracks_definite_overflow.rs | 4 +- .../grid_percent_tracks_definite_underflow.rs | 4 +- ...tracks_indefinite_with_content_overflow.rs | 4 +- ...racks_indefinite_with_content_underflow.rs | 4 +- .../generated/grid_placement_auto_negative.rs | 8 +- ...ndary_axis_with_fully_definite_negative.rs | 8 +- tests/generated/grid_relative_all_sides.rs | 14 +- .../generated/grid_relayout_vertical_text.rs | 2 +- tests/generated/grid_repeat_integer.rs | 8 +- tests/generated/grid_repeat_mixed.rs | 16 +-- .../generated/grid_size_child_fixed_tracks.rs | 12 +- ...13_most_non_flex_with_minmax_indefinite.rs | 14 +- ..._non_flex_with_minmax_indefinite_hidden.rs | 14 +- ...grid_span_2_max_content_auto_indefinite.rs | 2 +- ...an_2_max_content_auto_indefinite_hidden.rs | 2 +- ...max_content_fit_content_10px_indefinite.rs | 4 +- ...tent_fit_content_10px_indefinite_hidden.rs | 4 +- ...max_content_fit_content_80px_indefinite.rs | 4 +- ...tent_fit_content_80px_indefinite_hidden.rs | 4 +- ...an_2_max_content_max_content_indefinite.rs | 2 +- ...grid_span_2_min_content_auto_indefinite.rs | 2 +- ...an_2_min_content_auto_indefinite_hidden.rs | 2 +- ...min_content_fit_content_10px_indefinite.rs | 4 +- ...tent_fit_content_10px_indefinite_hidden.rs | 4 +- ...min_content_fit_content_30px_indefinite.rs | 4 +- ...tent_fit_content_30px_indefinite_hidden.rs | 4 +- ...min_content_fit_content_80px_indefinite.rs | 4 +- ...tent_fit_content_80px_indefinite_hidden.rs | 4 +- ...an_2_min_content_max_content_indefinite.rs | 2 +- ...an_2_min_content_min_content_indefinite.rs | 2 +- .../grid_span_6_all_non_flex_indefinite.rs | 6 +- ...d_span_6_all_non_flex_indefinite_hidden.rs | 6 +- .../grid_span_8_all_track_types_indefinite.rs | 6 +- tests/generated/gridflex_kitchen_sink.rs | 6 +- .../gridflex_kitchen_sink_minimise.rs | 4 +- .../gridflex_kitchen_sink_minimise2.rs | 6 +- .../gridflex_kitchen_sink_minimise3.rs | 6 +- .../justify_content_column_center.rs | 10 +- .../justify_content_column_flex_end.rs | 10 +- .../justify_content_column_flex_start.rs | 10 +- ...fy_content_column_max_height_and_margin.rs | 10 +- ...fy_content_column_min_height_and_margin.rs | 8 +- ...ent_column_min_height_and_margin_bottom.rs | 8 +- ...ontent_column_min_height_and_margin_top.rs | 8 +- .../justify_content_column_space_around.rs | 10 +- .../justify_content_column_space_between.rs | 10 +- .../justify_content_column_space_evenly.rs | 10 +- tests/generated/justify_content_min_max.rs | 10 +- ...padding_child_width_greater_than_parent.rs | 14 +- ...h_padding_child_width_lower_than_parent.rs | 14 +- .../justify_content_overflow_min_max.rs | 16 +-- tests/generated/justify_content_row_center.rs | 10 +- .../generated/justify_content_row_flex_end.rs | 10 +- .../justify_content_row_flex_start.rs | 10 +- ...ustify_content_row_max_width_and_margin.rs | 10 +- ...ustify_content_row_min_width_and_margin.rs | 8 +- .../justify_content_row_space_around.rs | 10 +- .../justify_content_row_space_between.rs | 10 +- .../justify_content_row_space_evenly.rs | 10 +- .../leaf_padding_border_overrides_max_size.rs | 20 +-- .../leaf_padding_border_overrides_min_size.rs | 20 +-- .../leaf_padding_border_overrides_size.rs | 20 +-- tests/generated/margin_and_flex_column.rs | 8 +- tests/generated/margin_and_flex_row.rs | 8 +- tests/generated/margin_and_stretch_column.rs | 8 +- tests/generated/margin_and_stretch_row.rs | 8 +- tests/generated/margin_auto_bottom.rs | 12 +- tests/generated/margin_auto_bottom_and_top.rs | 12 +- ...rgin_auto_bottom_and_top_justify_center.rs | 12 +- tests/generated/margin_auto_left.rs | 12 +- tests/generated/margin_auto_left_and_right.rs | 12 +- .../margin_auto_left_and_right_column.rs | 12 +- ...n_auto_left_and_right_column_and_center.rs | 12 +- .../margin_auto_left_and_right_stretch.rs | 12 +- ...rgin_auto_left_child_bigger_than_parent.rs | 8 +- ...left_fix_right_child_bigger_than_parent.rs | 10 +- ...uto_left_right_child_bigger_than_parent.rs | 8 +- .../margin_auto_left_stretching_child.rs | 8 +- .../margin_auto_mutiple_children_column.rs | 16 +-- .../margin_auto_mutiple_children_row.rs | 16 +-- tests/generated/margin_auto_right.rs | 12 +- tests/generated/margin_auto_top.rs | 12 +- .../margin_auto_top_and_bottom_stretch.rs | 12 +- .../margin_auto_top_stretching_child.rs | 8 +- tests/generated/margin_bottom.rs | 8 +- ...eft_auto_right_child_bigger_than_parent.rs | 10 +- tests/generated/margin_left.rs | 8 +- tests/generated/margin_right.rs | 8 +- ...margin_should_not_be_part_of_max_height.rs | 12 +- .../margin_should_not_be_part_of_max_width.rs | 12 +- tests/generated/margin_top.rs | 8 +- tests/generated/margin_with_sibling_column.rs | 6 +- tests/generated/margin_with_sibling_row.rs | 6 +- tests/generated/max_height.rs | 8 +- .../generated/max_height_overrides_height.rs | 4 +- .../max_height_overrides_height_on_root.rs | 4 +- tests/generated/max_width.rs | 8 +- tests/generated/max_width_overrides_width.rs | 4 +- .../max_width_overrides_width_on_root.rs | 4 +- tests/generated/measure_child_absolute.rs | 4 +- tests/generated/measure_child_constraint.rs | 2 +- ...measure_child_constraint_padding_parent.rs | 10 +- .../generated/measure_child_with_flex_grow.rs | 6 +- .../measure_child_with_flex_shrink.rs | 6 +- .../measure_child_with_flex_shrink_hidden.rs | 6 +- ...h_min_size_greater_than_available_space.rs | 4 +- .../measure_flex_basis_overrides_measure.rs | 4 +- .../measure_height_overrides_measure.rs | 2 +- .../measure_remeasure_child_after_growing.rs | 6 +- ...measure_remeasure_child_after_shrinking.rs | 6 +- ...easure_remeasure_child_after_stretching.rs | 4 +- .../measure_stretch_overrides_measure.rs | 8 +- .../measure_width_overrides_measure.rs | 2 +- tests/generated/min_height.rs | 6 +- .../min_height_larger_than_height.rs | 8 +- .../generated/min_height_overrides_height.rs | 4 +- .../min_height_overrides_height_on_root.rs | 4 +- .../min_height_overrides_max_height.rs | 4 +- .../min_height_with_nested_fixed_height.rs | 18 +-- .../min_max_percent_different_width_height.rs | 4 +- .../min_max_percent_no_width_height.rs | 4 +- tests/generated/min_width.rs | 6 +- .../generated/min_width_larger_than_width.rs | 8 +- .../min_width_overrides_max_width.rs | 4 +- tests/generated/min_width_overrides_width.rs | 4 +- .../min_width_overrides_width_on_root.rs | 4 +- tests/generated/nested_overflowing_child.rs | 8 +- ..._overflowing_child_in_constraint_parent.rs | 12 +- ...ly_shrinkable_item_with_flex_basis_zero.rs | 12 +- tests/generated/overflow_cross_axis.rs | 8 +- tests/generated/overflow_main_axis.rs | 6 +- .../overflow_main_axis_shrink_hidden.rs | 4 +- .../overflow_main_axis_shrink_visible.rs | 4 +- tests/generated/padding_align_end_child.rs | 16 +-- .../padding_border_overrides_max_size.rs | 20 +-- .../padding_border_overrides_min_size.rs | 20 +-- .../padding_border_overrides_size.rs | 20 +-- ...ding_border_overrides_size_flex_basis_0.rs | 28 ++-- ...er_overrides_size_flex_basis_0_growable.rs | 28 ++-- tests/generated/padding_center_child.rs | 16 +-- .../padding_container_match_child.rs | 12 +- tests/generated/padding_flex_child.rs | 14 +- tests/generated/padding_no_child.rs | 8 +- tests/generated/padding_no_size.rs | 8 +- tests/generated/padding_stretch_child.rs | 14 +- ...rent_wrap_child_size_overflowing_parent.rs | 10 +- tests/generated/percent_absolute_position.rs | 6 +- tests/generated/percent_within_flex_grow.rs | 8 +- .../generated/percentage_absolute_position.rs | 8 +- ...centage_container_in_wrapping_container.rs | 12 +- .../percentage_different_width_height.rs | 4 +- ...ercentage_different_width_height_column.rs | 4 +- tests/generated/percentage_flex_basis.rs | 4 +- .../generated/percentage_flex_basis_cross.rs | 4 +- .../percentage_flex_basis_cross_max_height.rs | 4 +- .../percentage_flex_basis_cross_max_width.rs | 4 +- .../percentage_flex_basis_cross_min_height.rs | 4 +- .../percentage_flex_basis_cross_min_width.rs | 4 +- .../percentage_flex_basis_main_max_height.rs | 4 +- .../percentage_flex_basis_main_max_width.rs | 4 +- .../percentage_flex_basis_main_min_width.rs | 4 +- tests/generated/percentage_main_max_height.rs | 8 +- ...in_should_calculate_based_only_on_width.rs | 8 +- .../percentage_moderate_complexity.rs | 26 ++-- .../percentage_moderate_complexity2.rs | 8 +- ...th_padding_margin_and_percentage_values.rs | 36 ++--- ...ng_should_calculate_based_only_on_width.rs | 8 +- .../percentage_position_bottom_right.rs | 4 +- .../generated/percentage_position_left_top.rs | 4 +- ...centage_size_based_on_parent_inner_size.rs | 12 +- .../percentage_size_of_flex_basis.rs | 6 +- ...sizes_should_not_prevent_flex_shrinking.rs | 4 +- tests/generated/percentage_width_height.rs | 4 +- ...th_rtl_should_position_withoutdirection.rs | 6 +- ...tive_position_should_not_nudge_siblings.rs | 12 +- ..._basis_flex_grow_row_prime_number_width.rs | 4 +- ...g_flex_basis_flex_grow_row_width_of_100.rs | 4 +- .../rounding_flex_basis_flex_shrink_row.rs | 10 +- ...rounding_flex_basis_overrides_main_size.rs | 12 +- tests/generated/rounding_fractial_input_1.rs | 12 +- tests/generated/rounding_fractial_input_2.rs | 12 +- tests/generated/rounding_fractial_input_3.rs | 12 +- tests/generated/rounding_fractial_input_4.rs | 12 +- tests/generated/rounding_fractial_input_5.rs | 12 +- tests/generated/rounding_fractial_input_6.rs | 18 +-- tests/generated/rounding_fractial_input_7.rs | 34 ++--- ...ounding_inner_node_controversy_combined.rs | 4 +- ...nding_inner_node_controversy_horizontal.rs | 10 +- ...ounding_inner_node_controversy_vertical.rs | 10 +- tests/generated/rounding_total_fractial.rs | 12 +- .../rounding_total_fractial_nested.rs | 24 ++-- tests/generated/simple_child.rs | 20 +-- .../single_flex_child_after_absolute_child.rs | 6 +- tests/generated/size_defined_by_child.rs | 4 +- .../size_defined_by_child_with_border.rs | 12 +- .../size_defined_by_child_with_padding.rs | 12 +- .../generated/size_defined_by_grand_child.rs | 4 +- .../undefined_height_with_min_max.rs | 8 +- .../generated/undefined_width_with_min_max.rs | 6 +- .../undefined_width_with_min_max_row.rs | 10 +- ..._then_content_with_flex_grow_large_size.rs | 14 +- ..._then_content_with_flex_grow_small_size.rs | 14 +- ...ontent_with_flex_grow_unconstraint_size.rs | 12 +- ..._content_with_flex_grow_very_large_size.rs | 14 +- tests/generated/wrap_child.rs | 4 +- tests/generated/wrap_column.rs | 20 +-- tests/generated/wrap_grandchild.rs | 4 +- ..._nodes_with_content_sizing_margin_cross.rs | 16 +-- ..._with_content_sizing_overflowing_margin.rs | 16 +-- tests/generated/wrap_reverse_column.rs | 20 +-- .../wrap_reverse_column_fixed_size.rs | 24 ++-- tests/generated/wrap_reverse_row.rs | 18 +-- .../wrap_reverse_row_align_content_center.rs | 22 +-- ...ap_reverse_row_align_content_flex_start.rs | 22 +-- ..._reverse_row_align_content_space_around.rs | 22 +-- .../wrap_reverse_row_align_content_stretch.rs | 22 +-- ..._reverse_row_single_line_different_size.rs | 22 +-- tests/generated/wrap_row.rs | 18 +-- .../generated/wrap_row_align_items_center.rs | 18 +-- .../wrap_row_align_items_flex_end.rs | 18 +-- tests/generated/wrapped_column_max_height.rs | 26 ++-- .../wrapped_column_max_height_flex.rs | 26 ++-- .../wrapped_row_within_align_items_center.rs | 12 +- ...wrapped_row_within_align_items_flex_end.rs | 12 +- ...apped_row_within_align_items_flex_start.rs | 12 +- tests/measure.rs | 46 +++---- tests/min_max_overrides.rs | 14 +- tests/relayout.rs | 26 ++-- tests/root_constraints.rs | 4 +- tests/rounding.rs | 4 +- tests/serde.rs | 14 +- 693 files changed, 4274 insertions(+), 4251 deletions(-) diff --git a/README.md b/README.md index f4c176a9a..71c48f752 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ let mut taffy = Taffy::new(); let header_node = taffy .new_leaf( Style { - size: Size { width: points(800.0), height: points(100.0) }, + size: Size { width: length(800.0), height: length(100.0) }, ..Default::default() }, ).unwrap(); @@ -36,7 +36,7 @@ let header_node = taffy let body_node = taffy .new_leaf( Style { - size: Size { width: points(800.0), height: auto() }, + size: Size { width: length(800.0), height: auto() }, flex_grow: 1.0, ..Default::default() }, @@ -46,7 +46,7 @@ let root_node = taffy .new_with_children( Style { flex_direction: FlexDirection::Column, - size: Size { width: points(800.0), height: points(600.0) }, + size: Size { width: length(800.0), height: length(600.0) }, ..Default::default() }, &[header_node, body_node], diff --git a/RELEASES.md b/RELEASES.md index ad9572db4..b7260ffe1 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -2,6 +2,32 @@ ## Unreleased +### Breaking + +Many APIs have been renamed to replace `points` or `Points` with `length` or `Length`. +This new name better describes one-dimentional measure of space in some unspecified unit +which is often unrelated to the PostScript point or the CSS `pt` unit. + +This also removes a misleading similarity with the 2D `Point`, +whose components can have any unit and are not even necessarily absolute lengths. + +Example usage change: + +```diff + use taffy::prelude::*; + + // … + + let header_node = taffy + .new_leaf( + Style { +- size: Size { width: points(800.0), height: points(100.0) }, ++ size: Size { width: length(800.0), height: length(100.0) }, + ..Default::default() + }, + ).unwrap(); +``` + ### Removed - `layout_flexbox()` has been removed from the prelude. Use `FlexboxAlgorithm::perform_layout()` instead. diff --git a/benches/benches/flexbox.rs b/benches/benches/flexbox.rs index 72b78a2e8..dcd311660 100644 --- a/benches/benches/flexbox.rs +++ b/benches/benches/flexbox.rs @@ -97,7 +97,7 @@ fn build_yoga_deep_hierarchy(node_count: u32, branching_factor: u32) -> (yg::Yog /// A deep tree that matches the shape and styling that yoga use on their benchmarks fn build_taffy_huge_nested_hierarchy(node_count: u32, branching_factor: u32) -> (Taffy, NodeId) { let style = Style { - size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) }, + size: Size { width: Dimension::Length(10.0), height: Dimension::Length(10.0) }, flex_grow: 1.0, ..Default::default() }; @@ -115,7 +115,7 @@ fn build_taffy_huge_nested_hierarchy(node_count: u32, branching_factor: u32) -> /// A deep tree that matches the shape and styling that yoga use on their benchmarks fn build_yoga_huge_nested_hierarchy(node_count: u32, branching_factor: u32) -> (yg::YogaTree, yg::NodeId) { let style = Style { - size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) }, + size: Size { width: Dimension::Length(10.0), height: Dimension::Length(10.0) }, flex_grow: 1.0, ..Default::default() }; diff --git a/benches/benches/grid.rs b/benches/benches/grid.rs index b13a81b27..19f74362f 100644 --- a/benches/benches/grid.rs +++ b/benches/benches/grid.rs @@ -8,7 +8,7 @@ use taffy::style::Style; /// Build a random leaf node fn build_random_leaf(taffy: &mut Taffy, _rng: &mut ChaCha8Rng) -> NodeId { - taffy.new_with_children(Style { size: points(20.0), ..Default::default() }, &[]).unwrap() + taffy.new_with_children(Style { size: length(20.0), ..Default::default() }, &[]).unwrap() } fn random_grid_track(rng: &mut R) -> TrackSizingFunction { @@ -22,9 +22,9 @@ fn random_grid_track(rng: &mut R) -> TrackSizingFunction { } else if switch < 0.5 { fr(1.0) } else if switch < 0.6 { - minmax(points(0.0), fr(1.0)) + minmax(length(0.0), fr(1.0)) } else if switch < 0.8 { - points(40.0) + length(40.0) } else { percent(0.3) } @@ -110,7 +110,7 @@ fn taffy_benchmarks(c: &mut Criterion) { |b, &track_count| { b.iter_batched( || build_grid_flat_hierarchy(track_count, track_count), - |(mut taffy, root)| taffy.compute_layout(root, points(12000.0)).unwrap(), + |(mut taffy, root)| taffy.compute_layout(root, length(12000.0)).unwrap(), criterion::BatchSize::SmallInput, ) }, @@ -128,7 +128,7 @@ fn taffy_benchmarks(c: &mut Criterion) { |b, &(levels, tracks)| { b.iter_batched( || build_taffy_deep_grid_hierarchy(levels, tracks), - |(mut taffy, root)| taffy.compute_layout(root, points(12000.0)).unwrap(), + |(mut taffy, root)| taffy.compute_layout(root, length(12000.0)).unwrap(), criterion::BatchSize::SmallInput, ) }, diff --git a/benches/src/random_style.rs b/benches/src/random_style.rs index d86a96ded..f7ef6154c 100644 --- a/benches/src/random_style.rs +++ b/benches/src/random_style.rs @@ -26,7 +26,7 @@ impl Randomizeable for Dimension { if switch < 0.2 { Dimension::Auto } else if switch < 0.8 { - Dimension::Points(rng.gen_range(0.0..500.0)) + Dimension::Length(rng.gen_range(0.0..500.0)) } else { Dimension::Percent(rng.gen_range(0.0..1.0)) } diff --git a/benches/src/yoga_helpers.rs b/benches/src/yoga_helpers.rs index b4272e05a..706d9c03d 100644 --- a/benches/src/yoga_helpers.rs +++ b/benches/src/yoga_helpers.rs @@ -41,7 +41,7 @@ pub fn new_with_children( fn into_yg_units(dim: impl Into) -> yg::StyleUnit { match dim.into() { tf::Dimension::Auto => yg::StyleUnit::Auto, - tf::Dimension::Points(val) => yg::StyleUnit::Point(yg::OrderedFloat(val)), + tf::Dimension::Length(val) => yg::StyleUnit::Point(yg::OrderedFloat(val)), tf::Dimension::Percent(val) => yg::StyleUnit::Percent(yg::OrderedFloat(val)), } } diff --git a/docs/morphorm-style-properties.md b/docs/morphorm-style-properties.md index 08c2318f7..b220be1d0 100644 --- a/docs/morphorm-style-properties.md +++ b/docs/morphorm-style-properties.md @@ -25,7 +25,7 @@ pub enum PositionType { ```rust pub enum Units { - Pixels(f32), // = Dimension::Points + Pixels(f32), // = Dimension::Length Percentage(f32), // = Dimension::Percent Auto, // = Dimension::Auto Stretch(f32), // No equivalent in Taffy! diff --git a/examples/basic.rs b/examples/basic.rs index 1c5435ecb..888fd8164 100644 --- a/examples/basic.rs +++ b/examples/basic.rs @@ -10,7 +10,7 @@ fn main() -> Result<(), taffy::TaffyError> { let node = taffy.new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, justify_content: Some(JustifyContent::Center), ..Default::default() }, diff --git a/examples/flexbox_gap.rs b/examples/flexbox_gap.rs index c6ccc807c..0616527c6 100644 --- a/examples/flexbox_gap.rs +++ b/examples/flexbox_gap.rs @@ -6,13 +6,13 @@ use taffy::prelude::*; fn main() -> Result<(), taffy::TaffyError> { let mut taffy = Taffy::new(); - let child_style = Style { size: Size { width: points(20.0), height: points(20.0) }, ..Default::default() }; + let child_style = Style { size: Size { width: length(20.0), height: length(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( - Style { gap: Size { width: points(10.0), height: zero() }, ..Default::default() }, + Style { gap: Size { width: length(10.0), height: zero() }, ..Default::default() }, &[child0, child1, child2], )?; diff --git a/examples/grid_holy_grail.rs b/examples/grid_holy_grail.rs index 74989fc7e..1c95a9238 100644 --- a/examples/grid_holy_grail.rs +++ b/examples/grid_holy_grail.rs @@ -24,9 +24,9 @@ fn main() -> Result<(), taffy::TaffyError> { // Setup the grid let root_style = Style { display: Display::Grid, - size: Size { width: points(800.0), height: points(600.0) }, - grid_template_columns: vec![points(250.0), fr(1.0), points(250.0)], - grid_template_rows: vec![points(150.0), fr(1.0), points(150.0)], + size: Size { width: length(800.0), height: length(600.0) }, + grid_template_columns: vec![length(250.0), fr(1.0), length(250.0)], + grid_template_rows: vec![length(150.0), fr(1.0), length(150.0)], ..default() }; @@ -41,7 +41,7 @@ fn main() -> Result<(), taffy::TaffyError> { let root = taffy.new_with_children(root_style, &[header, left_sidebar, content_area, right_sidebar, footer])?; // Compute layout and print result - taffy.compute_layout(root, Size { width: points(800.0), height: points(600.0) })?; + taffy.compute_layout(root, Size { width: length(800.0), height: length(600.0) })?; taffy::util::print_tree(&taffy, root); Ok(()) diff --git a/examples/nested.rs b/examples/nested.rs index 11de50dd7..1e0d6bbde 100644 --- a/examples/nested.rs +++ b/examples/nested.rs @@ -5,7 +5,7 @@ fn main() -> Result<(), taffy::TaffyError> { // left let child_t1 = taffy.new_leaf(Style { - size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, + size: Size { width: Dimension::Length(5.0), height: Dimension::Length(5.0) }, ..Default::default() })?; @@ -20,7 +20,7 @@ fn main() -> Result<(), taffy::TaffyError> { // right let child_t2 = taffy.new_leaf(Style { - size: Size { width: Dimension::Points(5.0), height: Dimension::Points(5.0) }, + size: Size { width: Dimension::Length(5.0), height: Dimension::Length(5.0) }, ..Default::default() })?; diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs index 18d3ee0d1..c7f78e81b 100644 --- a/scripts/gentest/src/main.rs +++ b/scripts/gentest/src/main.rs @@ -643,9 +643,9 @@ fn generate_length_percentage(dimen: &serde_json::Map) -> TokenSt match unit { Value::String(ref unit) => match unit.as_ref() { - "points" => { + "px" => { let value = value(); - quote!(taffy::style::LengthPercentage::Points(#value)) + quote!(taffy::style::LengthPercentage::Length(#value)) } "percent" => { let value = value(); @@ -664,9 +664,9 @@ fn generate_length_percentage_auto(dimen: &serde_json::Map) -> To match unit { Value::String(ref unit) => match unit.as_ref() { "auto" => quote!(taffy::style::LengthPercentageAuto::Auto), - "points" => { + "px" => { let value = value(); - quote!(taffy::style::LengthPercentageAuto::Points(#value)) + quote!(taffy::style::LengthPercentageAuto::Length(#value)) } "percent" => { let value = value(); @@ -685,9 +685,9 @@ fn generate_dimension(dimen: &serde_json::Map) -> TokenStream { match unit { Value::String(ref unit) => match unit.as_ref() { "auto" => quote!(taffy::style::Dimension::Auto), - "points" => { + "px" => { let value = value(); - quote!(taffy::style::Dimension::Points(#value)) + quote!(taffy::style::Dimension::Length(#value)) } "percent" => { let value = value(); @@ -817,10 +817,10 @@ fn generate_scalar_definition(track_definition: &serde_json::Map) "auto" => quote!(auto()), "min-content" => quote!(min_content()), "max-content" => quote!(max_content()), - "points" | "percent" | "fraction" => { + "px" | "percent" | "fraction" => { let value = value(); match unit() { - "points" => quote!(points(#value)), + "px" => quote!(length(#value)), "percent" => quote!(percent(#value)), "fraction" => quote!(fr(#value)), _ => unreachable!(), diff --git a/scripts/gentest/test_helper.js b/scripts/gentest/test_helper.js index 1b233a1e3..c3e9cbcb2 100644 --- a/scripts/gentest/test_helper.js +++ b/scripts/gentest/test_helper.js @@ -36,7 +36,7 @@ class TrackSizingParser { // console.debug(this.index, char); // Skip whitespace - if (char === ' ') { this.index++; continue;} + if (char === ' ') { this.index++; continue; } if (TrackSizingParser.INITIAL_CHAR_REGEX.test(char)) { const token = this._parseItem(); @@ -51,7 +51,7 @@ class TrackSizingParser { } } - throw new Error (`Invalid start of token ${char}`); + throw new Error(`Invalid start of token ${char}`); } } @@ -98,9 +98,9 @@ function parseRepetition(input) { } function parseDimension(input, options = { allowFrUnits: false }) { - if (options.allowFrUnits && input.endsWith('fr')) return { unit: 'fraction', value: parseFloat(input.replace('fr','')) }; - if (input.endsWith('px')) return { unit: 'points', value: parseFloat(input.replace('px','')) }; - if (input.endsWith('%')) return { unit: 'percent', value: parseFloat(input.replace('%','')) / 100 }; + if (options.allowFrUnits && input.endsWith('fr')) return { unit: 'fraction', value: parseFloat(input.replace('fr', '')) }; + if (input.endsWith('px')) return { unit: 'px', value: parseFloat(input.replace('px', '')) }; + if (input.endsWith('%')) return { unit: 'percent', value: parseFloat(input.replace('%', '')) / 100 }; if (input === 'auto') return { unit: 'auto' }; if (input === 'min-content') return { unit: 'min-content' }; if (input === 'max-content') return { unit: 'max-content' }; @@ -136,7 +136,7 @@ function parseEdges(edges) { const right = parseDimension(edges.right); const top = parseDimension(edges.top); const bottom = parseDimension(edges.bottom); - + if (!left && !right && !top && !bottom) return undefined; return { left, right, top, bottom }; } @@ -144,7 +144,7 @@ function parseEdges(edges) { function parseSize(size) { const width = parseDimension(size.width); const height = parseDimension(size.height); - + if (!width && !height) return undefined; return { width, height }; } @@ -155,7 +155,7 @@ function parseGaps(style) { return { row: gaps[0], column: gaps[1] ?? gaps[0] }; } if (style.rowGap || style.columnGap) { - return { row: parseDimension(style.rowGap), column: parseDimension(style.columnGap) } + return { row: parseDimension(style.rowGap), column: parseDimension(style.columnGap) }; } return undefined; } @@ -174,9 +174,9 @@ function parseGridAutoFlow(input) { } function parseGridPosition(input) { - if (input === 'auto') return { kind: 'auto' } - if (/^span +\d+$/.test(input)) return { kind: 'span', value: parseInt(input.replace(/[^\d]/g, ''), 10)} - if (/^-?\d+$/.test(input)) return { kind: 'line', value: parseInt(input, 10)} + if (input === 'auto') return { kind: 'auto' }; + if (/^span +\d+$/.test(input)) return { kind: 'span', value: parseInt(input.replace(/[^\d]/g, ''), 10) }; + if (/^-?\d+$/.test(input)) return { kind: 'line', value: parseInt(input, 10) }; return undefined; } @@ -226,9 +226,9 @@ function describeElement(e) { gap: parseGaps(e.style), - size: parseSize({width: e.style.width, height: e.style.height}), - minSize: parseSize({width: e.style.minWidth, height: e.style.minHeight}), - maxSize: parseSize({width: e.style.maxWidth, height: e.style.maxHeight}), + size: parseSize({ width: e.style.width, height: e.style.height }), + minSize: parseSize({ width: e.style.minWidth, height: e.style.minHeight }), + maxSize: parseSize({ width: e.style.maxWidth, height: e.style.maxHeight }), aspectRatio: parseRatio(e.style.aspectRatio), margin: parseEdges({ @@ -295,7 +295,7 @@ function describeElement(e) { useRounding: e.getAttribute("data-test-rounding") !== "false", children: Array.from(e.children).map(c => describeElement(c)), - } + }; } // Useful when developing this script. Logs the parsed style to the console when any test fixture is opened in a browser. @@ -305,4 +305,4 @@ window.onload = function () { } catch (e) { console.error(e); } -} +}; diff --git a/src/compute/grid/explicit_grid.rs b/src/compute/grid/explicit_grid.rs index b834c2cc6..9cf90dc67 100644 --- a/src/compute/grid/explicit_grid.rs +++ b/src/compute/grid/explicit_grid.rs @@ -306,9 +306,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(120.0), height: points(80.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], + size: Size { width: length(120.0), height: length(80.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -322,9 +322,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(140.0), height: points(90.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], + size: Size { width: length(140.0), height: length(90.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -338,9 +338,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - min_size: Size { width: points(120.0), height: points(80.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], + min_size: Size { width: length(120.0), height: length(80.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -354,9 +354,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - min_size: Size { width: points(140.0), height: points(90.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], + min_size: Size { width: length(140.0), height: length(90.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -370,9 +370,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(140.0), height: points(100.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0), points(20.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0), points(10.0)])], + size: Size { width: length(140.0), height: length(100.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0), length(20.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0), length(10.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -386,10 +386,10 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(140.0), height: points(100.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], - gap: points(20.0), + size: Size { width: length(140.0), height: length(100.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], + gap: length(20.0), ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -403,9 +403,9 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - grid_template_columns: vec![repeat(AutoFill, vec![points(40.0), percent(0.5), points(20.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], - gap: points(20.0), + grid_template_columns: vec![repeat(AutoFill, vec![length(40.0), percent(0.5), length(20.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], + gap: length(20.0), ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -419,10 +419,10 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(140.0), height: points(100.0) }, - grid_template_columns: vec![points(20.0), repeat(AutoFill, vec![points(40.0)])], - grid_template_rows: vec![points(40.0), repeat(AutoFill, vec![points(20.0)])], - gap: points(20.0), + size: Size { width: length(140.0), height: length(100.0) }, + grid_template_columns: vec![length(20.0), repeat(AutoFill, vec![length(40.0)])], + grid_template_rows: vec![length(40.0), repeat(AutoFill, vec![length(20.0)])], + gap: length(20.0), ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -436,10 +436,10 @@ mod test { use GridTrackRepetition::AutoFill; let grid_style = Style { display: Display::Grid, - size: Size { width: points(120.0), height: points(120.0) }, - padding: Rect { left: points(10.0), right: points(10.0), top: points(20.0), bottom: points(20.0) }, - grid_template_columns: vec![repeat(AutoFill, vec![points(20.0)])], - grid_template_rows: vec![repeat(AutoFill, vec![points(20.0)])], + size: Size { width: length(120.0), height: length(120.0) }, + padding: Rect { left: length(10.0), right: length(10.0), top: length(20.0), bottom: length(20.0) }, + grid_template_columns: vec![repeat(AutoFill, vec![length(20.0)])], + grid_template_rows: vec![repeat(AutoFill, vec![length(20.0)])], ..Default::default() }; let width = compute_explicit_grid_size_in_axis(&grid_style, AbsoluteAxis::Horizontal); @@ -450,15 +450,15 @@ mod test { #[test] fn test_initialize_grid_tracks() { - let px0 = LengthPercentage::Points(0.0); - let px20 = LengthPercentage::Points(20.0); - let px100 = LengthPercentage::Points(100.0); + let px0 = LengthPercentage::Length(0.0); + let px20 = LengthPercentage::Length(20.0); + let px100 = LengthPercentage::Length(100.0); // Setup test - let track_template = vec![points(100.0), minmax(points(100.0), fr(2.0)), fr(1.0)]; + let track_template = vec![length(100.0), minmax(length(100.0), fr(2.0)), fr(1.0)]; let track_counts = TrackCounts { negative_implicit: 3, explicit: track_template.len() as u16, positive_implicit: 3 }; - let auto_tracks = vec![auto(), points(100.0)]; + let auto_tracks = vec![auto(), length(100.0)]; let gap = px20; // Call function diff --git a/src/compute/grid/types/grid_track.rs b/src/compute/grid/types/grid_track.rs index 685d79b59..277314bad 100644 --- a/src/compute/grid/types/grid_track.rs +++ b/src/compute/grid/types/grid_track.rs @@ -101,8 +101,8 @@ impl GridTrack { /// to fixed zero-sized sizing functions. pub fn collapse(&mut self) { self.is_collapsed = true; - self.min_track_sizing_function = MinTrackSizingFunction::Fixed(LengthPercentage::Points(0.0)); - self.max_track_sizing_function = MaxTrackSizingFunction::Fixed(LengthPercentage::Points(0.0)); + self.min_track_sizing_function = MinTrackSizingFunction::Fixed(LengthPercentage::Length(0.0)); + self.max_track_sizing_function = MaxTrackSizingFunction::Fixed(LengthPercentage::Length(0.0)); } #[inline(always)] @@ -127,7 +127,7 @@ impl GridTrack { /// Returns true if the track is flexible (has a Flex MaxTrackSizingFunction), else false. pub fn fit_content_limit(&self, axis_available_grid_space: Option) -> f32 { match self.max_track_sizing_function { - MaxTrackSizingFunction::FitContent(LengthPercentage::Points(limit)) => limit, + MaxTrackSizingFunction::FitContent(LengthPercentage::Length(limit)) => limit, MaxTrackSizingFunction::FitContent(LengthPercentage::Percent(fraction)) => { match axis_available_grid_space { Some(space) => space * fraction, diff --git a/src/compute/grid/util/test_helpers.rs b/src/compute/grid/util/test_helpers.rs index 16239064e..856b6a8cb 100644 --- a/src/compute/grid/util/test_helpers.rs +++ b/src/compute/grid/util/test_helpers.rs @@ -10,7 +10,7 @@ impl CreateParentTestNode for (f32, f32, i32, i32) { fn into_grid(self) -> Style { Style { display: Display::Grid, - size: Size { width: Dimension::Points(self.0), height: Dimension::Points(self.1) }, + size: Size { width: Dimension::Length(self.0), height: Dimension::Length(self.1) }, grid_template_columns: vec![fr(1f32); self.2 as usize], grid_template_rows: vec![fr(1f32); self.3 as usize], ..Default::default() diff --git a/src/compute/mod.rs b/src/compute/mod.rs index 52205ca07..778f80c67 100644 --- a/src/compute/mod.rs +++ b/src/compute/mod.rs @@ -106,7 +106,7 @@ mod tests { fn hidden_layout_should_hide_recursively() { let mut taffy = Taffy::new(); - let style: Style = Style { display: Display::Flex, size: Size::from_points(50.0, 50.0), ..Default::default() }; + let style: Style = Style { display: Display::Flex, size: Size::from_lengths(50.0, 50.0), ..Default::default() }; let grandchild_00 = taffy.new_leaf(style.clone()).unwrap(); let grandchild_01 = taffy.new_leaf(style.clone()).unwrap(); @@ -117,7 +117,7 @@ mod tests { let root = taffy .new_with_children( - Style { display: Display::None, size: Size::from_points(50.0, 50.0), ..Default::default() }, + Style { display: Display::None, size: Size::from_lengths(50.0, 50.0), ..Default::default() }, &[child_00, child_01], ) .unwrap(); diff --git a/src/geometry.rs b/src/geometry.rs index b707f5642..95438b86d 100644 --- a/src/geometry.rs +++ b/src/geometry.rs @@ -555,10 +555,10 @@ impl Size> { } impl Size { - /// Generates a [`Size`] using [`Dimension::Points`] values + /// Generates a [`Size`] using [`Dimension::Length`] values #[must_use] - pub const fn from_points(width: f32, height: f32) -> Self { - Size { width: Dimension::Points(width), height: Dimension::Points(height) } + pub const fn from_lengths(width: f32, height: f32) -> Self { + Size { width: Dimension::Length(width), height: Dimension::Length(height) } } /// Generates a [`Size`] using [`Dimension::Percent`] values diff --git a/src/prelude.rs b/src/prelude.rs index cad2615ae..27a5a0d4e 100644 --- a/src/prelude.rs +++ b/src/prelude.rs @@ -7,7 +7,7 @@ pub use crate::{ JustifySelf, LengthPercentage, LengthPercentageAuto, Position, Style, }, style_helpers::{ - auto, fit_content, max_content, min_content, percent, points, zero, FromFlex, FromPercent, FromPoints, + auto, fit_content, length, max_content, min_content, percent, zero, FromFlex, FromLength, FromPercent, TaffyAuto, TaffyFitContent, TaffyMaxContent, TaffyMinContent, TaffyZero, }, tree::{Layout, LayoutTree, NodeId}, diff --git a/src/style/dimension.rs b/src/style/dimension.rs index e974e1ab7..8383c534e 100644 --- a/src/style/dimension.rs +++ b/src/style/dimension.rs @@ -1,7 +1,7 @@ //! Style types for representing lengths / sizes use crate::geometry::{Rect, Size}; -use crate::style_helpers::{FromPercent, FromPoints, TaffyAuto, TaffyMaxContent, TaffyMinContent, TaffyZero}; +use crate::style_helpers::{FromLength, FromPercent, TaffyAuto, TaffyMaxContent, TaffyMinContent, TaffyZero}; use crate::util::sys::abs; /// A unit of linear measurement @@ -10,18 +10,18 @@ use crate::util::sys::abs; #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum LengthPercentage { - /// Points are abstract absolute units. Users of Taffy may define what they correspond + /// An absolute length in some abstract units. Users of Taffy may define what they correspond /// to in their application (pixels, logical pixels, mm, etc) as they see fit. - Points(f32), + Length(f32), /// The dimension is stored in percentage relative to the parent item. Percent(f32), } impl TaffyZero for LengthPercentage { - const ZERO: Self = Self::Points(0.0); + const ZERO: Self = Self::Length(0.0); } -impl FromPoints for LengthPercentage { - fn from_points + Copy>(points: Input) -> Self { - Self::Points(points.into()) +impl FromLength for LengthPercentage { + fn from_length + Copy>(value: Input) -> Self { + Self::Length(value.into()) } } impl FromPercent for LengthPercentage { @@ -36,23 +36,23 @@ impl FromPercent for LengthPercentage { #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum LengthPercentageAuto { - /// Points are abstract absolute units. Users of Taffy may define what they correspond + /// An absolute length in some abstract units. Users of Taffy may define what they correspond /// to in their application (pixels, logical pixels, mm, etc) as they see fit. - Points(f32), + Length(f32), /// The dimension is stored in percentage relative to the parent item. Percent(f32), /// The dimension should be automatically computed Auto, } impl TaffyZero for LengthPercentageAuto { - const ZERO: Self = Self::Points(0.0); + const ZERO: Self = Self::Length(0.0); } impl TaffyAuto for LengthPercentageAuto { const AUTO: Self = Self::Auto; } -impl FromPoints for LengthPercentageAuto { - fn from_points + Copy>(points: Input) -> Self { - Self::Points(points.into()) +impl FromLength for LengthPercentageAuto { + fn from_length + Copy>(value: Input) -> Self { + Self::Length(value.into()) } } impl FromPercent for LengthPercentageAuto { @@ -64,7 +64,7 @@ impl FromPercent for LengthPercentageAuto { impl From for LengthPercentageAuto { fn from(input: LengthPercentage) -> Self { match input { - LengthPercentage::Points(value) => Self::Points(value), + LengthPercentage::Length(value) => Self::Length(value), LengthPercentage::Percent(value) => Self::Percent(value), } } @@ -72,12 +72,12 @@ impl From for LengthPercentageAuto { impl LengthPercentageAuto { /// Returns: - /// - Some(points) for Points variants + /// - Some(length) for Length variants /// - Some(resolved) using the provided context for Percent variants /// - None for Auto variants pub fn resolve_to_option(self, context: f32) -> Option { match self { - Self::Points(points) => Some(points), + Self::Length(length) => Some(length), Self::Percent(percent) => Some(context * percent), Self::Auto => None, } @@ -90,23 +90,23 @@ impl LengthPercentageAuto { #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum Dimension { - /// Points are abstract absolute units. Users of Taffy may define what they correspond + /// An absolute length in some abstract units. Users of Taffy may define what they correspond /// to in their application (pixels, logical pixels, mm, etc) as they see fit. - Points(f32), + Length(f32), /// The dimension is stored in percentage relative to the parent item. Percent(f32), /// The dimension should be automatically computed Auto, } impl TaffyZero for Dimension { - const ZERO: Self = Self::Points(0.0); + const ZERO: Self = Self::Length(0.0); } impl TaffyAuto for Dimension { const AUTO: Self = Self::Auto; } -impl FromPoints for Dimension { - fn from_points + Copy>(points: Input) -> Self { - Self::Points(points.into()) +impl FromLength for Dimension { + fn from_length + Copy>(value: Input) -> Self { + Self::Length(value.into()) } } impl FromPercent for Dimension { @@ -118,7 +118,7 @@ impl FromPercent for Dimension { impl From for Dimension { fn from(input: LengthPercentage) -> Self { match input { - LengthPercentage::Points(value) => Self::Points(value), + LengthPercentage::Length(value) => Self::Length(value), LengthPercentage::Percent(value) => Self::Percent(value), } } @@ -127,7 +127,7 @@ impl From for Dimension { impl From for Dimension { fn from(input: LengthPercentageAuto) -> Self { match input { - LengthPercentageAuto::Points(value) => Self::Points(value), + LengthPercentageAuto::Length(value) => Self::Length(value), LengthPercentageAuto::Percent(value) => Self::Percent(value), LengthPercentageAuto::Auto => Self::Auto, } @@ -135,25 +135,25 @@ impl From for Dimension { } impl Dimension { - /// Get Points value if value is Points variant + /// Get Length value if value is Length variant #[cfg(feature = "grid")] pub fn into_option(self) -> Option { match self { - Dimension::Points(value) => Some(value), + Dimension::Length(value) => Some(value), _ => None, } } } impl Rect { - /// Create a new Rect with [`Dimension::Points`] + /// Create a new Rect with [`Dimension::Length`] #[must_use] - pub const fn from_points(start: f32, end: f32, top: f32, bottom: f32) -> Self { + pub const fn from_length(start: f32, end: f32, top: f32, bottom: f32) -> Self { Rect { - left: Dimension::Points(start), - right: Dimension::Points(end), - top: Dimension::Points(top), - bottom: Dimension::Points(bottom), + left: Dimension::Length(start), + right: Dimension::Length(end), + top: Dimension::Length(top), + bottom: Dimension::Length(bottom), } } @@ -189,9 +189,9 @@ impl TaffyMaxContent for AvailableSpace { impl TaffyMinContent for AvailableSpace { const MIN_CONTENT: Self = Self::MinContent; } -impl FromPoints for AvailableSpace { - fn from_points + Copy>(points: Input) -> Self { - Self::Definite(points.into()) +impl FromLength for AvailableSpace { + fn from_length + Copy>(value: Input) -> Self { + Self::Definite(value.into()) } } diff --git a/src/style/grid.rs b/src/style/grid.rs index 06aaa8238..63a76a0e3 100644 --- a/src/style/grid.rs +++ b/src/style/grid.rs @@ -240,7 +240,7 @@ impl Default for Line { #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum MaxTrackSizingFunction { - /// Track maximum size should be a fixed points or percentage value + /// Track maximum size should be a fixed length or percentage value Fixed(LengthPercentage), /// Track maximum size should be content sized under a min-content constraint MinContent, @@ -272,9 +272,9 @@ impl TaffyFitContent for MaxTrackSizingFunction { impl TaffyZero for MaxTrackSizingFunction { const ZERO: Self = Self::Fixed(LengthPercentage::ZERO); } -impl FromPoints for MaxTrackSizingFunction { - fn from_points + Copy>(points: Input) -> Self { - Self::Fixed(LengthPercentage::from_points(points)) +impl FromLength for MaxTrackSizingFunction { + fn from_length + Copy>(value: Input) -> Self { + Self::Fixed(LengthPercentage::from_length(value)) } } impl FromPercent for MaxTrackSizingFunction { @@ -316,7 +316,7 @@ impl MaxTrackSizingFunction { pub fn definite_value(self, parent_size: Option) -> Option { use MaxTrackSizingFunction::*; match self { - Fixed(LengthPercentage::Points(size)) => Some(size), + Fixed(LengthPercentage::Length(size)) => Some(size), Fixed(LengthPercentage::Percent(fraction)) => parent_size.map(|size| fraction * size), MinContent | MaxContent | FitContent(_) | Auto | Fraction(_) => None, } @@ -332,7 +332,7 @@ impl MaxTrackSizingFunction { pub fn definite_limit(self, parent_size: Option) -> Option { use MaxTrackSizingFunction::FitContent; match self { - FitContent(LengthPercentage::Points(size)) => Some(size), + FitContent(LengthPercentage::Length(size)) => Some(size), FitContent(LengthPercentage::Percent(fraction)) => parent_size.map(|size| fraction * size), _ => self.definite_value(parent_size), } @@ -345,7 +345,7 @@ impl MaxTrackSizingFunction { use MaxTrackSizingFunction::*; match self { Fixed(LengthPercentage::Percent(fraction)) => Some(fraction * parent_size), - Fixed(LengthPercentage::Points(_)) | MinContent | MaxContent | FitContent(_) | Auto | Fraction(_) => None, + Fixed(LengthPercentage::Length(_)) | MinContent | MaxContent | FitContent(_) | Auto | Fraction(_) => None, } } @@ -365,7 +365,7 @@ impl MaxTrackSizingFunction { #[derive(Copy, Clone, PartialEq, Debug)] #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] pub enum MinTrackSizingFunction { - /// Track minimum size should be a fixed points or percentage value + /// Track minimum size should be a fixed length or percentage value Fixed(LengthPercentage), /// Track minimum size should be content sized under a min-content constraint MinContent, @@ -386,9 +386,9 @@ impl TaffyMaxContent for MinTrackSizingFunction { impl TaffyZero for MinTrackSizingFunction { const ZERO: Self = Self::Fixed(LengthPercentage::ZERO); } -impl FromPoints for MinTrackSizingFunction { - fn from_points + Copy>(points: Input) -> Self { - Self::Fixed(LengthPercentage::from_points(points)) +impl FromLength for MinTrackSizingFunction { + fn from_length + Copy>(value: Input) -> Self { + Self::Fixed(LengthPercentage::from_length(value)) } } impl FromPercent for MinTrackSizingFunction { @@ -411,7 +411,7 @@ impl MinTrackSizingFunction { pub fn definite_value(self, parent_size: Option) -> Option { use MinTrackSizingFunction::*; match self { - Fixed(LengthPercentage::Points(size)) => Some(size), + Fixed(LengthPercentage::Length(size)) => Some(size), Fixed(LengthPercentage::Percent(fraction)) => parent_size.map(|size| fraction * size), MinContent | MaxContent | Auto => None, } @@ -424,7 +424,7 @@ impl MinTrackSizingFunction { use MinTrackSizingFunction::*; match self { Fixed(LengthPercentage::Percent(fraction)) => Some(fraction * parent_size), - Fixed(LengthPercentage::Points(_)) | MinContent | MaxContent | Auto => None, + Fixed(LengthPercentage::Length(_)) | MinContent | MaxContent | Auto => None, } } @@ -473,9 +473,9 @@ impl TaffyFitContent for NonRepeatedTrackSizingFunction { impl TaffyZero for NonRepeatedTrackSizingFunction { const ZERO: Self = Self { min: MinTrackSizingFunction::ZERO, max: MaxTrackSizingFunction::ZERO }; } -impl FromPoints for NonRepeatedTrackSizingFunction { - fn from_points + Copy>(points: Input) -> Self { - Self { min: MinTrackSizingFunction::from_points(points), max: MaxTrackSizingFunction::from_points(points) } +impl FromLength for NonRepeatedTrackSizingFunction { + fn from_length + Copy>(value: Input) -> Self { + Self { min: MinTrackSizingFunction::from_length(value), max: MaxTrackSizingFunction::from_length(value) } } } impl FromPercent for NonRepeatedTrackSizingFunction { @@ -568,9 +568,9 @@ impl TaffyFitContent for TrackSizingFunction { impl TaffyZero for TrackSizingFunction { const ZERO: Self = Self::Single(NonRepeatedTrackSizingFunction::ZERO); } -impl FromPoints for TrackSizingFunction { - fn from_points + Copy>(points: Input) -> Self { - Self::Single(NonRepeatedTrackSizingFunction::from_points(points)) +impl FromLength for TrackSizingFunction { + fn from_length + Copy>(value: Input) -> Self { + Self::Single(NonRepeatedTrackSizingFunction::from_length(value)) } } impl FromPercent for TrackSizingFunction { diff --git a/src/style_helpers.rs b/src/style_helpers.rs index 7f8e75805..c4a75913c 100644 --- a/src/style_helpers.rs +++ b/src/style_helpers.rs @@ -124,7 +124,7 @@ impl TaffyZero for Point { } impl Point { /// Returns a Point where both the x and y values are the zero value of the contained type - /// (e.g. 0.0, Some(0.0), or Dimension::Points(0.0)) + /// (e.g. 0.0, Some(0.0), or Dimension::Length(0.0)) pub const fn zero() -> Self { zero::() } @@ -134,7 +134,7 @@ impl TaffyZero for Line { } impl Line { /// Returns a Line where both the start and end values are the zero value of the contained type - /// (e.g. 0.0, Some(0.0), or Dimension::Points(0.0)) + /// (e.g. 0.0, Some(0.0), or Dimension::Length(0.0)) pub const fn zero() -> Self { zero::() } @@ -144,7 +144,7 @@ impl TaffyZero for Size { } impl Size { /// Returns a Size where both the width and height values are the zero value of the contained type - /// (e.g. 0.0, Some(0.0), or Dimension::Points(0.0)) + /// (e.g. 0.0, Some(0.0), or Dimension::Length(0.0)) pub const fn zero() -> Self { zero::() } @@ -154,7 +154,7 @@ impl TaffyZero for Rect { } impl Rect { /// Returns a Size where the left, right, top, and bottom values are all the zero value of the contained type - /// (e.g. 0.0, Some(0.0), or Dimension::Points(0.0)) + /// (e.g. 0.0, Some(0.0), or Dimension::Length(0.0)) pub const fn zero() -> Self { zero::() } @@ -324,14 +324,15 @@ impl Rect { } } -/// Returns a value of the inferred type which represent a constant of points +/// Returns a value of the inferred type which represent a `fit-content(…)` value +/// with the given argument. pub fn fit_content(argument: LengthPercentage) -> T { T::fit_content(argument) } -/// Trait to create constant points values from plain numbers +/// Trait to create `fit-content(…)` values from plain numbers pub trait TaffyFitContent { - /// Converts into a LengthPercentage into Self + /// Converts a LengthPercentage into Self fn fit_content(argument: LengthPercentage) -> Self; } impl TaffyFitContent for Point { @@ -340,8 +341,8 @@ impl TaffyFitContent for Point { } } impl Point { - /// Returns a Point where both the x and y values are the constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// Returns a Point with x and y set to the same `fit-content(…)` value + /// with the given argument. pub fn fit_content(argument: LengthPercentage) -> Self { fit_content(argument) } @@ -352,8 +353,8 @@ impl TaffyFitContent for Line { } } impl Line { - /// Returns a Line where both the start and end values are the constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// Returns a Line with start and end set to the same `fit-content(…)` value + /// with the given argument. pub fn fit_content(argument: LengthPercentage) -> Self { fit_content(argument) } @@ -364,8 +365,8 @@ impl TaffyFitContent for Size { } } impl Size { - /// Returns a Size where both the width and height values are the constant fit_content value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// Returns a Size where with width and height set to the same `fit-content(…)` value + /// with the given argument. pub fn fit_content(argument: LengthPercentage) -> Self { fit_content(argument) } @@ -382,87 +383,83 @@ impl TaffyFitContent for Rect { } impl Rect { /// Returns a Rect where the left, right, top and bottom values are all constant fit_content value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// (e.g. 2.1, Some(2.1), or Dimension::Length(2.1)) pub fn fit_content(argument: LengthPercentage) -> Self { fit_content(argument) } } -/// Returns a value of the inferred type which represent a constant of points -pub fn points + Copy, T: FromPoints>(points: Input) -> T { - T::from_points(points) +/// Returns a value of the inferred type which represent an absolute length +pub fn length + Copy, T: FromLength>(value: Input) -> T { + T::from_length(value) } -/// Trait to create constant points values from plain numbers -pub trait FromPoints { +/// Trait to create absolute length values from plain numbers +pub trait FromLength { /// Converts into an `Into` into Self - fn from_points + Copy>(points: Input) -> Self; + fn from_length + Copy>(value: Input) -> Self; } -impl FromPoints for f32 { - fn from_points + Copy>(points: Input) -> Self { - points.into() +impl FromLength for f32 { + fn from_length + Copy>(value: Input) -> Self { + value.into() } } -impl FromPoints for Option { - fn from_points + Copy>(points: Input) -> Self { - Some(points.into()) +impl FromLength for Option { + fn from_length + Copy>(value: Input) -> Self { + Some(value.into()) } } -impl FromPoints for Point { - fn from_points + Copy>(points: Input) -> Self { - Point { x: T::from_points(points.into()), y: T::from_points(points.into()) } +impl FromLength for Point { + fn from_length + Copy>(value: Input) -> Self { + Point { x: T::from_length(value.into()), y: T::from_length(value.into()) } } } -impl Point { - /// Returns a Point where both the x and y values are the constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) - pub fn points + Copy>(points_value: Input) -> Self { - points::(points_value) +impl Point { + /// Returns a Point where x and y values are the same given absolute length + pub fn length + Copy>(value: Input) -> Self { + length::(value) } } -impl FromPoints for Line { - fn from_points + Copy>(points: Input) -> Self { - Line { start: T::from_points(points.into()), end: T::from_points(points.into()) } +impl FromLength for Line { + fn from_length + Copy>(value: Input) -> Self { + Line { start: T::from_length(value.into()), end: T::from_length(value.into()) } } } -impl Line { - /// Returns a Line where both the start and end values are the constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) - pub fn points + Copy>(points_value: Input) -> Self { - points::(points_value) +impl Line { + /// Returns a Line where both the start and end values are the same given absolute length + pub fn length + Copy>(value: Input) -> Self { + length::(value) } } -impl FromPoints for Size { - fn from_points + Copy>(points: Input) -> Self { - Size { width: T::from_points(points.into()), height: T::from_points(points.into()) } +impl FromLength for Size { + fn from_length + Copy>(value: Input) -> Self { + Size { width: T::from_length(value.into()), height: T::from_length(value.into()) } } } -impl Size { - /// Returns a Size where both the width and height values are the constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) - pub fn points + Copy>(points_value: Input) -> Self { - points::(points_value) +impl Size { + /// Returns a Size where both the width and height values the same given absolute length + pub fn length + Copy>(value: Input) -> Self { + length::(value) } } -impl FromPoints for Rect { - fn from_points + Copy>(points: Input) -> Self { +impl FromLength for Rect { + fn from_length + Copy>(value: Input) -> Self { Rect { - left: T::from_points(points.into()), - right: T::from_points(points.into()), - top: T::from_points(points.into()), - bottom: T::from_points(points.into()), + left: T::from_length(value.into()), + right: T::from_length(value.into()), + top: T::from_length(value.into()), + bottom: T::from_length(value.into()), } } } -impl Rect { - /// Returns a Rect where the left, right, top and bottom values are all constant points value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) - pub fn points + Copy>(points_value: Input) -> Self { - points::(points_value) +impl Rect { + /// Returns a Rect where the left, right, top and bottom values are all the same given absolute length + pub fn length + Copy>(value: Input) -> Self { + length::(value) } } -/// Returns a value of the inferred type which represent a constant of points +/// Returns a value of the inferred type which represent a percentage pub fn percent + Copy, T: FromPercent>(percent: Input) -> T { T::from_percent(percent) } @@ -489,7 +486,7 @@ impl FromPercent for Point { } impl Point { /// Returns a Point where both the x and y values are the constant percent value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// (e.g. 2.1, Some(2.1), or Dimension::Length(2.1)) pub fn percent + Copy>(percent_value: Input) -> Self { percent::(percent_value) } @@ -501,7 +498,7 @@ impl FromPercent for Line { } impl Line { /// Returns a Line where both the start and end values are the constant percent value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// (e.g. 2.1, Some(2.1), or Dimension::Length(2.1)) pub fn percent + Copy>(percent_value: Input) -> Self { percent::(percent_value) } @@ -513,7 +510,7 @@ impl FromPercent for Size { } impl Size { /// Returns a Size where both the width and height values are the constant percent value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// (e.g. 2.1, Some(2.1), or Dimension::Length(2.1)) pub fn percent + Copy>(percent_value: Input) -> Self { percent::(percent_value) } @@ -530,7 +527,7 @@ impl FromPercent for Rect { } impl Rect { /// Returns a Rect where the left, right, top and bottom values are all constant percent value of the contained type - /// (e.g. 2.1, Some(2.1), or Dimension::Points(2.1)) + /// (e.g. 2.1, Some(2.1), or Dimension::Length(2.1)) pub fn percent + Copy>(percent_value: Input) -> Self { percent::(percent_value) } diff --git a/src/tree/taffy_tree/tree.rs b/src/tree/taffy_tree/tree.rs index 7004777f3..7775a7d09 100644 --- a/src/tree/taffy_tree/tree.rs +++ b/src/tree/taffy_tree/tree.rs @@ -716,7 +716,7 @@ mod tests { fn compute_layout_should_produce_valid_result() { let mut taffy = Taffy::new(); let node_result = taffy.new_leaf(Style { - size: Size { width: Dimension::Points(10f32), height: Dimension::Points(10f32) }, + size: Size { width: Dimension::Length(10f32), height: Dimension::Length(10f32) }, ..Default::default() }); assert!(node_result.is_ok()); diff --git a/src/util/resolve.rs b/src/util/resolve.rs index bd6dbb58e..f62b36a67 100644 --- a/src/util/resolve.rs +++ b/src/util/resolve.rs @@ -25,22 +25,22 @@ pub(crate) trait ResolveOrZero { } impl MaybeResolve, Option> for LengthPercentage { - /// Converts the given [`LengthPercentage`] into a concrete value of points + /// Converts the given [`LengthPercentage`] into an absolute length /// Can return `None` fn maybe_resolve(self, context: Option) -> Option { match self { - LengthPercentage::Points(points) => Some(points), + LengthPercentage::Length(length) => Some(length), LengthPercentage::Percent(percent) => context.map(|dim| dim * percent), } } } impl MaybeResolve, Option> for LengthPercentageAuto { - /// Converts the given [`LengthPercentageAuto`] into a concrete value of points + /// Converts the given [`LengthPercentageAuto`] into an absolute length /// Can return `None` fn maybe_resolve(self, context: Option) -> Option { match self { - LengthPercentageAuto::Points(points) => Some(points), + LengthPercentageAuto::Length(length) => Some(length), LengthPercentageAuto::Percent(percent) => context.map(|dim| dim * percent), LengthPercentageAuto::Auto => None, } @@ -48,12 +48,12 @@ impl MaybeResolve, Option> for LengthPercentageAuto { } impl MaybeResolve, Option> for Dimension { - /// Converts the given [`Dimension`] into a concrete value of points + /// Converts the given [`Dimension`] into an absolute length /// /// Can return `None` fn maybe_resolve(self, context: Option) -> Option { match self { - Dimension::Points(points) => Some(points), + Dimension::Length(length) => Some(length), Dimension::Percent(percent) => context.map(|dim| dim * percent), Dimension::Auto => None, } @@ -63,7 +63,7 @@ impl MaybeResolve, Option> for Dimension { // Generic implementation of MaybeResolve for f32 context where MaybeResolve is implemented // for Option context impl, Option>> MaybeResolve> for T { - /// Converts the given MaybeResolve value into a concrete value of points + /// Converts the given MaybeResolve value into an absolute length /// Can return `None` fn maybe_resolve(self, context: f32) -> Option { self.maybe_resolve(Some(context)) @@ -153,16 +153,16 @@ mod tests { assert_eq!(input.maybe_resolve(context), expected); } - /// `Dimension::Points` should always return `Some(f32)` - /// where the f32 value is the inner value of the points. + /// `Dimension::Length` should always return `Some(f32)` + /// where the f32 value is the inner absolute length. /// /// The parent / context should not affect the outcome. #[rstest] - #[case(Dimension::Points(1.0), None, Some(1.0))] - #[case(Dimension::Points(1.0), Some(5.0), Some(1.0))] - #[case(Dimension::Points(1.0), Some(-5.0), Some(1.0))] - #[case(Dimension::Points(1.0), Some(0.), Some(1.0))] - fn resolve_points(#[case] input: Dimension, #[case] context: Option, #[case] expected: Option) { + #[case(Dimension::Length(1.0), None, Some(1.0))] + #[case(Dimension::Length(1.0), Some(5.0), Some(1.0))] + #[case(Dimension::Length(1.0), Some(-5.0), Some(1.0))] + #[case(Dimension::Length(1.0), Some(0.), Some(1.0))] + fn resolve_length(#[case] input: Dimension, #[case] context: Option, #[case] expected: Option) { assert_eq!(input.maybe_resolve(context), expected); } @@ -203,16 +203,16 @@ mod tests { assert_eq!(input.maybe_resolve(context), expected); } - /// Size should always return a Size - /// where the f32 values are the inner value of the points. + /// Size should always return a Size + /// where the f32 values are the absolute length. /// /// The parent / context should not affect the outcome. #[rstest] - #[case(Size::from_points(5.0, 5.0), Size::NONE, Size::new(5.0, 5.0))] - #[case(Size::from_points(5.0, 5.0), Size::new(5.0, 5.0), Size::new(5.0, 5.0))] - #[case(Size::from_points(5.0, 5.0), Size::new(-5.0, -5.0), Size::new(5.0, 5.0))] - #[case(Size::from_points(5.0, 5.0), Size::new(0.0, 0.0), Size::new(5.0, 5.0))] - fn maybe_resolve_points( + #[case(Size::from_lengths(5.0, 5.0), Size::NONE, Size::new(5.0, 5.0))] + #[case(Size::from_lengths(5.0, 5.0), Size::new(5.0, 5.0), Size::new(5.0, 5.0))] + #[case(Size::from_lengths(5.0, 5.0), Size::new(-5.0, -5.0), Size::new(5.0, 5.0))] + #[case(Size::from_lengths(5.0, 5.0), Size::new(0.0, 0.0), Size::new(5.0, 5.0))] + fn maybe_resolve_length( #[case] input: Size, #[case] context: Size>, #[case] expected: Size>, @@ -253,11 +253,11 @@ mod tests { assert_eq!(input.resolve_or_zero(context), expected); } #[rstest] - #[case(Dimension::Points(5.0), None, 5.0)] - #[case(Dimension::Points(5.0), Some(5.0), 5.0)] - #[case(Dimension::Points(5.0), Some(-5.0), 5.0)] - #[case(Dimension::Points(5.0), Some(0.0), 5.0)] - fn resolve_or_zero_points(#[case] input: Dimension, #[case] context: Option, #[case] expected: f32) { + #[case(Dimension::Length(5.0), None, 5.0)] + #[case(Dimension::Length(5.0), Some(5.0), 5.0)] + #[case(Dimension::Length(5.0), Some(-5.0), 5.0)] + #[case(Dimension::Length(5.0), Some(0.0), 5.0)] + fn resolve_or_zero_length(#[case] input: Dimension, #[case] context: Option, #[case] expected: f32) { assert_eq!(input.resolve_or_zero(context), expected); } #[rstest] @@ -290,11 +290,11 @@ mod tests { } #[rstest] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Size::NONE, Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Size::new(5.0, 5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Size::new(-5.0, -5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Size::new(0.0, 0.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - fn resolve_or_zero_points( + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Size::NONE, Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Size::new(5.0, 5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Size::new(-5.0, -5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Size::new(0.0, 0.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + fn resolve_or_zero_length( #[case] input: Rect, #[case] context: Size>, #[case] expected: Rect, @@ -336,11 +336,11 @@ mod tests { } #[rstest] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), None, Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Some(5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Some(-5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - #[case(Rect::from_points(5.0, 5.0, 5.0, 5.0), Some(0.0), Rect::new(5.0, 5.0, 5.0, 5.0))] - fn resolve_or_zero_points( + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), None, Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Some(5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Some(-5.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + #[case(Rect::from_length(5.0, 5.0, 5.0, 5.0), Some(0.0), Rect::new(5.0, 5.0, 5.0, 5.0))] + fn resolve_or_zero_length( #[case] input: Rect, #[case] context: Option, #[case] expected: Rect, diff --git a/tests/border_and_padding.rs b/tests/border_and_padding.rs index 17a51914f..92b0541eb 100644 --- a/tests/border_and_padding.rs +++ b/tests/border_and_padding.rs @@ -14,7 +14,7 @@ fn border_on_a_single_axis_doesnt_increase_size() { .new_leaf(Style { border: { let mut lengths = [LengthPercentage::ZERO; 4]; - lengths[i] = LengthPercentage::Points(10.); + lengths[i] = LengthPercentage::Length(10.); arr_to_rect(lengths) }, ..Default::default() @@ -42,7 +42,7 @@ fn padding_on_a_single_axis_doesnt_increase_size() { .new_leaf(Style { padding: { let mut lengths = [LengthPercentage::ZERO; 4]; - lengths[i] = LengthPercentage::Points(10.); + lengths[i] = LengthPercentage::Length(10.); arr_to_rect(lengths) }, ..Default::default() @@ -68,7 +68,7 @@ fn border_and_padding_on_a_single_axis_doesnt_increase_size() { let mut taffy = Taffy::new(); let rect = { let mut lengths = [LengthPercentage::ZERO; 4]; - lengths[i] = LengthPercentage::Points(10.); + lengths[i] = LengthPercentage::Length(10.); arr_to_rect(lengths) }; let node = taffy.new_leaf(Style { border: rect, padding: rect, ..Default::default() }).unwrap(); diff --git a/tests/generated/absolute_aspect_ratio_aspect_ratio_overrides_height_of_full_inset.rs b/tests/generated/absolute_aspect_ratio_aspect_ratio_overrides_height_of_full_inset.rs index 9d2698e40..979f1891d 100644 --- a/tests/generated/absolute_aspect_ratio_aspect_ratio_overrides_height_of_full_inset.rs +++ b/tests/generated/absolute_aspect_ratio_aspect_ratio_overrides_height_of_full_inset.rs @@ -21,8 +21,8 @@ fn absolute_aspect_ratio_aspect_ratio_overrides_height_of_full_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_height.rs b/tests/generated/absolute_aspect_ratio_fill_height.rs index 25a9a95e6..dc1484041 100644 --- a/tests/generated/absolute_aspect_ratio_fill_height.rs +++ b/tests/generated/absolute_aspect_ratio_fill_height.rs @@ -22,8 +22,8 @@ fn absolute_aspect_ratio_fill_height() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_height_from_inset.rs b/tests/generated/absolute_aspect_ratio_fill_height_from_inset.rs index 85014278d..b9dadd3d3 100644 --- a/tests/generated/absolute_aspect_ratio_fill_height_from_inset.rs +++ b/tests/generated/absolute_aspect_ratio_fill_height_from_inset.rs @@ -21,8 +21,8 @@ fn absolute_aspect_ratio_fill_height_from_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_max_height.rs b/tests/generated/absolute_aspect_ratio_fill_max_height.rs index 2b8c1ce68..77a233bdd 100644 --- a/tests/generated/absolute_aspect_ratio_fill_max_height.rs +++ b/tests/generated/absolute_aspect_ratio_fill_max_height.rs @@ -3,14 +3,14 @@ fn absolute_aspect_ratio_fill_max_height() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { position : taffy :: style :: Position :: Absolute , max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Points (50f32) , height : auto () , } , aspect_ratio : Some (3f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (3f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { position : taffy :: style :: Position :: Absolute , max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Length (50f32) , height : auto () , } , aspect_ratio : Some (3f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (3f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_max_width.rs b/tests/generated/absolute_aspect_ratio_fill_max_width.rs index b8c721b82..16600b4c1 100644 --- a/tests/generated/absolute_aspect_ratio_fill_max_width.rs +++ b/tests/generated/absolute_aspect_ratio_fill_max_width.rs @@ -3,14 +3,14 @@ fn absolute_aspect_ratio_fill_max_width() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { position : taffy :: style :: Position :: Absolute , max_size : taffy :: geometry :: Size { width : auto () , height : taffy :: style :: Dimension :: Points (50f32) , } , aspect_ratio : Some (0.5f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (0.5f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { position : taffy :: style :: Position :: Absolute , max_size : taffy :: geometry :: Size { width : auto () , height : taffy :: style :: Dimension :: Length (50f32) , } , aspect_ratio : Some (0.5f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH\u{200b}HHHH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (0.5f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_min_height.rs b/tests/generated/absolute_aspect_ratio_fill_min_height.rs index 372cc6156..99c744c8e 100644 --- a/tests/generated/absolute_aspect_ratio_fill_min_height.rs +++ b/tests/generated/absolute_aspect_ratio_fill_min_height.rs @@ -6,7 +6,7 @@ fn absolute_aspect_ratio_fill_min_height() { let node0 = taffy .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, aspect_ratio: Some(3f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn absolute_aspect_ratio_fill_min_height() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_min_width.rs b/tests/generated/absolute_aspect_ratio_fill_min_width.rs index 1b677e59a..09c215184 100644 --- a/tests/generated/absolute_aspect_ratio_fill_min_width.rs +++ b/tests/generated/absolute_aspect_ratio_fill_min_width.rs @@ -6,7 +6,7 @@ fn absolute_aspect_ratio_fill_min_width() { let node0 = taffy .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, aspect_ratio: Some(0.5f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn absolute_aspect_ratio_fill_min_width() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_width.rs b/tests/generated/absolute_aspect_ratio_fill_width.rs index 3e374fd5d..a23b9fd14 100644 --- a/tests/generated/absolute_aspect_ratio_fill_width.rs +++ b/tests/generated/absolute_aspect_ratio_fill_width.rs @@ -22,8 +22,8 @@ fn absolute_aspect_ratio_fill_width() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_fill_width_from_inset.rs b/tests/generated/absolute_aspect_ratio_fill_width_from_inset.rs index 8c9f158bf..e1acc42f2 100644 --- a/tests/generated/absolute_aspect_ratio_fill_width_from_inset.rs +++ b/tests/generated/absolute_aspect_ratio_fill_width_from_inset.rs @@ -21,8 +21,8 @@ fn absolute_aspect_ratio_fill_width_from_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_height_overrides_inset.rs b/tests/generated/absolute_aspect_ratio_height_overrides_inset.rs index e7de8bdc0..3a161c7f5 100644 --- a/tests/generated/absolute_aspect_ratio_height_overrides_inset.rs +++ b/tests/generated/absolute_aspect_ratio_height_overrides_inset.rs @@ -22,8 +22,8 @@ fn absolute_aspect_ratio_height_overrides_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_aspect_ratio_width_overrides_inset.rs b/tests/generated/absolute_aspect_ratio_width_overrides_inset.rs index 00f33fac5..a37862f7c 100644 --- a/tests/generated/absolute_aspect_ratio_width_overrides_inset.rs +++ b/tests/generated/absolute_aspect_ratio_width_overrides_inset.rs @@ -22,8 +22,8 @@ fn absolute_aspect_ratio_width_overrides_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_child_with_cross_margin.rs b/tests/generated/absolute_child_with_cross_margin.rs index 8d4483036..e2e5129c0 100644 --- a/tests/generated/absolute_child_with_cross_margin.rs +++ b/tests/generated/absolute_child_with_cross_margin.rs @@ -7,8 +7,8 @@ fn absolute_child_with_cross_margin() { .new_leaf(taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(28f32), - height: taffy::style::Dimension::Points(27f32), + width: taffy::style::Dimension::Length(28f32), + height: taffy::style::Dimension::Length(27f32), }, ..Default::default() }) @@ -22,12 +22,12 @@ fn absolute_child_with_cross_margin() { flex_shrink: 1f32, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(15f32), + height: taffy::style::Dimension::Length(15f32), }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(4f32), + top: taffy::style::LengthPercentageAuto::Length(4f32), bottom: zero(), }, ..Default::default() @@ -48,8 +48,8 @@ fn absolute_child_with_cross_margin() { .new_leaf(taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(27f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(27f32), }, ..Default::default() }) @@ -59,12 +59,12 @@ fn absolute_child_with_cross_margin() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceBetween), min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(311f32), - height: taffy::style::Dimension::Points(0f32), + width: taffy::style::Dimension::Length(311f32), + height: taffy::style::Dimension::Length(0f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(311f32), - height: taffy::style::Dimension::Points(36893500000000000000f32), + width: taffy::style::Dimension::Length(311f32), + height: taffy::style::Dimension::Length(36893500000000000000f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_child_with_main_margin.rs b/tests/generated/absolute_child_with_main_margin.rs index bc16841b1..406f7bf11 100644 --- a/tests/generated/absolute_child_with_main_margin.rs +++ b/tests/generated/absolute_child_with_main_margin.rs @@ -7,11 +7,11 @@ fn absolute_child_with_main_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(9f32), - height: taffy::style::Dimension::Points(9f32), + width: taffy::style::Dimension::Length(9f32), + height: taffy::style::Dimension::Length(9f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(7f32), + left: taffy::style::LengthPercentageAuto::Length(7f32), right: zero(), top: zero(), bottom: zero(), @@ -23,8 +23,8 @@ fn absolute_child_with_main_margin() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(37f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(37f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_child_with_max_height.rs b/tests/generated/absolute_child_with_max_height.rs index f422abf24..e0faf49ae 100644 --- a/tests/generated/absolute_child_with_max_height.rs +++ b/tests/generated/absolute_child_with_max_height.rs @@ -6,8 +6,8 @@ fn absolute_child_with_max_height() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -17,12 +17,12 @@ fn absolute_child_with_max_height() { taffy::style::Style { position: taffy::style::Position::Absolute, flex_direction: taffy::style::FlexDirection::Column, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(20f32), + bottom: taffy::style::LengthPercentageAuto::Length(20f32), }, ..Default::default() }, @@ -34,8 +34,8 @@ fn absolute_child_with_max_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_child_with_max_height_larger_shrinkable_grandchild.rs b/tests/generated/absolute_child_with_max_height_larger_shrinkable_grandchild.rs index 2f2f75459..cbb04af7e 100644 --- a/tests/generated/absolute_child_with_max_height_larger_shrinkable_grandchild.rs +++ b/tests/generated/absolute_child_with_max_height_larger_shrinkable_grandchild.rs @@ -6,8 +6,8 @@ fn absolute_child_with_max_height_larger_shrinkable_grandchild() { let node00 = taffy .new_leaf(taffy::style::Style { flex_shrink: 1f32, - flex_basis: taffy::style::Dimension::Points(150f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(150f32), + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -16,12 +16,12 @@ fn absolute_child_with_max_height_larger_shrinkable_grandchild() { taffy::style::Style { position: taffy::style::Position::Absolute, flex_direction: taffy::style::FlexDirection::Column, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(20f32), + bottom: taffy::style::LengthPercentageAuto::Length(20f32), }, ..Default::default() }, @@ -33,8 +33,8 @@ fn absolute_child_with_max_height_larger_shrinkable_grandchild() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center.rs index d8db37462..fa6cafcce 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 @@ -7,8 +7,8 @@ fn absolute_layout_align_items_and_justify_content_center() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn absolute_layout_align_items_and_justify_content_center() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_bottom_position.rs index d0b07dfbc..405e329fb 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 @@ -7,14 +7,14 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_bottom_position() align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_left_position.rs index 7ad7ff550..7a97d3fe3 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 @@ -7,11 +7,11 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), right: auto(), top: auto(), bottom: auto(), @@ -25,8 +25,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_left_position() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_right_position.rs index b5f86b5fd..ae9164b75 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 @@ -7,12 +7,12 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), top: auto(), bottom: auto(), }, @@ -25,8 +25,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_right_position() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs b/tests/generated/absolute_layout_align_items_and_justify_content_center_and_top_position.rs index a876b181d..75e504fd9 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 @@ -7,13 +7,13 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -25,8 +25,8 @@ fn absolute_layout_align_items_and_justify_content_center_and_top_position() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs b/tests/generated/absolute_layout_align_items_and_justify_content_flex_end.rs index 3e85b5f56..4394e23e5 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 @@ -7,8 +7,8 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn absolute_layout_align_items_and_justify_content_flex_end() { align_items: Some(taffy::style::AlignItems::FlexEnd), justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_center.rs b/tests/generated/absolute_layout_align_items_center.rs index 22b813d83..3528b5719 100644 --- a/tests/generated/absolute_layout_align_items_center.rs +++ b/tests/generated/absolute_layout_align_items_center.rs @@ -7,8 +7,8 @@ fn absolute_layout_align_items_center() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn absolute_layout_align_items_center() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_align_items_center_on_child_only.rs b/tests/generated/absolute_layout_align_items_center_on_child_only.rs index 610cea7f1..078cd2477 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 @@ -8,8 +8,8 @@ fn absolute_layout_align_items_center_on_child_only() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn absolute_layout_align_items_center_on_child_only() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_child_order.rs b/tests/generated/absolute_layout_child_order.rs index 25e96bd5e..002bba63c 100644 --- a/tests/generated/absolute_layout_child_order.rs +++ b/tests/generated/absolute_layout_child_order.rs @@ -6,8 +6,8 @@ fn absolute_layout_child_order() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn absolute_layout_child_order() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn absolute_layout_child_order() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn absolute_layout_child_order() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs index 20534da9b..2dc77dbc2 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_column_container.rs @@ -7,8 +7,8 @@ fn absolute_layout_in_wrap_reverse_column_container() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn absolute_layout_in_wrap_reverse_column_container() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_column_container_flex_end.rs index 9a75cc3e1..3b5289149 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 @@ -8,8 +8,8 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -20,8 +20,8 @@ fn absolute_layout_in_wrap_reverse_column_container_flex_end() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs index 38ee430fd..dda7e62b2 100644 --- a/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs +++ b/tests/generated/absolute_layout_in_wrap_reverse_row_container.rs @@ -7,8 +7,8 @@ fn absolute_layout_in_wrap_reverse_row_container() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn absolute_layout_in_wrap_reverse_row_container() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs b/tests/generated/absolute_layout_in_wrap_reverse_row_container_flex_end.rs index 624d9c429..919860620 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 @@ -8,8 +8,8 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn absolute_layout_in_wrap_reverse_row_container_flex_end() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_justify_content_center.rs b/tests/generated/absolute_layout_justify_content_center.rs index 4acede93f..5457421ad 100644 --- a/tests/generated/absolute_layout_justify_content_center.rs +++ b/tests/generated/absolute_layout_justify_content_center.rs @@ -7,8 +7,8 @@ fn absolute_layout_justify_content_center() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn absolute_layout_justify_content_center() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(110f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(110f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_no_size.rs b/tests/generated/absolute_layout_no_size.rs index cd5873a6f..11bddf745 100644 --- a/tests/generated/absolute_layout_no_size.rs +++ b/tests/generated/absolute_layout_no_size.rs @@ -10,8 +10,8 @@ fn absolute_layout_no_size() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs b/tests/generated/absolute_layout_percentage_bottom_based_on_parent_height.rs index 0191da2c5..86edace6d 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 @@ -7,8 +7,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), @@ -23,8 +23,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), @@ -38,7 +38,7 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { let node2 = taffy .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, inset: taffy::geometry::Rect { left: auto(), right: auto(), @@ -52,8 +52,8 @@ fn absolute_layout_percentage_bottom_based_on_parent_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_percentage_height.rs b/tests/generated/absolute_layout_percentage_height.rs index 09011afd7..642bde4e6 100644 --- a/tests/generated/absolute_layout_percentage_height.rs +++ b/tests/generated/absolute_layout_percentage_height.rs @@ -7,13 +7,13 @@ fn absolute_layout_percentage_height() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), height: taffy::style::Dimension::Percent(0.5f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -23,8 +23,8 @@ fn absolute_layout_percentage_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_row_width_height_end_bottom.rs b/tests/generated/absolute_layout_row_width_height_end_bottom.rs index 4ca20af31..2ec9644ff 100644 --- a/tests/generated/absolute_layout_row_width_height_end_bottom.rs +++ b/tests/generated/absolute_layout_row_width_height_end_bottom.rs @@ -7,14 +7,14 @@ fn absolute_layout_row_width_height_end_bottom() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -23,8 +23,8 @@ fn absolute_layout_row_width_height_end_bottom() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_start_top_end_bottom.rs b/tests/generated/absolute_layout_start_top_end_bottom.rs index e443f4f56..78baeeb19 100644 --- a/tests/generated/absolute_layout_start_top_end_bottom.rs +++ b/tests/generated/absolute_layout_start_top_end_bottom.rs @@ -7,10 +7,10 @@ fn absolute_layout_start_top_end_bottom() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn absolute_layout_start_top_end_bottom() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_width_height_end_bottom.rs b/tests/generated/absolute_layout_width_height_end_bottom.rs index 61d313ab8..b220f4716 100644 --- a/tests/generated/absolute_layout_width_height_end_bottom.rs +++ b/tests/generated/absolute_layout_width_height_end_bottom.rs @@ -7,14 +7,14 @@ fn absolute_layout_width_height_end_bottom() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -23,8 +23,8 @@ fn absolute_layout_width_height_end_bottom() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_width_height_start_top.rs b/tests/generated/absolute_layout_width_height_start_top.rs index 2cb92194e..3e6e0bf2a 100644 --- a/tests/generated/absolute_layout_width_height_start_top.rs +++ b/tests/generated/absolute_layout_width_height_start_top.rs @@ -7,13 +7,13 @@ fn absolute_layout_width_height_start_top() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -23,8 +23,8 @@ fn absolute_layout_width_height_start_top() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs b/tests/generated/absolute_layout_width_height_start_top_end_bottom.rs index 346e57d4c..104639876 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 @@ -7,14 +7,14 @@ fn absolute_layout_width_height_start_top_end_bottom() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -23,8 +23,8 @@ fn absolute_layout_width_height_start_top_end_bottom() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_layout_within_border.rs b/tests/generated/absolute_layout_within_border.rs index 78655dc81..c1d50b1c4 100644 --- a/tests/generated/absolute_layout_within_border.rs +++ b/tests/generated/absolute_layout_within_border.rs @@ -7,13 +7,13 @@ fn absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -23,14 +23,14 @@ fn absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -39,19 +39,19 @@ fn absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -61,20 +61,20 @@ fn absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -83,20 +83,20 @@ fn absolute_layout_within_border() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_margin_bottom_left.rs b/tests/generated/absolute_margin_bottom_left.rs index 98a4b13c0..e791ce6d6 100644 --- a/tests/generated/absolute_margin_bottom_left.rs +++ b/tests/generated/absolute_margin_bottom_left.rs @@ -7,14 +7,14 @@ fn absolute_margin_bottom_left() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: zero(), top: zero(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn absolute_margin_bottom_left() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_minmax_bottom_right_max.rs b/tests/generated/absolute_minmax_bottom_right_max.rs index 6f8238e88..6827c06cc 100644 --- a/tests/generated/absolute_minmax_bottom_right_max.rs +++ b/tests/generated/absolute_minmax_bottom_right_max.rs @@ -7,18 +7,18 @@ fn absolute_minmax_bottom_right_max() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(30f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn absolute_minmax_bottom_right_max() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_minmax_bottom_right_min_max.rs b/tests/generated/absolute_minmax_bottom_right_min_max.rs index a500cc328..c9c8d6cc7 100644 --- a/tests/generated/absolute_minmax_bottom_right_min_max.rs +++ b/tests/generated/absolute_minmax_bottom_right_min_max.rs @@ -7,18 +7,18 @@ fn absolute_minmax_bottom_right_min_max() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(30f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn absolute_minmax_bottom_right_min_max() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_minmax_bottom_right_min_max_preferred.rs b/tests/generated/absolute_minmax_bottom_right_min_max_preferred.rs index ae612a136..769eb9190 100644 --- a/tests/generated/absolute_minmax_bottom_right_min_max_preferred.rs +++ b/tests/generated/absolute_minmax_bottom_right_min_max_preferred.rs @@ -7,22 +7,22 @@ fn absolute_minmax_bottom_right_min_max_preferred() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(30f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn absolute_minmax_bottom_right_min_max_preferred() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_minmax_top_left_bottom_right_max.rs b/tests/generated/absolute_minmax_top_left_bottom_right_max.rs index e198b1eb4..4f84b1cf1 100644 --- a/tests/generated/absolute_minmax_top_left_bottom_right_max.rs +++ b/tests/generated/absolute_minmax_top_left_bottom_right_max.rs @@ -7,14 +7,14 @@ fn absolute_minmax_top_left_bottom_right_max() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(30f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -23,8 +23,8 @@ fn absolute_minmax_top_left_bottom_right_max() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_minmax_top_left_bottom_right_min_max.rs b/tests/generated/absolute_minmax_top_left_bottom_right_min_max.rs index 2724e97d2..abb7c28e4 100644 --- a/tests/generated/absolute_minmax_top_left_bottom_right_min_max.rs +++ b/tests/generated/absolute_minmax_top_left_bottom_right_min_max.rs @@ -7,18 +7,18 @@ fn absolute_minmax_top_left_bottom_right_min_max() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(30f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn absolute_minmax_top_left_bottom_right_min_max() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/absolute_padding_border_overrides_max_size.rs b/tests/generated/absolute_padding_border_overrides_max_size.rs index 9534a729d..33dd447bf 100644 --- a/tests/generated/absolute_padding_border_overrides_max_size.rs +++ b/tests/generated/absolute_padding_border_overrides_max_size.rs @@ -7,20 +7,20 @@ fn absolute_padding_border_overrides_max_size() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/absolute_padding_border_overrides_size.rs b/tests/generated/absolute_padding_border_overrides_size.rs index a03786ebf..7dc0ab03f 100644 --- a/tests/generated/absolute_padding_border_overrides_size.rs +++ b/tests/generated/absolute_padding_border_overrides_size.rs @@ -7,20 +7,20 @@ fn absolute_padding_border_overrides_size() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/align_baseline.rs b/tests/generated/align_baseline.rs index 88cd18ae4..f7ed9ea04 100644 --- a/tests/generated/align_baseline.rs +++ b/tests/generated/align_baseline.rs @@ -6,8 +6,8 @@ fn align_baseline() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child.rs b/tests/generated/align_baseline_child.rs index e279bf756..82bf24b3c 100644 --- a/tests/generated/align_baseline_child.rs +++ b/tests/generated/align_baseline_child.rs @@ -6,8 +6,8 @@ fn align_baseline_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_child() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -39,8 +39,8 @@ fn align_baseline_child() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_margin.rs b/tests/generated/align_baseline_child_margin.rs index 87a5c0ccf..18f25a9d6 100644 --- a/tests/generated/align_baseline_child_margin.rs +++ b/tests/generated/align_baseline_child_margin.rs @@ -6,14 +6,14 @@ fn align_baseline_child_margin() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -21,14 +21,14 @@ fn align_baseline_child_margin() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -38,8 +38,8 @@ fn align_baseline_child_margin() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -51,8 +51,8 @@ fn align_baseline_child_margin() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_margin_percent.rs b/tests/generated/align_baseline_child_margin_percent.rs index 5abb2e94a..b183d984a 100644 --- a/tests/generated/align_baseline_child_margin_percent.rs +++ b/tests/generated/align_baseline_child_margin_percent.rs @@ -6,8 +6,8 @@ fn align_baseline_child_margin_percent() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.05f32), @@ -21,8 +21,8 @@ fn align_baseline_child_margin_percent() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.01f32), @@ -38,8 +38,8 @@ fn align_baseline_child_margin_percent() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -51,8 +51,8 @@ fn align_baseline_child_margin_percent() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_multiline.rs b/tests/generated/align_baseline_child_multiline.rs index 55c39a37d..f33ea18e9 100644 --- a/tests/generated/align_baseline_child_multiline.rs +++ b/tests/generated/align_baseline_child_multiline.rs @@ -6,8 +6,8 @@ fn align_baseline_child_multiline() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child_multiline() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_baseline_child_multiline() { let node11 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_baseline_child_multiline() { let node12 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_baseline_child_multiline() { let node13 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -52,7 +52,7 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node10, node11, node12, node13], @@ -62,7 +62,7 @@ fn align_baseline_child_multiline() { .new_with_children( taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/align_baseline_child_multiline_no_override_on_secondline.rs b/tests/generated/align_baseline_child_multiline_no_override_on_secondline.rs index 1d0a1cb46..c64ce4b46 100644 --- a/tests/generated/align_baseline_child_multiline_no_override_on_secondline.rs +++ b/tests/generated/align_baseline_child_multiline_no_override_on_secondline.rs @@ -6,8 +6,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { let node11 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { let node12 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -43,8 +43,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -54,8 +54,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(25f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(25f32), }, ..Default::default() }, @@ -67,8 +67,8 @@ fn align_baseline_child_multiline_no_override_on_secondline() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_multiline_override.rs b/tests/generated/align_baseline_child_multiline_override.rs index 74c8c90e4..ee7a9d3ae 100644 --- a/tests/generated/align_baseline_child_multiline_override.rs +++ b/tests/generated/align_baseline_child_multiline_override.rs @@ -6,8 +6,8 @@ fn align_baseline_child_multiline_override() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child_multiline_override() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn align_baseline_child_multiline_override() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -34,8 +34,8 @@ fn align_baseline_child_multiline_override() { let node12 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -44,8 +44,8 @@ fn align_baseline_child_multiline_override() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -55,8 +55,8 @@ fn align_baseline_child_multiline_override() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(25f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(25f32), }, ..Default::default() }, @@ -68,8 +68,8 @@ fn align_baseline_child_multiline_override() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_padding.rs b/tests/generated/align_baseline_child_padding.rs index 083281c62..5ee601d04 100644 --- a/tests/generated/align_baseline_child_padding.rs +++ b/tests/generated/align_baseline_child_padding.rs @@ -6,8 +6,8 @@ fn align_baseline_child_padding() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child_padding() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -26,14 +26,14 @@ fn align_baseline_child_padding() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, @@ -45,14 +45,14 @@ fn align_baseline_child_padding() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_top.rs b/tests/generated/align_baseline_child_top.rs index ca56fe9b4..4957b2eb2 100644 --- a/tests/generated/align_baseline_child_top.rs +++ b/tests/generated/align_baseline_child_top.rs @@ -6,13 +6,13 @@ fn align_baseline_child_top() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -21,8 +21,8 @@ fn align_baseline_child_top() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn align_baseline_child_top() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -45,8 +45,8 @@ fn align_baseline_child_top() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_child_top2.rs b/tests/generated/align_baseline_child_top2.rs index 92df7a18e..92cfe0d32 100644 --- a/tests/generated/align_baseline_child_top2.rs +++ b/tests/generated/align_baseline_child_top2.rs @@ -6,8 +6,8 @@ fn align_baseline_child_top2() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_child_top2() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -25,13 +25,13 @@ fn align_baseline_child_top2() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), bottom: auto(), }, ..Default::default() @@ -44,8 +44,8 @@ fn align_baseline_child_top2() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_column.rs b/tests/generated/align_baseline_column.rs index 691103e6f..9782cc2c1 100644 --- a/tests/generated/align_baseline_column.rs +++ b/tests/generated/align_baseline_column.rs @@ -6,8 +6,8 @@ fn align_baseline_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_column() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn align_baseline_column() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_double_nested_child.rs b/tests/generated/align_baseline_double_nested_child.rs index ef1de5d87..081ae54af 100644 --- a/tests/generated/align_baseline_double_nested_child.rs +++ b/tests/generated/align_baseline_double_nested_child.rs @@ -6,8 +6,8 @@ fn align_baseline_double_nested_child() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn align_baseline_double_nested_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -27,8 +27,8 @@ fn align_baseline_double_nested_child() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(15f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(15f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn align_baseline_double_nested_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -50,8 +50,8 @@ fn align_baseline_double_nested_child() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_multiline.rs b/tests/generated/align_baseline_multiline.rs index 0638a2704..f1edda44d 100644 --- a/tests/generated/align_baseline_multiline.rs +++ b/tests/generated/align_baseline_multiline.rs @@ -6,8 +6,8 @@ fn align_baseline_multiline() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_multiline() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_multiline() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -37,8 +37,8 @@ fn align_baseline_multiline() { let node20 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -48,8 +48,8 @@ fn align_baseline_multiline() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -59,8 +59,8 @@ fn align_baseline_multiline() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -71,8 +71,8 @@ fn align_baseline_multiline() { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_multiline_column.rs b/tests/generated/align_baseline_multiline_column.rs index cdf0718fe..e8009d660 100644 --- a/tests/generated/align_baseline_multiline_column.rs +++ b/tests/generated/align_baseline_multiline_column.rs @@ -6,8 +6,8 @@ fn align_baseline_multiline_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_multiline_column() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_multiline_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -37,8 +37,8 @@ fn align_baseline_multiline_column() { let node20 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -48,8 +48,8 @@ fn align_baseline_multiline_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(70f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(70f32), }, ..Default::default() }, @@ -59,8 +59,8 @@ fn align_baseline_multiline_column() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -72,8 +72,8 @@ fn align_baseline_multiline_column() { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_multiline_column2.rs b/tests/generated/align_baseline_multiline_column2.rs index 273a38388..b05937223 100644 --- a/tests/generated/align_baseline_multiline_column2.rs +++ b/tests/generated/align_baseline_multiline_column2.rs @@ -7,8 +7,8 @@ fn align_baseline_multiline_column2() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_baseline_multiline_column2() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn align_baseline_multiline_column2() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -40,8 +40,8 @@ fn align_baseline_multiline_column2() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_baseline_multiline_column2() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(70f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(70f32), }, ..Default::default() }, @@ -63,8 +63,8 @@ fn align_baseline_multiline_column2() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -76,8 +76,8 @@ fn align_baseline_multiline_column2() { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_multiline_row_and_column.rs b/tests/generated/align_baseline_multiline_row_and_column.rs index be684258f..59d3934fe 100644 --- a/tests/generated/align_baseline_multiline_row_and_column.rs +++ b/tests/generated/align_baseline_multiline_row_and_column.rs @@ -6,8 +6,8 @@ fn align_baseline_multiline_row_and_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_multiline_row_and_column() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_multiline_row_and_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -37,8 +37,8 @@ fn align_baseline_multiline_row_and_column() { let node20 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -48,8 +48,8 @@ fn align_baseline_multiline_row_and_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -59,8 +59,8 @@ fn align_baseline_multiline_row_and_column() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -71,8 +71,8 @@ fn align_baseline_multiline_row_and_column() { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_nested_child.rs b/tests/generated/align_baseline_nested_child.rs index a80d9514b..01fc93357 100644 --- a/tests/generated/align_baseline_nested_child.rs +++ b/tests/generated/align_baseline_nested_child.rs @@ -6,8 +6,8 @@ fn align_baseline_nested_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_baseline_nested_child() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_nested_child() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -39,8 +39,8 @@ fn align_baseline_nested_child() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_baseline_nested_column.rs b/tests/generated/align_baseline_nested_column.rs index 16bfab37e..93571481f 100644 --- a/tests/generated/align_baseline_nested_column.rs +++ b/tests/generated/align_baseline_nested_column.rs @@ -6,8 +6,8 @@ fn align_baseline_nested_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn align_baseline_nested_column() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn align_baseline_nested_column() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn align_baseline_nested_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }, @@ -56,8 +56,8 @@ fn align_baseline_nested_column() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_center_should_size_based_on_content.rs b/tests/generated/align_center_should_size_based_on_content.rs index d0c601968..a4738bf74 100644 --- a/tests/generated/align_center_should_size_based_on_content.rs +++ b/tests/generated/align_center_should_size_based_on_content.rs @@ -6,8 +6,8 @@ fn align_center_should_size_based_on_content() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn align_center_should_size_based_on_content() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_flex_end.rs b/tests/generated/align_content_flex_end.rs index d49fa7cf3..926ae4bfa 100644 --- a/tests/generated/align_content_flex_end.rs +++ b/tests/generated/align_content_flex_end.rs @@ -6,8 +6,8 @@ fn align_content_flex_end() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_flex_end() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_flex_end() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_flex_end() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_flex_end() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -55,8 +55,8 @@ fn align_content_flex_end() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_flex_start.rs b/tests/generated/align_content_flex_start.rs index 3036de2b6..640ba1abc 100644 --- a/tests/generated/align_content_flex_start.rs +++ b/tests/generated/align_content_flex_start.rs @@ -6,8 +6,8 @@ fn align_content_flex_start() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_flex_start() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_flex_start() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_flex_start() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_flex_start() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -54,8 +54,8 @@ fn align_content_flex_start() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(130f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(130f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_flex_start_with_flex.rs b/tests/generated/align_content_flex_start_with_flex.rs index 4954d9883..dccae05ed 100644 --- a/tests/generated/align_content_flex_start_with_flex.rs +++ b/tests/generated/align_content_flex_start_with_flex.rs @@ -8,7 +8,7 @@ fn align_content_flex_start_with_flex() { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -18,15 +18,15 @@ fn align_content_flex_start_with_flex() { flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -35,13 +35,13 @@ fn align_content_flex_start_with_flex() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -52,8 +52,8 @@ fn align_content_flex_start_with_flex() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_flex_start_without_height_on_children.rs b/tests/generated/align_content_flex_start_without_height_on_children.rs index 82b7c10f5..b73d5931a 100644 --- a/tests/generated/align_content_flex_start_without_height_on_children.rs +++ b/tests/generated/align_content_flex_start_without_height_on_children.rs @@ -5,37 +5,37 @@ fn align_content_flex_start_without_height_on_children() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -46,8 +46,8 @@ fn align_content_flex_start_without_height_on_children() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_not_stretch_with_align_items_stretch.rs b/tests/generated/align_content_not_stretch_with_align_items_stretch.rs index 620da7e02..bb34f11ef 100644 --- a/tests/generated/align_content_not_stretch_with_align_items_stretch.rs +++ b/tests/generated/align_content_not_stretch_with_align_items_stretch.rs @@ -6,8 +6,8 @@ fn align_content_not_stretch_with_align_items_stretch() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(272f32), - height: taffy::style::Dimension::Points(44f32), + width: taffy::style::Dimension::Length(272f32), + height: taffy::style::Dimension::Length(44f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn align_content_not_stretch_with_align_items_stretch() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(56f32), - height: taffy::style::Dimension::Points(44f32), + width: taffy::style::Dimension::Length(56f32), + height: taffy::style::Dimension::Length(44f32), }, ..Default::default() }) @@ -39,8 +39,8 @@ fn align_content_not_stretch_with_align_items_stretch() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(328f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(328f32), + height: taffy::style::Dimension::Length(52f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_around_single_line.rs b/tests/generated/align_content_space_around_single_line.rs index 2bfb7e563..8b7116b96 100644 --- a/tests/generated/align_content_space_around_single_line.rs +++ b/tests/generated/align_content_space_around_single_line.rs @@ -6,8 +6,8 @@ fn align_content_space_around_single_line() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_around_single_line() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_around_single_line() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_around_single_line() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_around_single_line() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_around_single_line() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -62,8 +62,8 @@ fn align_content_space_around_single_line() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::SpaceAround), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_around_wrapped.rs b/tests/generated/align_content_space_around_wrapped.rs index 8658f8c5b..d6f3029d8 100644 --- a/tests/generated/align_content_space_around_wrapped.rs +++ b/tests/generated/align_content_space_around_wrapped.rs @@ -6,8 +6,8 @@ fn align_content_space_around_wrapped() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_around_wrapped() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_around_wrapped() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_around_wrapped() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_around_wrapped() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_around_wrapped() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -63,8 +63,8 @@ fn align_content_space_around_wrapped() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceAround), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_between_single_line.rs b/tests/generated/align_content_space_between_single_line.rs index 8d3870642..05fa0bd12 100644 --- a/tests/generated/align_content_space_between_single_line.rs +++ b/tests/generated/align_content_space_between_single_line.rs @@ -6,8 +6,8 @@ fn align_content_space_between_single_line() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_between_single_line() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_between_single_line() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_between_single_line() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_between_single_line() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_between_single_line() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -62,8 +62,8 @@ fn align_content_space_between_single_line() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::SpaceBetween), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_between_wrapped.rs b/tests/generated/align_content_space_between_wrapped.rs index 0aa4c09a7..eff556460 100644 --- a/tests/generated/align_content_space_between_wrapped.rs +++ b/tests/generated/align_content_space_between_wrapped.rs @@ -6,8 +6,8 @@ fn align_content_space_between_wrapped() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_between_wrapped() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_between_wrapped() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_between_wrapped() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_between_wrapped() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_between_wrapped() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -63,8 +63,8 @@ fn align_content_space_between_wrapped() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceBetween), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_evenly_single_line.rs b/tests/generated/align_content_space_evenly_single_line.rs index 7400a25b7..9b547aeac 100644 --- a/tests/generated/align_content_space_evenly_single_line.rs +++ b/tests/generated/align_content_space_evenly_single_line.rs @@ -6,8 +6,8 @@ fn align_content_space_evenly_single_line() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_evenly_single_line() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_evenly_single_line() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_evenly_single_line() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_evenly_single_line() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_evenly_single_line() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -62,8 +62,8 @@ fn align_content_space_evenly_single_line() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::SpaceEvenly), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_space_evenly_wrapped.rs b/tests/generated/align_content_space_evenly_wrapped.rs index ff81be3a0..93516d9aa 100644 --- a/tests/generated/align_content_space_evenly_wrapped.rs +++ b/tests/generated/align_content_space_evenly_wrapped.rs @@ -6,8 +6,8 @@ fn align_content_space_evenly_wrapped() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_space_evenly_wrapped() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_space_evenly_wrapped() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_space_evenly_wrapped() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_space_evenly_wrapped() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn align_content_space_evenly_wrapped() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -63,8 +63,8 @@ fn align_content_space_evenly_wrapped() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceEvenly), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_spacearound.rs b/tests/generated/align_content_spacearound.rs index 325893646..5f14f2b5a 100644 --- a/tests/generated/align_content_spacearound.rs +++ b/tests/generated/align_content_spacearound.rs @@ -6,8 +6,8 @@ fn align_content_spacearound() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_spacearound() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_spacearound() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_spacearound() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_spacearound() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -54,8 +54,8 @@ fn align_content_spacearound() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceAround), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(140f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(140f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_spacebetween.rs b/tests/generated/align_content_spacebetween.rs index bdb4fdfea..17e7e3018 100644 --- a/tests/generated/align_content_spacebetween.rs +++ b/tests/generated/align_content_spacebetween.rs @@ -6,8 +6,8 @@ fn align_content_spacebetween() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn align_content_spacebetween() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_content_spacebetween() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn align_content_spacebetween() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn align_content_spacebetween() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -54,8 +54,8 @@ fn align_content_spacebetween() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceBetween), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(130f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(130f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch.rs b/tests/generated/align_content_stretch.rs index 73eeda7f3..d00bebce8 100644 --- a/tests/generated/align_content_stretch.rs +++ b/tests/generated/align_content_stretch.rs @@ -5,31 +5,31 @@ fn align_content_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -40,8 +40,8 @@ fn align_content_stretch() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_column.rs b/tests/generated/align_content_stretch_column.rs index 429048b66..b71d61da9 100644 --- a/tests/generated/align_content_stretch_column.rs +++ b/tests/generated/align_content_stretch_column.rs @@ -15,7 +15,7 @@ fn align_content_stretch_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node00], @@ -26,25 +26,25 @@ fn align_content_stretch_column() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -55,8 +55,8 @@ fn align_content_stretch_column() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(150f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(150f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_is_not_overriding_align_items.rs b/tests/generated/align_content_stretch_is_not_overriding_align_items.rs index e5f8da305..086869506 100644 --- a/tests/generated/align_content_stretch_is_not_overriding_align_items.rs +++ b/tests/generated/align_content_stretch_is_not_overriding_align_items.rs @@ -7,8 +7,8 @@ fn align_content_stretch_is_not_overriding_align_items() { .new_leaf(taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn align_content_stretch_is_not_overriding_align_items() { align_items: Some(taffy::style::AlignItems::Center), align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row.rs b/tests/generated/align_content_stretch_row.rs index dac43061c..eb57bd93a 100644 --- a/tests/generated/align_content_stretch_row.rs +++ b/tests/generated/align_content_stretch_row.rs @@ -5,31 +5,31 @@ fn align_content_stretch_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -39,8 +39,8 @@ fn align_content_stretch_row() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_children.rs b/tests/generated/align_content_stretch_row_with_children.rs index 6703a20f6..4d7ce8b78 100644 --- a/tests/generated/align_content_stretch_row_with_children.rs +++ b/tests/generated/align_content_stretch_row_with_children.rs @@ -15,7 +15,7 @@ fn align_content_stretch_row_with_children() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node00], @@ -23,25 +23,25 @@ fn align_content_stretch_row_with_children() { .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -51,8 +51,8 @@ fn align_content_stretch_row_with_children() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_fixed_height.rs b/tests/generated/align_content_stretch_row_with_fixed_height.rs index e4b8fe40e..18c35e35d 100644 --- a/tests/generated/align_content_stretch_row_with_fixed_height.rs +++ b/tests/generated/align_content_stretch_row_with_fixed_height.rs @@ -5,34 +5,34 @@ fn align_content_stretch_row_with_fixed_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -42,8 +42,8 @@ fn align_content_stretch_row_with_fixed_height() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_flex.rs b/tests/generated/align_content_stretch_row_with_flex.rs index ee27fac3c..b692d0717 100644 --- a/tests/generated/align_content_stretch_row_with_flex.rs +++ b/tests/generated/align_content_stretch_row_with_flex.rs @@ -5,7 +5,7 @@ fn align_content_stretch_row_with_flex() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,13 +14,13 @@ fn align_content_stretch_row_with_flex() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -29,13 +29,13 @@ fn align_content_stretch_row_with_flex() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -45,8 +45,8 @@ fn align_content_stretch_row_with_flex() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_flex_no_shrink.rs b/tests/generated/align_content_stretch_row_with_flex_no_shrink.rs index b2a357ea2..1b67d19fd 100644 --- a/tests/generated/align_content_stretch_row_with_flex_no_shrink.rs +++ b/tests/generated/align_content_stretch_row_with_flex_no_shrink.rs @@ -5,7 +5,7 @@ fn align_content_stretch_row_with_flex_no_shrink() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,13 +14,13 @@ fn align_content_stretch_row_with_flex_no_shrink() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -29,13 +29,13 @@ fn align_content_stretch_row_with_flex_no_shrink() { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -45,8 +45,8 @@ fn align_content_stretch_row_with_flex_no_shrink() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_margin.rs b/tests/generated/align_content_stretch_row_with_margin.rs index d4afa1977..fbd7f080d 100644 --- a/tests/generated/align_content_stretch_row_with_margin.rs +++ b/tests/generated/align_content_stretch_row_with_margin.rs @@ -5,43 +5,43 @@ fn align_content_stretch_row_with_margin() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -51,8 +51,8 @@ fn align_content_stretch_row_with_margin() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_max_height.rs b/tests/generated/align_content_stretch_row_with_max_height.rs index bf7be7f78..f9f0366c3 100644 --- a/tests/generated/align_content_stretch_row_with_max_height.rs +++ b/tests/generated/align_content_stretch_row_with_max_height.rs @@ -5,32 +5,32 @@ fn align_content_stretch_row_with_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -40,8 +40,8 @@ fn align_content_stretch_row_with_max_height() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_min_height.rs b/tests/generated/align_content_stretch_row_with_min_height.rs index a815ab526..bd7505acc 100644 --- a/tests/generated/align_content_stretch_row_with_min_height.rs +++ b/tests/generated/align_content_stretch_row_with_min_height.rs @@ -5,32 +5,32 @@ fn align_content_stretch_row_with_min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(80f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(80f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -40,8 +40,8 @@ fn align_content_stretch_row_with_min_height() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_padding.rs b/tests/generated/align_content_stretch_row_with_padding.rs index 09e0c8da5..a97f796aa 100644 --- a/tests/generated/align_content_stretch_row_with_padding.rs +++ b/tests/generated/align_content_stretch_row_with_padding.rs @@ -5,43 +5,43 @@ fn align_content_stretch_row_with_padding() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -51,8 +51,8 @@ fn align_content_stretch_row_with_padding() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_content_stretch_row_with_single_row.rs b/tests/generated/align_content_stretch_row_with_single_row.rs index 9a3f663e6..0f0fd261d 100644 --- a/tests/generated/align_content_stretch_row_with_single_row.rs +++ b/tests/generated/align_content_stretch_row_with_single_row.rs @@ -5,13 +5,13 @@ fn align_content_stretch_row_with_single_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,8 +21,8 @@ fn align_content_stretch_row_with_single_row() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_flex_start_with_shrinking_children.rs b/tests/generated/align_flex_start_with_shrinking_children.rs index e2ee393cc..65cf55d8f 100644 --- a/tests/generated/align_flex_start_with_shrinking_children.rs +++ b/tests/generated/align_flex_start_with_shrinking_children.rs @@ -18,8 +18,8 @@ fn align_flex_start_with_shrinking_children() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs b/tests/generated/align_flex_start_with_shrinking_children_with_stretch.rs index 542711279..244989757 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 @@ -26,8 +26,8 @@ fn align_flex_start_with_shrinking_children_with_stretch() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/align_flex_start_with_stretching_children.rs b/tests/generated/align_flex_start_with_stretching_children.rs index 256f50a0e..b226615f8 100644 --- a/tests/generated/align_flex_start_with_stretching_children.rs +++ b/tests/generated/align_flex_start_with_stretching_children.rs @@ -13,8 +13,8 @@ fn align_flex_start_with_stretching_children() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center.rs b/tests/generated/align_items_center.rs index 1a7dc99e8..0a84a7295 100644 --- a/tests/generated/align_items_center.rs +++ b/tests/generated/align_items_center.rs @@ -6,8 +6,8 @@ fn align_items_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_items_center() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs b/tests/generated/align_items_center_child_with_margin_bigger_than_parent.rs index b15f9b2b0..8872eecd8 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 @@ -6,12 +6,12 @@ fn align_items_center_child_with_margin_bigger_than_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -30,8 +30,8 @@ fn align_items_center_child_with_margin_bigger_than_parent() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_center_child_without_margin_bigger_than_parent.rs index 10f4def6f..11b4e8653 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 @@ -6,8 +6,8 @@ fn align_items_center_child_without_margin_bigger_than_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(70f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_items_center_child_without_margin_bigger_than_parent() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_justify_content_center.rs b/tests/generated/align_items_center_justify_content_center.rs index a428946b8..91ba2f30f 100644 --- a/tests/generated/align_items_center_justify_content_center.rs +++ b/tests/generated/align_items_center_justify_content_center.rs @@ -7,8 +7,8 @@ fn align_items_center_justify_content_center() { .new_leaf_with_measure( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }, @@ -32,8 +32,8 @@ fn align_items_center_justify_content_center() { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Percent(1f32) }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -48,7 +48,7 @@ fn align_items_center_justify_content_center() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node00], @@ -59,8 +59,8 @@ fn align_items_center_justify_content_center() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_min_max_with_padding.rs b/tests/generated/align_items_center_min_max_with_padding.rs index 387c06ba3..046bd66a3 100644 --- a/tests/generated/align_items_center_min_max_with_padding.rs +++ b/tests/generated/align_items_center_min_max_with_padding.rs @@ -6,8 +6,8 @@ fn align_items_center_min_max_with_padding() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(62f32), - height: taffy::style::Dimension::Points(62f32), + width: taffy::style::Dimension::Length(62f32), + height: taffy::style::Dimension::Length(62f32), }, ..Default::default() }) @@ -17,18 +17,18 @@ fn align_items_center_min_max_with_padding() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(320f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(320f32), + height: taffy::style::Dimension::Length(72f32), }, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(320f32), - height: taffy::style::Dimension::Points(504f32), + width: taffy::style::Dimension::Length(320f32), + height: taffy::style::Dimension::Length(504f32), }, padding: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentage::Points(8f32), - bottom: taffy::style::LengthPercentage::Points(8f32), + top: taffy::style::LengthPercentage::Length(8f32), + bottom: taffy::style::LengthPercentage::Length(8f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_with_child_margin.rs b/tests/generated/align_items_center_with_child_margin.rs index f96686a83..d3d38be0d 100644 --- a/tests/generated/align_items_center_with_child_margin.rs +++ b/tests/generated/align_items_center_with_child_margin.rs @@ -6,13 +6,13 @@ fn align_items_center_with_child_margin() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: zero(), }, ..Default::default() @@ -23,8 +23,8 @@ fn align_items_center_with_child_margin() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_center_with_child_top.rs b/tests/generated/align_items_center_with_child_top.rs index 7a0459dbd..089bbf625 100644 --- a/tests/generated/align_items_center_with_child_top.rs +++ b/tests/generated/align_items_center_with_child_top.rs @@ -6,13 +6,13 @@ fn align_items_center_with_child_top() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -23,8 +23,8 @@ fn align_items_center_with_child_top() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_flex_end.rs b/tests/generated/align_items_flex_end.rs index eb8741851..225793e96 100644 --- a/tests/generated/align_items_flex_end.rs +++ b/tests/generated/align_items_flex_end.rs @@ -6,8 +6,8 @@ fn align_items_flex_end() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_items_flex_end() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs b/tests/generated/align_items_flex_end_child_with_margin_bigger_than_parent.rs index d83300997..66058782d 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 @@ -6,12 +6,12 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -30,8 +30,8 @@ fn align_items_flex_end_child_with_margin_bigger_than_parent() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs b/tests/generated/align_items_flex_end_child_without_margin_bigger_than_parent.rs index e8f88789a..dfcbfff5b 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 @@ -6,8 +6,8 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(70f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(70f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn align_items_flex_end_child_without_margin_bigger_than_parent() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_flex_start.rs b/tests/generated/align_items_flex_start.rs index 5f4468187..c37316871 100644 --- a/tests/generated/align_items_flex_start.rs +++ b/tests/generated/align_items_flex_start.rs @@ -6,8 +6,8 @@ fn align_items_flex_start() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_items_flex_start() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_min_max.rs b/tests/generated/align_items_min_max.rs index 8e2ebbdd7..c40123e94 100644 --- a/tests/generated/align_items_min_max.rs +++ b/tests/generated/align_items_min_max.rs @@ -6,8 +6,8 @@ fn align_items_min_max() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,9 +17,9 @@ fn align_items_min_max() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Center), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/align_items_stretch.rs b/tests/generated/align_items_stretch.rs index 2653c99df..a2790385c 100644 --- a/tests/generated/align_items_stretch.rs +++ b/tests/generated/align_items_stretch.rs @@ -5,7 +5,7 @@ fn align_items_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -13,8 +13,8 @@ fn align_items_stretch() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_items_stretch_min_cross.rs b/tests/generated/align_items_stretch_min_cross.rs index 3fc192094..8d472005d 100644 --- a/tests/generated/align_items_stretch_min_cross.rs +++ b/tests/generated/align_items_stretch_min_cross.rs @@ -6,7 +6,7 @@ fn align_items_stretch_min_cross() { let node0 = taffy .new_leaf(taffy::style::Style { flex_shrink: 0f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(36f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(36f32) }, ..Default::default() }) .unwrap(); @@ -15,8 +15,8 @@ fn align_items_stretch_min_cross() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/align_self_baseline.rs b/tests/generated/align_self_baseline.rs index e6fa444d1..8baca98aa 100644 --- a/tests/generated/align_self_baseline.rs +++ b/tests/generated/align_self_baseline.rs @@ -7,8 +7,8 @@ fn align_self_baseline() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn align_self_baseline() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn align_self_baseline() { taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -39,8 +39,8 @@ fn align_self_baseline() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_self_center.rs b/tests/generated/align_self_center.rs index 46a0cd8ee..9054d4a56 100644 --- a/tests/generated/align_self_center.rs +++ b/tests/generated/align_self_center.rs @@ -7,8 +7,8 @@ fn align_self_center() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_self_center() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_self_center_undefined_max_height.rs b/tests/generated/align_self_center_undefined_max_height.rs index 95817bfd0..89862fbcd 100644 --- a/tests/generated/align_self_center_undefined_max_height.rs +++ b/tests/generated/align_self_center_undefined_max_height.rs @@ -6,8 +6,8 @@ fn align_self_center_undefined_max_height() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(240f32), - height: taffy::style::Dimension::Points(44f32), + width: taffy::style::Dimension::Length(240f32), + height: taffy::style::Dimension::Length(44f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn align_self_center_undefined_max_height() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(56f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(56f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn align_self_center_undefined_max_height() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(280f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(52f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(280f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(52f32) }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/align_self_flex_end.rs b/tests/generated/align_self_flex_end.rs index fa9266738..52073864a 100644 --- a/tests/generated/align_self_flex_end.rs +++ b/tests/generated/align_self_flex_end.rs @@ -7,8 +7,8 @@ fn align_self_flex_end() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_self_flex_end() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_self_flex_end_override_flex_start.rs b/tests/generated/align_self_flex_end_override_flex_start.rs index 4ff85aa24..e0c0dce38 100644 --- a/tests/generated/align_self_flex_end_override_flex_start.rs +++ b/tests/generated/align_self_flex_end_override_flex_start.rs @@ -7,8 +7,8 @@ fn align_self_flex_end_override_flex_start() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn align_self_flex_end_override_flex_start() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_self_flex_start.rs b/tests/generated/align_self_flex_start.rs index 24856f393..decaad02d 100644 --- a/tests/generated/align_self_flex_start.rs +++ b/tests/generated/align_self_flex_start.rs @@ -7,8 +7,8 @@ fn align_self_flex_start() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn align_self_flex_start() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/align_stretch_should_size_based_on_parent.rs b/tests/generated/align_stretch_should_size_based_on_parent.rs index 95a38b5a2..3a101ee02 100644 --- a/tests/generated/align_stretch_should_size_based_on_parent.rs +++ b/tests/generated/align_stretch_should_size_based_on_parent.rs @@ -6,8 +6,8 @@ fn align_stretch_should_size_based_on_parent() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -30,8 +30,8 @@ fn align_stretch_should_size_based_on_parent() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/android_news_feed.rs b/tests/generated/android_news_feed.rs index c12476bfe..edbb5c7fe 100644 --- a/tests/generated/android_news_feed.rs +++ b/tests/generated/android_news_feed.rs @@ -8,8 +8,8 @@ fn android_news_feed() { align_content: Some(taffy::style::AlignContent::Stretch), flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }) @@ -46,15 +46,15 @@ fn android_news_feed() { flex_shrink: 1f32, margin: taffy::geometry::Rect { left: zero(), - right: taffy::style::LengthPercentageAuto::Points(36f32), + right: taffy::style::LengthPercentageAuto::Length(36f32), top: zero(), bottom: zero(), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(36f32), - right: taffy::style::LengthPercentage::Points(36f32), - top: taffy::style::LengthPercentage::Points(21f32), - bottom: taffy::style::LengthPercentage::Points(18f32), + left: taffy::style::LengthPercentage::Length(36f32), + right: taffy::style::LengthPercentage::Length(36f32), + top: taffy::style::LengthPercentage::Length(21f32), + bottom: taffy::style::LengthPercentage::Length(18f32), }, ..Default::default() }, @@ -67,9 +67,9 @@ fn android_news_feed() { align_items: Some(taffy::style::AlignItems::FlexStart), align_content: Some(taffy::style::AlignContent::Stretch), margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(36f32), + left: taffy::style::LengthPercentageAuto::Length(36f32), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(24f32), + top: taffy::style::LengthPercentageAuto::Length(24f32), bottom: zero(), }, ..Default::default() @@ -92,8 +92,8 @@ fn android_news_feed() { align_content: Some(taffy::style::AlignContent::Stretch), flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(72f32), + height: taffy::style::Dimension::Length(72f32), }, ..Default::default() }) @@ -130,15 +130,15 @@ fn android_news_feed() { flex_shrink: 1f32, margin: taffy::geometry::Rect { left: zero(), - right: taffy::style::LengthPercentageAuto::Points(36f32), + right: taffy::style::LengthPercentageAuto::Length(36f32), top: zero(), bottom: zero(), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(36f32), - right: taffy::style::LengthPercentage::Points(36f32), - top: taffy::style::LengthPercentage::Points(21f32), - bottom: taffy::style::LengthPercentage::Points(18f32), + left: taffy::style::LengthPercentage::Length(36f32), + right: taffy::style::LengthPercentage::Length(36f32), + top: taffy::style::LengthPercentage::Length(21f32), + bottom: taffy::style::LengthPercentage::Length(18f32), }, ..Default::default() }, @@ -151,9 +151,9 @@ fn android_news_feed() { align_items: Some(taffy::style::AlignItems::FlexStart), align_content: Some(taffy::style::AlignContent::Stretch), margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(174f32), + left: taffy::style::LengthPercentageAuto::Length(174f32), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(24f32), + top: taffy::style::LengthPercentageAuto::Length(24f32), bottom: zero(), }, ..Default::default() @@ -197,7 +197,7 @@ fn android_news_feed() { flex_direction: taffy::style::FlexDirection::Column, align_content: Some(taffy::style::AlignContent::Stretch), flex_shrink: 0f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(1080f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(1080f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/aspect_ratio_flex_column_fill_height.rs b/tests/generated/aspect_ratio_flex_column_fill_height.rs index 15406342b..843969ba9 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_height.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_fill_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -17,8 +17,8 @@ fn aspect_ratio_flex_column_fill_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_max_height.rs b/tests/generated/aspect_ratio_flex_column_fill_max_height.rs index d8296e3eb..72d61b53f 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_max_height.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_max_height.rs @@ -3,7 +3,7 @@ fn aspect_ratio_flex_column_fill_max_height() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Points (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Length (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { @@ -11,8 +11,8 @@ fn aspect_ratio_flex_column_fill_max_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_max_width.rs b/tests/generated/aspect_ratio_flex_column_fill_max_width.rs index 069692fca..31d6e6e12 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_max_width.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_max_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_column_fill_max_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -29,8 +29,8 @@ fn aspect_ratio_flex_column_fill_max_width() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_min_height.rs b/tests/generated/aspect_ratio_flex_column_fill_min_height.rs index b1844bd47..6e70a2ff1 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_min_height.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_min_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_fill_min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -17,8 +17,8 @@ fn aspect_ratio_flex_column_fill_min_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_min_width.rs b/tests/generated/aspect_ratio_flex_column_fill_min_width.rs index 07c2cedf8..aef83bb66 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_min_width.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_min_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_column_fill_min_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -29,8 +29,8 @@ fn aspect_ratio_flex_column_fill_min_width() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_width.rs b/tests/generated/aspect_ratio_flex_column_fill_width.rs index c6d19b25b..0fd3c694f 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_width.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_width.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_fill_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -17,8 +17,8 @@ fn aspect_ratio_flex_column_fill_width() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_fill_width_flex.rs b/tests/generated/aspect_ratio_flex_column_fill_width_flex.rs index dab95a8c9..b91001e0e 100644 --- a/tests/generated/aspect_ratio_flex_column_fill_width_flex.rs +++ b/tests/generated/aspect_ratio_flex_column_fill_width_flex.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_fill_width_flex() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_column_fill_width_flex() { display: taffy::style::Display::Grid, flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_stretch_fill_height.rs b/tests/generated/aspect_ratio_flex_column_stretch_fill_height.rs index 39bbaaa2e..21adbd2db 100644 --- a/tests/generated/aspect_ratio_flex_column_stretch_fill_height.rs +++ b/tests/generated/aspect_ratio_flex_column_stretch_fill_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_stretch_fill_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_column_stretch_fill_height() { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_stretch_fill_max_height.rs b/tests/generated/aspect_ratio_flex_column_stretch_fill_max_height.rs index bb9269869..55e050f25 100644 --- a/tests/generated/aspect_ratio_flex_column_stretch_fill_max_height.rs +++ b/tests/generated/aspect_ratio_flex_column_stretch_fill_max_height.rs @@ -3,15 +3,15 @@ fn aspect_ratio_flex_column_stretch_fill_max_height() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Points (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Length (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_stretch_fill_max_width.rs b/tests/generated/aspect_ratio_flex_column_stretch_fill_max_width.rs index 92d4c1e16..a893eee43 100644 --- a/tests/generated/aspect_ratio_flex_column_stretch_fill_max_width.rs +++ b/tests/generated/aspect_ratio_flex_column_stretch_fill_max_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_column_stretch_fill_max_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -28,8 +28,8 @@ fn aspect_ratio_flex_column_stretch_fill_max_width() { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_column_stretch_fill_width.rs b/tests/generated/aspect_ratio_flex_column_stretch_fill_width.rs index 22c315efa..91dd1352a 100644 --- a/tests/generated/aspect_ratio_flex_column_stretch_fill_width.rs +++ b/tests/generated/aspect_ratio_flex_column_stretch_fill_width.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_column_stretch_fill_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_column_stretch_fill_width() { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_height.rs b/tests/generated/aspect_ratio_flex_row_fill_height.rs index a34648566..69e74ab20 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_height.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_fill_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_row_fill_height() { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_max_height.rs b/tests/generated/aspect_ratio_flex_row_fill_max_height.rs index c6275d144..ead89fa20 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_max_height.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_max_height.rs @@ -3,15 +3,15 @@ fn aspect_ratio_flex_row_fill_max_height() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Points (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Length (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_max_width.rs b/tests/generated/aspect_ratio_flex_row_fill_max_width.rs index 34a5d1be0..cd2e6dff1 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_max_width.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_max_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_row_fill_max_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -28,8 +28,8 @@ fn aspect_ratio_flex_row_fill_max_width() { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_min_height.rs b/tests/generated/aspect_ratio_flex_row_fill_min_height.rs index 30f416298..75972828d 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_min_height.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_min_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_fill_min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_row_fill_min_height() { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_min_width.rs b/tests/generated/aspect_ratio_flex_row_fill_min_width.rs index b5f683c66..6bc68b333 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_min_width.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_min_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_row_fill_min_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -28,8 +28,8 @@ fn aspect_ratio_flex_row_fill_min_width() { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_width.rs b/tests/generated/aspect_ratio_flex_row_fill_width.rs index e4d360336..4ee953c7f 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_width.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_width.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_fill_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_row_fill_width() { display: taffy::style::Display::Flex, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_fill_width_flex.rs b/tests/generated/aspect_ratio_flex_row_fill_width_flex.rs index 5ebe19dac..b821fc3c2 100644 --- a/tests/generated/aspect_ratio_flex_row_fill_width_flex.rs +++ b/tests/generated/aspect_ratio_flex_row_fill_width_flex.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_fill_width_flex() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -16,8 +16,8 @@ fn aspect_ratio_flex_row_fill_width_flex() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_stretch_fill_height.rs b/tests/generated/aspect_ratio_flex_row_stretch_fill_height.rs index 5074c867b..a8a30cfee 100644 --- a/tests/generated/aspect_ratio_flex_row_stretch_fill_height.rs +++ b/tests/generated/aspect_ratio_flex_row_stretch_fill_height.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_stretch_fill_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -15,8 +15,8 @@ fn aspect_ratio_flex_row_stretch_fill_height() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_stretch_fill_max_height.rs b/tests/generated/aspect_ratio_flex_row_stretch_fill_max_height.rs index 5c6d5e8ba..6114dfe4a 100644 --- a/tests/generated/aspect_ratio_flex_row_stretch_fill_max_height.rs +++ b/tests/generated/aspect_ratio_flex_row_stretch_fill_max_height.rs @@ -3,14 +3,14 @@ fn aspect_ratio_flex_row_stretch_fill_max_height() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Points (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { max_size : taffy :: geometry :: Size { width : taffy :: style :: Dimension :: Length (40f32) , height : auto () , } , aspect_ratio : Some (2f32) , .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH\u{200b}HH" ; super :: measure_standard_text (known_dimensions , available_space , TEXT , super :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_stretch_fill_max_width.rs b/tests/generated/aspect_ratio_flex_row_stretch_fill_max_width.rs index eb7c410de..76b8be5ff 100644 --- a/tests/generated/aspect_ratio_flex_row_stretch_fill_max_width.rs +++ b/tests/generated/aspect_ratio_flex_row_stretch_fill_max_width.rs @@ -6,7 +6,7 @@ fn aspect_ratio_flex_row_stretch_fill_max_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -27,8 +27,8 @@ fn aspect_ratio_flex_row_stretch_fill_max_width() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/aspect_ratio_flex_row_stretch_fill_width.rs b/tests/generated/aspect_ratio_flex_row_stretch_fill_width.rs index 335d139f0..71c1db69f 100644 --- a/tests/generated/aspect_ratio_flex_row_stretch_fill_width.rs +++ b/tests/generated/aspect_ratio_flex_row_stretch_fill_width.rs @@ -5,7 +5,7 @@ fn aspect_ratio_flex_row_stretch_fill_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(40f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(40f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -15,8 +15,8 @@ fn aspect_ratio_flex_row_stretch_fill_width() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_7976_3_level.rs b/tests/generated/bevy_issue_7976_3_level.rs index 9b962e0f2..217d36066 100644 --- a/tests/generated/bevy_issue_7976_3_level.rs +++ b/tests/generated/bevy_issue_7976_3_level.rs @@ -10,10 +10,10 @@ fn bevy_issue_7976_3_level() { height: taffy::style::Dimension::Percent(1f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) @@ -22,20 +22,20 @@ fn bevy_issue_7976_3_level() { .new_with_children( taffy::style::Style { min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, @@ -47,8 +47,8 @@ fn bevy_issue_7976_3_level() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_7976_4_level.rs b/tests/generated/bevy_issue_7976_4_level.rs index 3f97cc85d..5affced4d 100644 --- a/tests/generated/bevy_issue_7976_4_level.rs +++ b/tests/generated/bevy_issue_7976_4_level.rs @@ -12,10 +12,10 @@ fn bevy_issue_7976_4_level() { height: taffy::style::Dimension::Percent(1f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, @@ -26,20 +26,20 @@ fn bevy_issue_7976_4_level() { .new_with_children( taffy::style::Style { min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, @@ -51,8 +51,8 @@ fn bevy_issue_7976_4_level() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_7976_reduced.rs b/tests/generated/bevy_issue_7976_reduced.rs index 36675b485..7b24108e1 100644 --- a/tests/generated/bevy_issue_7976_reduced.rs +++ b/tests/generated/bevy_issue_7976_reduced.rs @@ -5,7 +5,7 @@ fn bevy_issue_7976_reduced() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -13,7 +13,7 @@ fn bevy_issue_7976_reduced() { .new_with_children( taffy::style::Style { align_content: Some(taffy::style::AlignContent::Start), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/bevy_issue_8017.rs b/tests/generated/bevy_issue_8017.rs index 64ce0b6f3..641b73f63 100644 --- a/tests/generated/bevy_issue_8017.rs +++ b/tests/generated/bevy_issue_8017.rs @@ -26,8 +26,8 @@ fn bevy_issue_8017() { taffy::style::Style { display: taffy::style::Display::Flex, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(8f32), - height: taffy::style::LengthPercentage::Points(8f32), + width: taffy::style::LengthPercentage::Length(8f32), + height: taffy::style::LengthPercentage::Length(8f32), }, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), @@ -61,8 +61,8 @@ fn bevy_issue_8017() { taffy::style::Style { display: taffy::style::Display::Flex, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(8f32), - height: taffy::style::LengthPercentage::Points(8f32), + width: taffy::style::LengthPercentage::Length(8f32), + height: taffy::style::LengthPercentage::Length(8f32), }, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), @@ -79,18 +79,18 @@ fn bevy_issue_8017() { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(8f32), - height: taffy::style::LengthPercentage::Points(8f32), + width: taffy::style::LengthPercentage::Length(8f32), + height: taffy::style::LengthPercentage::Length(8f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(400f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(8f32), - top: taffy::style::LengthPercentage::Points(8f32), - bottom: taffy::style::LengthPercentage::Points(8f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(8f32), + top: taffy::style::LengthPercentage::Length(8f32), + bottom: taffy::style::LengthPercentage::Length(8f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_8017_reduced.rs b/tests/generated/bevy_issue_8017_reduced.rs index 12bf5b4aa..dea1c4e63 100644 --- a/tests/generated/bevy_issue_8017_reduced.rs +++ b/tests/generated/bevy_issue_8017_reduced.rs @@ -28,12 +28,12 @@ fn bevy_issue_8017_reduced() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(8f32), - height: taffy::style::LengthPercentage::Points(8f32), + width: taffy::style::LengthPercentage::Length(8f32), + height: taffy::style::LengthPercentage::Length(8f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_8082.rs b/tests/generated/bevy_issue_8082.rs index dcfa2b6be..7ecf4b45e 100644 --- a/tests/generated/bevy_issue_8082.rs +++ b/tests/generated/bevy_issue_8082.rs @@ -6,14 +6,14 @@ fn bevy_issue_8082() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -21,14 +21,14 @@ fn bevy_issue_8082() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -36,14 +36,14 @@ fn bevy_issue_8082() { let node02 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -51,14 +51,14 @@ fn bevy_issue_8082() { let node03 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -83,8 +83,8 @@ fn bevy_issue_8082() { align_content: Some(taffy::style::AlignContent::Center), justify_content: Some(taffy::style::JustifyContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/bevy_issue_8082_percent.rs b/tests/generated/bevy_issue_8082_percent.rs index d50d601df..aec3d1107 100644 --- a/tests/generated/bevy_issue_8082_percent.rs +++ b/tests/generated/bevy_issue_8082_percent.rs @@ -6,8 +6,8 @@ fn bevy_issue_8082_percent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn bevy_issue_8082_percent() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn bevy_issue_8082_percent() { let node02 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn bevy_issue_8082_percent() { let node03 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn bevy_issue_8082_percent() { align_content: Some(taffy::style::AlignContent::Center), justify_content: Some(taffy::style::JustifyContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/border_center_child.rs b/tests/generated/border_center_child.rs index 21300bd17..101205234 100644 --- a/tests/generated/border_center_child.rs +++ b/tests/generated/border_center_child.rs @@ -6,8 +6,8 @@ fn border_center_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -18,14 +18,14 @@ fn border_center_child() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, border: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(20f32), }, ..Default::default() }, diff --git a/tests/generated/border_container_match_child.rs b/tests/generated/border_container_match_child.rs index 398d177a0..92edc6bc8 100644 --- a/tests/generated/border_container_match_child.rs +++ b/tests/generated/border_container_match_child.rs @@ -6,8 +6,8 @@ fn border_container_match_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,10 +17,10 @@ fn border_container_match_child() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/border_flex_child.rs b/tests/generated/border_flex_child.rs index 979b3b7b4..11e792f67 100644 --- a/tests/generated/border_flex_child.rs +++ b/tests/generated/border_flex_child.rs @@ -6,7 +6,7 @@ fn border_flex_child() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,14 +14,14 @@ fn border_flex_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/border_no_child.rs b/tests/generated/border_no_child.rs index 40ab96cc5..d33dea7cc 100644 --- a/tests/generated/border_no_child.rs +++ b/tests/generated/border_no_child.rs @@ -6,10 +6,10 @@ fn border_no_child() { let node = taffy .new_leaf(taffy::style::Style { border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) diff --git a/tests/generated/border_no_size.rs b/tests/generated/border_no_size.rs index e59eb170c..d29f4ebd1 100644 --- a/tests/generated/border_no_size.rs +++ b/tests/generated/border_no_size.rs @@ -7,10 +7,10 @@ fn border_no_size() { .new_leaf(taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) diff --git a/tests/generated/border_stretch_child.rs b/tests/generated/border_stretch_child.rs index 07badb62d..961281fcd 100644 --- a/tests/generated/border_stretch_child.rs +++ b/tests/generated/border_stretch_child.rs @@ -5,7 +5,7 @@ fn border_stretch_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -13,14 +13,14 @@ fn border_stretch_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/child_min_max_width_flexing.rs b/tests/generated/child_min_max_width_flexing.rs index 0571db88a..f9b3fca1c 100644 --- a/tests/generated/child_min_max_width_flexing.rs +++ b/tests/generated/child_min_max_width_flexing.rs @@ -7,8 +7,8 @@ fn child_min_max_width_flexing() { .new_leaf(taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(0f32), - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(0f32), + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -17,7 +17,7 @@ fn child_min_max_width_flexing() { flex_grow: 1f32, flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn child_min_max_width_flexing() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/child_with_padding_align_end.rs b/tests/generated/child_with_padding_align_end.rs index 2928a6df6..f4e448115 100644 --- a/tests/generated/child_with_padding_align_end.rs +++ b/tests/generated/child_with_padding_align_end.rs @@ -6,14 +6,14 @@ fn child_with_padding_align_end() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(20f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(20f32), - bottom: taffy::style::LengthPercentage::Points(20f32), + left: taffy::style::LengthPercentage::Length(20f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(20f32), + bottom: taffy::style::LengthPercentage::Length(20f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn child_with_padding_align_end() { align_items: Some(taffy::style::AlignItems::FlexEnd), justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/container_with_unsized_child.rs b/tests/generated/container_with_unsized_child.rs index 795aebcc3..92c0b9ac1 100644 --- a/tests/generated/container_with_unsized_child.rs +++ b/tests/generated/container_with_unsized_child.rs @@ -8,8 +8,8 @@ fn container_with_unsized_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none.rs b/tests/generated/display_none.rs index f17b63355..34920bdc2 100644 --- a/tests/generated/display_none.rs +++ b/tests/generated/display_none.rs @@ -11,8 +11,8 @@ fn display_none() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_absolute_child.rs b/tests/generated/display_none_absolute_child.rs index 2002cb8de..a59d97151 100644 --- a/tests/generated/display_none_absolute_child.rs +++ b/tests/generated/display_none_absolute_child.rs @@ -9,13 +9,13 @@ fn display_none_absolute_child() { display: taffy::style::Display::None, position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -25,8 +25,8 @@ fn display_none_absolute_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_fixed_size.rs b/tests/generated/display_none_fixed_size.rs index 506914406..4eb8dfab4 100644 --- a/tests/generated/display_none_fixed_size.rs +++ b/tests/generated/display_none_fixed_size.rs @@ -8,8 +8,8 @@ fn display_none_fixed_size() { .new_leaf(taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn display_none_fixed_size() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_only_node.rs b/tests/generated/display_none_only_node.rs index 55925d1fd..590c3678f 100644 --- a/tests/generated/display_none_only_node.rs +++ b/tests/generated/display_none_only_node.rs @@ -7,8 +7,8 @@ fn display_none_only_node() { .new_leaf(taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/display_none_with_child.rs b/tests/generated/display_none_with_child.rs index 9d77b8ff2..17412e659 100644 --- a/tests/generated/display_none_with_child.rs +++ b/tests/generated/display_none_with_child.rs @@ -16,7 +16,7 @@ fn display_none_with_child() { flex_grow: 1f32, flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -45,8 +45,8 @@ fn display_none_with_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_with_margin.rs b/tests/generated/display_none_with_margin.rs index dcbbaad7b..f872d14c9 100644 --- a/tests/generated/display_none_with_margin.rs +++ b/tests/generated/display_none_with_margin.rs @@ -7,14 +7,14 @@ fn display_none_with_margin() { .new_leaf(taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn display_none_with_margin() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_with_position.rs b/tests/generated/display_none_with_position.rs index b600c7d85..1d2de6c5d 100644 --- a/tests/generated/display_none_with_position.rs +++ b/tests/generated/display_none_with_position.rs @@ -11,7 +11,7 @@ fn display_none_with_position() { inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -21,8 +21,8 @@ fn display_none_with_position() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/display_none_with_position_absolute.rs b/tests/generated/display_none_with_position_absolute.rs index f02a5630c..1972d9767 100644 --- a/tests/generated/display_none_with_position_absolute.rs +++ b/tests/generated/display_none_with_position_absolute.rs @@ -8,8 +8,8 @@ fn display_none_with_position_absolute() { display: taffy::style::Display::None, position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn display_none_with_position_absolute() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent.rs b/tests/generated/do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent.rs index abc436687..0cc3f8e7f 100644 --- a/tests/generated/do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent.rs +++ b/tests/generated/do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent.rs @@ -6,8 +6,8 @@ fn do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent( let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -18,9 +18,9 @@ fn do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent( position: taffy::style::Position::Absolute, flex_direction: taffy::style::FlexDirection::Column, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -36,8 +36,8 @@ fn do_not_clamp_height_of_absolute_node_to_height_of_its_overflow_hidden_parent( y: taffy::style::Overflow::Hidden, }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs b/tests/generated/flex_basis_and_main_dimen_set_when_flexing.rs index 721b45267..dc91db465 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 @@ -6,10 +6,10 @@ fn flex_basis_and_main_dimen_set_when_flexing() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(10f32), + flex_basis: taffy::style::Dimension::Length(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,10 +17,10 @@ fn flex_basis_and_main_dimen_set_when_flexing() { let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(10f32), + flex_basis: taffy::style::Dimension::Length(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(0f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -28,7 +28,7 @@ fn flex_basis_and_main_dimen_set_when_flexing() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_flex_grow_column.rs b/tests/generated/flex_basis_flex_grow_column.rs index 3f9bea0fc..2d18ce36e 100644 --- a/tests/generated/flex_basis_flex_grow_column.rs +++ b/tests/generated/flex_basis_flex_grow_column.rs @@ -6,7 +6,7 @@ fn flex_basis_flex_grow_column() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }) .unwrap(); @@ -16,8 +16,8 @@ fn flex_basis_flex_grow_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_flex_grow_row.rs b/tests/generated/flex_basis_flex_grow_row.rs index fb8759b3d..df5baa3ea 100644 --- a/tests/generated/flex_basis_flex_grow_row.rs +++ b/tests/generated/flex_basis_flex_grow_row.rs @@ -6,7 +6,7 @@ fn flex_basis_flex_grow_row() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }) .unwrap(); @@ -15,8 +15,8 @@ fn flex_basis_flex_grow_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_flex_shrink_column.rs b/tests/generated/flex_basis_flex_shrink_column.rs index 0f1f5b17d..735ddf102 100644 --- a/tests/generated/flex_basis_flex_shrink_column.rs +++ b/tests/generated/flex_basis_flex_shrink_column.rs @@ -4,18 +4,18 @@ fn flex_basis_flex_shrink_column() { use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); let node0 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(100f32), ..Default::default() }) .unwrap(); let node1 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_flex_shrink_row.rs b/tests/generated/flex_basis_flex_shrink_row.rs index 8d68d1f28..1693370d2 100644 --- a/tests/generated/flex_basis_flex_shrink_row.rs +++ b/tests/generated/flex_basis_flex_shrink_row.rs @@ -4,17 +4,17 @@ fn flex_basis_flex_shrink_row() { use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); let node0 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(100f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(100f32), ..Default::default() }) .unwrap(); let node1 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_larger_than_content_column.rs b/tests/generated/flex_basis_larger_than_content_column.rs index 568d10eeb..8cd8dedf4 100644 --- a/tests/generated/flex_basis_larger_than_content_column.rs +++ b/tests/generated/flex_basis_larger_than_content_column.rs @@ -6,8 +6,8 @@ fn flex_basis_larger_than_content_column() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_larger_than_content_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }, &[node00], @@ -26,7 +26,7 @@ fn flex_basis_larger_than_content_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_larger_than_content_row.rs b/tests/generated/flex_basis_larger_than_content_row.rs index b2e113263..1f8a391e0 100644 --- a/tests/generated/flex_basis_larger_than_content_row.rs +++ b/tests/generated/flex_basis_larger_than_content_row.rs @@ -6,8 +6,8 @@ fn flex_basis_larger_than_content_row() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_larger_than_content_row() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }, &[node00], @@ -25,7 +25,7 @@ fn flex_basis_larger_than_content_row() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_overrides_main_size.rs b/tests/generated/flex_basis_overrides_main_size.rs index 2a7494c87..277532cba 100644 --- a/tests/generated/flex_basis_overrides_main_size.rs +++ b/tests/generated/flex_basis_overrides_main_size.rs @@ -6,22 +6,22 @@ fn flex_basis_overrides_main_size() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -29,8 +29,8 @@ fn flex_basis_overrides_main_size() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_slightly_smaller_then_content_with_flex_grow_large_size.rs index f72f487f9..3ee0e11df 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 @@ -6,8 +6,8 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(60f32), + flex_basis: taffy::style::Dimension::Length(60f32), ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn flex_basis_slightly_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_than_content_column.rs b/tests/generated/flex_basis_smaller_than_content_column.rs index fbebd7634..17cf70936 100644 --- a/tests/generated/flex_basis_smaller_than_content_column.rs +++ b/tests/generated/flex_basis_smaller_than_content_column.rs @@ -6,8 +6,8 @@ fn flex_basis_smaller_than_content_column() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_smaller_than_content_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }, &[node00], @@ -26,7 +26,7 @@ fn flex_basis_smaller_than_content_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_content_row.rs b/tests/generated/flex_basis_smaller_than_content_row.rs index d882b0aea..ccac188d3 100644 --- a/tests/generated/flex_basis_smaller_than_content_row.rs +++ b/tests/generated/flex_basis_smaller_than_content_row.rs @@ -6,8 +6,8 @@ fn flex_basis_smaller_than_content_row() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_smaller_than_content_row() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - flex_basis: taffy::style::Dimension::Points(50f32), + flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }, &[node00], @@ -25,7 +25,7 @@ fn flex_basis_smaller_than_content_row() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs index c86a6b614..fecf6694c 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_column.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_column.rs @@ -5,10 +5,10 @@ fn flex_basis_smaller_than_main_dimen_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(10f32), + flex_basis: taffy::style::Dimension::Length(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_smaller_than_main_dimen_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs index d653edcaf..655f1b2ea 100644 --- a/tests/generated/flex_basis_smaller_than_main_dimen_row.rs +++ b/tests/generated/flex_basis_smaller_than_main_dimen_row.rs @@ -5,10 +5,10 @@ fn flex_basis_smaller_than_main_dimen_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(10f32), + flex_basis: taffy::style::Dimension::Length(10f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_smaller_than_main_dimen_row() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_large_size.rs index 9e940fa3d..cf7b0663f 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 @@ -6,8 +6,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_small_size.rs index 0f5f9bac0..7a59b2a4c 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 @@ -6,8 +6,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_small_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/flex_basis_smaller_then_content_with_flex_grow_unconstraint_size.rs index 279cda8e0..7b6079d04 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 @@ -6,8 +6,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node10], 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 95774cb6c..c2618c00b 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 @@ -6,8 +6,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn flex_basis_smaller_then_content_with_flex_grow_very_large_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_basis_unconstraint_column.rs b/tests/generated/flex_basis_unconstraint_column.rs index 9bba8d1e5..3e2415a4a 100644 --- a/tests/generated/flex_basis_unconstraint_column.rs +++ b/tests/generated/flex_basis_unconstraint_column.rs @@ -5,8 +5,8 @@ fn flex_basis_unconstraint_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/flex_basis_unconstraint_row.rs b/tests/generated/flex_basis_unconstraint_row.rs index 63d35e69b..e87017d21 100644 --- a/tests/generated/flex_basis_unconstraint_row.rs +++ b/tests/generated/flex_basis_unconstraint_row.rs @@ -5,8 +5,8 @@ fn flex_basis_unconstraint_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/flex_basis_zero_undefined_main_size.rs b/tests/generated/flex_basis_zero_undefined_main_size.rs index 71c899d72..874bc5be0 100644 --- a/tests/generated/flex_basis_zero_undefined_main_size.rs +++ b/tests/generated/flex_basis_zero_undefined_main_size.rs @@ -6,8 +6,8 @@ fn flex_basis_zero_undefined_main_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_basis_zero_undefined_main_size() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }, &[node00], diff --git a/tests/generated/flex_column_relative_all_sides.rs b/tests/generated/flex_column_relative_all_sides.rs index 31a6c0dd7..1945191ab 100644 --- a/tests/generated/flex_column_relative_all_sides.rs +++ b/tests/generated/flex_column_relative_all_sides.rs @@ -5,12 +5,12 @@ fn flex_column_relative_all_sides() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -20,8 +20,8 @@ fn flex_column_relative_all_sides() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_direction_column.rs b/tests/generated/flex_direction_column.rs index 3a137d647..c71f15a77 100644 --- a/tests/generated/flex_direction_column.rs +++ b/tests/generated/flex_direction_column.rs @@ -5,19 +5,19 @@ fn flex_direction_column() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn flex_direction_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_direction_column_no_height.rs b/tests/generated/flex_direction_column_no_height.rs index 77ffbb8b3..63589920c 100644 --- a/tests/generated/flex_direction_column_no_height.rs +++ b/tests/generated/flex_direction_column_no_height.rs @@ -5,19 +5,19 @@ fn flex_direction_column_no_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -25,7 +25,7 @@ fn flex_direction_column_no_height() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_direction_column_reverse.rs b/tests/generated/flex_direction_column_reverse.rs index d9238a0a4..7f1e5e880 100644 --- a/tests/generated/flex_direction_column_reverse.rs +++ b/tests/generated/flex_direction_column_reverse.rs @@ -5,19 +5,19 @@ fn flex_direction_column_reverse() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn flex_direction_column_reverse() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::ColumnReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_direction_column_reverse_no_height.rs b/tests/generated/flex_direction_column_reverse_no_height.rs index 4903807d7..7b31efee8 100644 --- a/tests/generated/flex_direction_column_reverse_no_height.rs +++ b/tests/generated/flex_direction_column_reverse_no_height.rs @@ -5,19 +5,19 @@ fn flex_direction_column_reverse_no_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -25,7 +25,7 @@ fn flex_direction_column_reverse_no_height() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::ColumnReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_direction_row.rs b/tests/generated/flex_direction_row.rs index ecf24e595..227bc611b 100644 --- a/tests/generated/flex_direction_row.rs +++ b/tests/generated/flex_direction_row.rs @@ -5,19 +5,19 @@ fn flex_direction_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,8 +25,8 @@ fn flex_direction_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_direction_row_no_width.rs b/tests/generated/flex_direction_row_no_width.rs index 8b759741c..ce7a1bc8f 100644 --- a/tests/generated/flex_direction_row_no_width.rs +++ b/tests/generated/flex_direction_row_no_width.rs @@ -5,26 +5,26 @@ fn flex_direction_row_no_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_direction_row_reverse.rs b/tests/generated/flex_direction_row_reverse.rs index 1ac9980d2..6f17941b4 100644 --- a/tests/generated/flex_direction_row_reverse.rs +++ b/tests/generated/flex_direction_row_reverse.rs @@ -5,19 +5,19 @@ fn flex_direction_row_reverse() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn flex_direction_row_reverse() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::RowReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_child.rs b/tests/generated/flex_grow_child.rs index 71a8ae415..4b6aa5373 100644 --- a/tests/generated/flex_grow_child.rs +++ b/tests/generated/flex_grow_child.rs @@ -6,8 +6,8 @@ fn flex_grow_child() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + flex_basis: taffy::style::Dimension::Length(0f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); 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 7906e8a3d..7b44548d8 100644 --- a/tests/generated/flex_grow_flex_basis_percent_min_max.rs +++ b/tests/generated/flex_grow_flex_basis_percent_min_max.rs @@ -7,9 +7,9 @@ fn flex_grow_flex_basis_percent_min_max() { .new_leaf(taffy::style::Style { flex_grow: 1f32, flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(0f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(0f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -19,17 +19,17 @@ fn flex_grow_flex_basis_percent_min_max() { flex_shrink: 0f32, flex_basis: taffy::style::Dimension::Percent(0.5f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(120f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(120f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_height_maximized.rs b/tests/generated/flex_grow_height_maximized.rs index 7cfc9181d..2273ab77f 100644 --- a/tests/generated/flex_grow_height_maximized.rs +++ b/tests/generated/flex_grow_height_maximized.rs @@ -6,13 +6,13 @@ fn flex_grow_height_maximized() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(200f32), + flex_basis: taffy::style::Dimension::Length(200f32), ..Default::default() }) .unwrap(); let node01 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); @@ -21,8 +21,8 @@ fn flex_grow_height_maximized() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(500f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(500f32) }, ..Default::default() }, &[node00, node01], @@ -33,8 +33,8 @@ fn flex_grow_height_maximized() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_in_at_most_container.rs b/tests/generated/flex_grow_in_at_most_container.rs index 3250692d7..1e642c59b 100644 --- a/tests/generated/flex_grow_in_at_most_container.rs +++ b/tests/generated/flex_grow_in_at_most_container.rs @@ -6,7 +6,7 @@ fn flex_grow_in_at_most_container() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }) .unwrap(); @@ -16,8 +16,8 @@ fn flex_grow_in_at_most_container() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_less_than_factor_one.rs b/tests/generated/flex_grow_less_than_factor_one.rs index 711e738c1..efb87d3a7 100644 --- a/tests/generated/flex_grow_less_than_factor_one.rs +++ b/tests/generated/flex_grow_less_than_factor_one.rs @@ -7,7 +7,7 @@ fn flex_grow_less_than_factor_one() { .new_leaf(taffy::style::Style { flex_grow: 0.2f32, flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(40f32), + flex_basis: taffy::style::Dimension::Length(40f32), ..Default::default() }) .unwrap(); @@ -19,8 +19,8 @@ fn flex_grow_less_than_factor_one() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_root_minimized.rs b/tests/generated/flex_grow_root_minimized.rs index c26b68104..11a340eb0 100644 --- a/tests/generated/flex_grow_root_minimized.rs +++ b/tests/generated/flex_grow_root_minimized.rs @@ -6,13 +6,13 @@ fn flex_grow_root_minimized() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(200f32), + flex_basis: taffy::style::Dimension::Length(200f32), ..Default::default() }) .unwrap(); let node01 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); @@ -21,8 +21,8 @@ fn flex_grow_root_minimized() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(500f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(500f32) }, ..Default::default() }, &[node00, node01], @@ -32,9 +32,9 @@ fn flex_grow_root_minimized() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(500f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(500f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_grow_shrink_at_most.rs b/tests/generated/flex_grow_shrink_at_most.rs index 39dd3797c..5e5717e11 100644 --- a/tests/generated/flex_grow_shrink_at_most.rs +++ b/tests/generated/flex_grow_shrink_at_most.rs @@ -10,8 +10,8 @@ fn flex_grow_shrink_at_most() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_to_min.rs b/tests/generated/flex_grow_to_min.rs index 159ea58e3..1a9679d81 100644 --- a/tests/generated/flex_grow_to_min.rs +++ b/tests/generated/flex_grow_to_min.rs @@ -7,7 +7,7 @@ fn flex_grow_to_min() { taffy.new_leaf(taffy::style::Style { flex_grow: 1f32, flex_shrink: 1f32, ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -15,9 +15,9 @@ fn flex_grow_to_min() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(500f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(500f32) }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_within_constrained_max_column.rs b/tests/generated/flex_grow_within_constrained_max_column.rs index 4329d923a..efe8d96d1 100644 --- a/tests/generated/flex_grow_within_constrained_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_max_column.rs @@ -6,13 +6,13 @@ fn flex_grow_within_constrained_max_column() { let node0 = taffy .new_leaf(taffy::style::Style { flex_shrink: 1f32, - flex_basis: taffy::style::Dimension::Points(100f32), + flex_basis: taffy::style::Dimension::Length(100f32), ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -20,8 +20,8 @@ fn flex_grow_within_constrained_max_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_within_constrained_max_row.rs b/tests/generated/flex_grow_within_constrained_max_row.rs index 0588996c1..91a8f01e3 100644 --- a/tests/generated/flex_grow_within_constrained_max_row.rs +++ b/tests/generated/flex_grow_within_constrained_max_row.rs @@ -6,21 +6,21 @@ fn flex_grow_within_constrained_max_row() { let node00 = taffy .new_leaf(taffy::style::Style { flex_shrink: 1f32, - flex_basis: taffy::style::Dimension::Points(100f32), + flex_basis: taffy::style::Dimension::Length(100f32), ..Default::default() }) .unwrap(); let node01 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node0 = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node00, node01], @@ -30,7 +30,7 @@ fn flex_grow_within_constrained_max_row() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/flex_grow_within_constrained_max_width.rs b/tests/generated/flex_grow_within_constrained_max_width.rs index f325f0b31..d70cf998e 100644 --- a/tests/generated/flex_grow_within_constrained_max_width.rs +++ b/tests/generated/flex_grow_within_constrained_max_width.rs @@ -6,14 +6,14 @@ fn flex_grow_within_constrained_max_width() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node0 = taffy .new_with_children( taffy::style::Style { - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(300f32), height: auto() }, ..Default::default() }, &[node00], @@ -24,8 +24,8 @@ fn flex_grow_within_constrained_max_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_grow_within_constrained_min_column.rs b/tests/generated/flex_grow_within_constrained_min_column.rs index 1e37e14ad..2c8b71a42 100644 --- a/tests/generated/flex_grow_within_constrained_min_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_column.rs @@ -6,7 +6,7 @@ fn flex_grow_within_constrained_min_column() { let node0 = taffy.new_leaf(taffy::style::Style { flex_grow: 1f32, ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -14,7 +14,7 @@ fn flex_grow_within_constrained_min_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1], 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 53c63c760..13d381256 100644 --- a/tests/generated/flex_grow_within_constrained_min_max_column.rs +++ b/tests/generated/flex_grow_within_constrained_min_max_column.rs @@ -6,7 +6,7 @@ fn flex_grow_within_constrained_min_max_column() { let node0 = taffy.new_leaf(taffy::style::Style { flex_grow: 1f32, ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -14,8 +14,8 @@ fn flex_grow_within_constrained_min_max_column() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_within_constrained_min_row.rs b/tests/generated/flex_grow_within_constrained_min_row.rs index 09a6e3f79..6a3ece6e6 100644 --- a/tests/generated/flex_grow_within_constrained_min_row.rs +++ b/tests/generated/flex_grow_within_constrained_min_row.rs @@ -6,15 +6,15 @@ fn flex_grow_within_constrained_min_row() { let node0 = taffy.new_leaf(taffy::style::Style { flex_grow: 1f32, ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_grow_within_max_width.rs b/tests/generated/flex_grow_within_max_width.rs index 5bd9f1371..e61c740d2 100644 --- a/tests/generated/flex_grow_within_max_width.rs +++ b/tests/generated/flex_grow_within_max_width.rs @@ -6,14 +6,14 @@ fn flex_grow_within_max_width() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node0 = taffy .new_with_children( taffy::style::Style { - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node00], @@ -24,8 +24,8 @@ fn flex_grow_within_max_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_root_ignored.rs b/tests/generated/flex_root_ignored.rs index 564738029..af9c4140e 100644 --- a/tests/generated/flex_root_ignored.rs +++ b/tests/generated/flex_root_ignored.rs @@ -6,13 +6,13 @@ fn flex_root_ignored() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(200f32), + flex_basis: taffy::style::Dimension::Length(200f32), ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); @@ -20,9 +20,9 @@ fn flex_root_ignored() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(500f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(500f32) }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_row_relative_all_sides.rs b/tests/generated/flex_row_relative_all_sides.rs index 27310aeb7..108e13f1c 100644 --- a/tests/generated/flex_row_relative_all_sides.rs +++ b/tests/generated/flex_row_relative_all_sides.rs @@ -5,12 +5,12 @@ fn flex_row_relative_all_sides() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn flex_row_relative_all_sides() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs b/tests/generated/flex_shrink_by_outer_margin_with_max_size.rs index e870a4c50..067beaaab 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 @@ -6,13 +6,13 @@ fn flex_shrink_by_outer_margin_with_max_size() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(100f32), + top: taffy::style::LengthPercentageAuto::Length(100f32), bottom: zero(), }, ..Default::default() @@ -22,8 +22,8 @@ fn flex_shrink_by_outer_margin_with_max_size() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(80f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(80f32) }, ..Default::default() }, &[node0], 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 3220b4864..6bcfb9a00 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 @@ -8,8 +8,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { flex_grow: 1f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -29,8 +29,8 @@ fn flex_shrink_flex_grow_child_flex_shrink_other_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/flex_shrink_flex_grow_row.rs b/tests/generated/flex_shrink_flex_grow_row.rs index 194ed8b18..86c514b89 100644 --- a/tests/generated/flex_shrink_flex_grow_row.rs +++ b/tests/generated/flex_shrink_flex_grow_row.rs @@ -8,8 +8,8 @@ fn flex_shrink_flex_grow_row() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn flex_shrink_flex_grow_row() { flex_grow: 0f32, flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -29,8 +29,8 @@ fn flex_shrink_flex_grow_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/flex_shrink_to_zero.rs b/tests/generated/flex_shrink_to_zero.rs index 0f2d60942..2e9429204 100644 --- a/tests/generated/flex_shrink_to_zero.rs +++ b/tests/generated/flex_shrink_to_zero.rs @@ -7,8 +7,8 @@ fn flex_shrink_to_zero() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn flex_shrink_to_zero() { .new_leaf(taffy::style::Style { flex_shrink: 1f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn flex_shrink_to_zero() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -36,7 +36,7 @@ fn flex_shrink_to_zero() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(75f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(75f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs index 2160cf1e5..43d8a3684 100644 --- a/tests/generated/flex_wrap_align_stretch_fits_one_row.rs +++ b/tests/generated/flex_wrap_align_stretch_fits_one_row.rs @@ -5,13 +5,13 @@ fn flex_wrap_align_stretch_fits_one_row() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -20,8 +20,8 @@ fn flex_wrap_align_stretch_fits_one_row() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs index 3f4d64359..369c6b7f4 100644 --- a/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs +++ b/tests/generated/flex_wrap_children_with_min_main_overriding_flex_basis.rs @@ -5,17 +5,17 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(55f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(55f32), height: auto() }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(55f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -23,7 +23,7 @@ fn flex_wrap_children_with_min_main_overriding_flex_basis() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/flex_wrap_wrap_to_child_height.rs b/tests/generated/flex_wrap_wrap_to_child_height.rs index 94aba53ad..40b9b9173 100644 --- a/tests/generated/flex_wrap_wrap_to_child_height.rs +++ b/tests/generated/flex_wrap_wrap_to_child_height.rs @@ -6,8 +6,8 @@ fn flex_wrap_wrap_to_child_height() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -16,7 +16,7 @@ fn flex_wrap_wrap_to_child_height() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node000], @@ -35,8 +35,8 @@ fn flex_wrap_wrap_to_child_height() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/gap_column_gap_child_margins.rs b/tests/generated/gap_column_gap_child_margins.rs index b35c64f37..04f206835 100644 --- a/tests/generated/gap_column_gap_child_margins.rs +++ b/tests/generated/gap_column_gap_child_margins.rs @@ -9,8 +9,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(2f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(2f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), top: zero(), bottom: zero(), }, @@ -23,8 +23,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -37,8 +37,8 @@ fn gap_column_gap_child_margins() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(15f32), - right: taffy::style::LengthPercentageAuto::Points(15f32), + left: taffy::style::LengthPercentageAuto::Length(15f32), + right: taffy::style::LengthPercentageAuto::Length(15f32), top: zero(), bottom: zero(), }, @@ -48,10 +48,10 @@ fn gap_column_gap_child_margins() { let node = taffy .new_with_children( taffy::style::Style { - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_determines_parent_width.rs b/tests/generated/gap_column_gap_determines_parent_width.rs index a9c3f2c20..2fc2c06cc 100644 --- a/tests/generated/gap_column_gap_determines_parent_width.rs +++ b/tests/generated/gap_column_gap_determines_parent_width.rs @@ -5,19 +5,19 @@ fn gap_column_gap_determines_parent_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(30f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,8 +25,8 @@ fn gap_column_gap_determines_parent_width() { .new_with_children( taffy::style::Style { align_items: Some(taffy::style::AlignItems::Stretch), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/gap_column_gap_flexible.rs b/tests/generated/gap_column_gap_flexible.rs index 90c70bd18..7d71fd7a1 100644 --- a/tests/generated/gap_column_gap_flexible.rs +++ b/tests/generated/gap_column_gap_flexible.rs @@ -31,12 +31,12 @@ fn gap_column_gap_flexible() { .new_with_children( taffy::style::Style { gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_flexible_undefined_parent.rs b/tests/generated/gap_column_gap_flexible_undefined_parent.rs index 2a6a3984a..909aed37f 100644 --- a/tests/generated/gap_column_gap_flexible_undefined_parent.rs +++ b/tests/generated/gap_column_gap_flexible_undefined_parent.rs @@ -31,10 +31,10 @@ fn gap_column_gap_flexible_undefined_parent() { .new_with_children( taffy::style::Style { gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/gap_column_gap_inflexible.rs b/tests/generated/gap_column_gap_inflexible.rs index 4ee922a70..08b5ba6f2 100644 --- a/tests/generated/gap_column_gap_inflexible.rs +++ b/tests/generated/gap_column_gap_inflexible.rs @@ -5,29 +5,29 @@ fn gap_column_gap_inflexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_inflexible_undefined_parent.rs b/tests/generated/gap_column_gap_inflexible_undefined_parent.rs index 5cc482be0..6f11c7650 100644 --- a/tests/generated/gap_column_gap_inflexible_undefined_parent.rs +++ b/tests/generated/gap_column_gap_inflexible_undefined_parent.rs @@ -5,27 +5,27 @@ fn gap_column_gap_inflexible_undefined_parent() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/gap_column_gap_justify_center.rs b/tests/generated/gap_column_gap_justify_center.rs index f55d97d72..af0112ea4 100644 --- a/tests/generated/gap_column_gap_justify_center.rs +++ b/tests/generated/gap_column_gap_justify_center.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_center() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_justify_flex_end.rs b/tests/generated/gap_column_gap_justify_flex_end.rs index 498bfa62b..3e622ea08 100644 --- a/tests/generated/gap_column_gap_justify_flex_end.rs +++ b/tests/generated/gap_column_gap_justify_flex_end.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_flex_end() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::FlexEnd), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_justify_flex_start.rs b/tests/generated/gap_column_gap_justify_flex_start.rs index a5244e557..0f4626d0e 100644 --- a/tests/generated/gap_column_gap_justify_flex_start.rs +++ b/tests/generated/gap_column_gap_justify_flex_start.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_flex_start() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::FlexStart), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_justify_space_around.rs b/tests/generated/gap_column_gap_justify_space_around.rs index 639af50c2..de4fb0774 100644 --- a/tests/generated/gap_column_gap_justify_space_around.rs +++ b/tests/generated/gap_column_gap_justify_space_around.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_space_around() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceAround), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_justify_space_between.rs b/tests/generated/gap_column_gap_justify_space_between.rs index 107e03445..361d08362 100644 --- a/tests/generated/gap_column_gap_justify_space_between.rs +++ b/tests/generated/gap_column_gap_justify_space_between.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_space_between() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceBetween), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_justify_space_evenly.rs b/tests/generated/gap_column_gap_justify_space_evenly.rs index bad55a1fb..461af1b63 100644 --- a/tests/generated/gap_column_gap_justify_space_evenly.rs +++ b/tests/generated/gap_column_gap_justify_space_evenly.rs @@ -5,19 +5,19 @@ fn gap_column_gap_justify_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -25,10 +25,10 @@ fn gap_column_gap_justify_space_evenly() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_mixed_flexible.rs b/tests/generated/gap_column_gap_mixed_flexible.rs index d32a64b75..f2f033028 100644 --- a/tests/generated/gap_column_gap_mixed_flexible.rs +++ b/tests/generated/gap_column_gap_mixed_flexible.rs @@ -5,7 +5,7 @@ fn gap_column_gap_mixed_flexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -19,17 +19,17 @@ fn gap_column_gap_mixed_flexible() { .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(10f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(10f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, 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 9b626d8a2..5ceb39aad 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_partially_shrinkable.rs @@ -7,8 +7,8 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn gap_column_gap_percentage_cyclic_partially_shrinkable() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..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 d2ca40a12..3fbce7894 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_shrinkable.rs @@ -6,8 +6,8 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_percentage_cyclic_shrinkable() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..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 c02dd101c..f4fdb5aba 100644 --- a/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs +++ b/tests/generated/gap_column_gap_percentage_cyclic_unshrinkable.rs @@ -7,8 +7,8 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn gap_column_gap_percentage_cyclic_unshrinkable() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) diff --git a/tests/generated/gap_column_gap_percentage_flexible.rs b/tests/generated/gap_column_gap_percentage_flexible.rs index da753d30c..3fa8247e7 100644 --- a/tests/generated/gap_column_gap_percentage_flexible.rs +++ b/tests/generated/gap_column_gap_percentage_flexible.rs @@ -32,11 +32,11 @@ fn gap_column_gap_percentage_flexible() { taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Percent(0.1f32), - height: taffy::style::LengthPercentage::Points(20f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs b/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs index f36551a09..e42c8e967 100644 --- a/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs +++ b/tests/generated/gap_column_gap_percentage_flexible_with_padding.rs @@ -32,17 +32,17 @@ fn gap_column_gap_percentage_flexible_with_padding() { taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Percent(0.1f32), - height: taffy::style::LengthPercentage::Points(20f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_percentage_inflexible.rs b/tests/generated/gap_column_gap_percentage_inflexible.rs index 965da9f33..4116537c9 100644 --- a/tests/generated/gap_column_gap_percentage_inflexible.rs +++ b/tests/generated/gap_column_gap_percentage_inflexible.rs @@ -5,19 +5,19 @@ fn gap_column_gap_percentage_inflexible() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn gap_column_gap_percentage_inflexible() { taffy::style::Style { gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Percent(0.2f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_row_gap_wrapping.rs b/tests/generated/gap_column_gap_row_gap_wrapping.rs index a0c82f3aa..5b7a8a105 100644 --- a/tests/generated/gap_column_gap_row_gap_wrapping.rs +++ b/tests/generated/gap_column_gap_row_gap_wrapping.rs @@ -6,8 +6,8 @@ fn gap_column_gap_row_gap_wrapping() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_row_gap_wrapping() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_row_gap_wrapping() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_row_gap_wrapping() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_row_gap_wrapping() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_row_gap_wrapping() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn gap_column_gap_row_gap_wrapping() { let node6 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -69,8 +69,8 @@ fn gap_column_gap_row_gap_wrapping() { let node7 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -78,8 +78,8 @@ fn gap_column_gap_row_gap_wrapping() { let node8 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -89,10 +89,10 @@ fn gap_column_gap_row_gap_wrapping() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(80f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/gap_column_gap_wrap_align_center.rs b/tests/generated/gap_column_gap_wrap_align_center.rs index 9609a722a..1085c91e5 100644 --- a/tests/generated/gap_column_gap_wrap_align_center.rs +++ b/tests/generated/gap_column_gap_wrap_align_center.rs @@ -6,8 +6,8 @@ fn gap_column_gap_wrap_align_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_wrap_align_center() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_wrap_align_center() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_wrap_align_center() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_wrap_align_center() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_wrap_align_center() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,12 +63,12 @@ fn gap_column_gap_wrap_align_center() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Center), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, 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 6c6ae495b..df6bf0dee 100644 --- a/tests/generated/gap_column_gap_wrap_align_flex_end.rs +++ b/tests/generated/gap_column_gap_wrap_align_flex_end.rs @@ -6,8 +6,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_wrap_align_flex_end() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,12 +63,12 @@ fn gap_column_gap_wrap_align_flex_end() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexEnd), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, 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 7f1db0b2e..09de805bd 100644 --- a/tests/generated/gap_column_gap_wrap_align_flex_start.rs +++ b/tests/generated/gap_column_gap_wrap_align_flex_start.rs @@ -6,8 +6,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_wrap_align_flex_start() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,12 +63,12 @@ fn gap_column_gap_wrap_align_flex_start() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::FlexStart), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, 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 bc019cd05..7013abbc7 100644 --- a/tests/generated/gap_column_gap_wrap_align_space_around.rs +++ b/tests/generated/gap_column_gap_wrap_align_space_around.rs @@ -6,8 +6,8 @@ fn gap_column_gap_wrap_align_space_around() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_wrap_align_space_around() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_wrap_align_space_around() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_wrap_align_space_around() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_wrap_align_space_around() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_wrap_align_space_around() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,12 +63,12 @@ fn gap_column_gap_wrap_align_space_around() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceAround), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, 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 163d14ba8..d035988e4 100644 --- a/tests/generated/gap_column_gap_wrap_align_space_between.rs +++ b/tests/generated/gap_column_gap_wrap_align_space_between.rs @@ -6,8 +6,8 @@ fn gap_column_gap_wrap_align_space_between() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_gap_wrap_align_space_between() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_gap_wrap_align_space_between() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_gap_wrap_align_space_between() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_gap_wrap_align_space_between() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_gap_wrap_align_space_between() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,12 +63,12 @@ fn gap_column_gap_wrap_align_space_between() { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::SpaceBetween), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_gap_wrap_align_stretch.rs b/tests/generated/gap_column_gap_wrap_align_stretch.rs index 2132070e2..d16d66efd 100644 --- a/tests/generated/gap_column_gap_wrap_align_stretch.rs +++ b/tests/generated/gap_column_gap_wrap_align_stretch.rs @@ -6,35 +6,35 @@ fn gap_column_gap_wrap_align_stretch() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -43,10 +43,10 @@ fn gap_column_gap_wrap_align_stretch() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_content: Some(taffy::style::AlignContent::Stretch), - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(5f32), height: zero() }, + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(5f32), height: zero() }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(300f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(300f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/gap_column_row_gap_wrapping.rs b/tests/generated/gap_column_row_gap_wrapping.rs index 7eb070156..770954384 100644 --- a/tests/generated/gap_column_row_gap_wrapping.rs +++ b/tests/generated/gap_column_row_gap_wrapping.rs @@ -6,8 +6,8 @@ fn gap_column_row_gap_wrapping() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_column_row_gap_wrapping() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_column_row_gap_wrapping() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_column_row_gap_wrapping() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_column_row_gap_wrapping() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_column_row_gap_wrapping() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn gap_column_row_gap_wrapping() { let node6 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -69,8 +69,8 @@ fn gap_column_row_gap_wrapping() { let node7 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -78,8 +78,8 @@ fn gap_column_row_gap_wrapping() { let node8 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -89,10 +89,10 @@ fn gap_column_row_gap_wrapping() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(80f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/gap_percentage_row_gap_wrapping.rs b/tests/generated/gap_percentage_row_gap_wrapping.rs index 8141cfce1..70ea78290 100644 --- a/tests/generated/gap_percentage_row_gap_wrapping.rs +++ b/tests/generated/gap_percentage_row_gap_wrapping.rs @@ -6,8 +6,8 @@ fn gap_percentage_row_gap_wrapping() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn gap_percentage_row_gap_wrapping() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn gap_percentage_row_gap_wrapping() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn gap_percentage_row_gap_wrapping() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn gap_percentage_row_gap_wrapping() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn gap_percentage_row_gap_wrapping() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn gap_percentage_row_gap_wrapping() { let node6 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -69,8 +69,8 @@ fn gap_percentage_row_gap_wrapping() { let node7 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -78,8 +78,8 @@ fn gap_percentage_row_gap_wrapping() { let node8 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -89,10 +89,10 @@ fn gap_percentage_row_gap_wrapping() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), + width: taffy::style::LengthPercentage::Length(10f32), height: taffy::style::LengthPercentage::Percent(0.1f32), }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(80f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/gap_row_gap_align_items_end.rs b/tests/generated/gap_row_gap_align_items_end.rs index 9239ecc9b..72acc9795 100644 --- a/tests/generated/gap_row_gap_align_items_end.rs +++ b/tests/generated/gap_row_gap_align_items_end.rs @@ -5,37 +5,37 @@ fn gap_row_gap_align_items_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node5 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -45,12 +45,12 @@ fn gap_row_gap_align_items_end() { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::FlexEnd), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/gap_row_gap_align_items_stretch.rs b/tests/generated/gap_row_gap_align_items_stretch.rs index d9ac1a667..553752633 100644 --- a/tests/generated/gap_row_gap_align_items_stretch.rs +++ b/tests/generated/gap_row_gap_align_items_stretch.rs @@ -5,37 +5,37 @@ fn gap_row_gap_align_items_stretch() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node3 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node5 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -46,12 +46,12 @@ fn gap_row_gap_align_items_stretch() { align_items: Some(taffy::style::AlignItems::Stretch), align_content: Some(taffy::style::AlignContent::Stretch), gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(10f32), - height: taffy::style::LengthPercentage::Points(20f32), + width: taffy::style::LengthPercentage::Length(10f32), + height: taffy::style::LengthPercentage::Length(20f32), }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/gap_row_gap_column_child_margins.rs b/tests/generated/gap_row_gap_column_child_margins.rs index 1720fc49d..7b3574fb1 100644 --- a/tests/generated/gap_row_gap_column_child_margins.rs +++ b/tests/generated/gap_row_gap_column_child_margins.rs @@ -11,8 +11,8 @@ fn gap_row_gap_column_child_margins() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) @@ -25,8 +25,8 @@ fn gap_row_gap_column_child_margins() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -39,8 +39,8 @@ fn gap_row_gap_column_child_margins() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(15f32), - bottom: taffy::style::LengthPercentageAuto::Points(15f32), + top: taffy::style::LengthPercentageAuto::Length(15f32), + bottom: taffy::style::LengthPercentageAuto::Length(15f32), }, ..Default::default() }) @@ -49,10 +49,10 @@ fn gap_row_gap_column_child_margins() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Points(10f32) }, + gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Length(10f32) }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/gap_row_gap_determines_parent_height.rs b/tests/generated/gap_row_gap_determines_parent_height.rs index 957a576c3..c78644229 100644 --- a/tests/generated/gap_row_gap_determines_parent_height.rs +++ b/tests/generated/gap_row_gap_determines_parent_height.rs @@ -5,19 +5,19 @@ fn gap_row_gap_determines_parent_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(30f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(30f32) }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn gap_row_gap_determines_parent_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Stretch), - gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Points(10f32) }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Length(10f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], 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 2122c0073..438d315b1 100644 --- a/tests/generated/gap_row_gap_row_wrap_child_margins.rs +++ b/tests/generated/gap_row_gap_row_wrap_child_margins.rs @@ -5,36 +5,36 @@ fn gap_row_gap_row_wrap_child_margins() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(15f32), - bottom: taffy::style::LengthPercentageAuto::Points(15f32), + top: taffy::style::LengthPercentageAuto::Length(15f32), + bottom: taffy::style::LengthPercentageAuto::Length(15f32), }, ..Default::default() }) @@ -43,10 +43,10 @@ fn gap_row_gap_row_wrap_child_margins() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Points(10f32) }, + gap: taffy::geometry::Size { width: zero(), height: taffy::style::LengthPercentage::Length(10f32) }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_align_self_sized_all.rs b/tests/generated/grid_absolute_align_self_sized_all.rs index 7bf6d1766..39376cb8d 100644 --- a/tests/generated/grid_absolute_align_self_sized_all.rs +++ b/tests/generated/grid_absolute_align_self_sized_all.rs @@ -8,8 +8,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,8 +30,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -41,8 +41,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -52,8 +52,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,8 +63,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -74,8 +74,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -85,8 +85,8 @@ fn grid_absolute_align_self_sized_all() { position: taffy::style::Position::Absolute, align_self: Some(taffy::style::AlignSelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -95,11 +95,11 @@ fn grid_absolute_align_self_sized_all() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_column_end.rs b/tests/generated/grid_absolute_column_end.rs index 7e5500411..a831377d4 100644 --- a/tests/generated/grid_absolute_column_end.rs +++ b/tests/generated/grid_absolute_column_end.rs @@ -8,10 +8,10 @@ fn grid_absolute_column_end() { position: taffy::style::Position::Absolute, grid_column: taffy::geometry::Line { start: taffy::style::GridPlacement::Auto, end: line(1i16) }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(3f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(3f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) @@ -20,13 +20,13 @@ fn grid_absolute_column_end() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_column_start.rs b/tests/generated/grid_absolute_column_start.rs index 26cffd09f..39d3596a7 100644 --- a/tests/generated/grid_absolute_column_start.rs +++ b/tests/generated/grid_absolute_column_start.rs @@ -8,10 +8,10 @@ fn grid_absolute_column_start() { position: taffy::style::Position::Absolute, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(3f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(3f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) @@ -20,13 +20,13 @@ fn grid_absolute_column_start() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_bottom_left.rs b/tests/generated/grid_absolute_container_bottom_left.rs index 2908b9d62..7854df8db 100644 --- a/tests/generated/grid_absolute_container_bottom_left.rs +++ b/tests/generated/grid_absolute_container_bottom_left.rs @@ -7,10 +7,10 @@ fn grid_absolute_container_bottom_left() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -27,13 +27,13 @@ fn grid_absolute_container_bottom_left() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_bottom_left_margin.rs b/tests/generated/grid_absolute_container_bottom_left_margin.rs index 83c8c39ce..5655d25d7 100644 --- a/tests/generated/grid_absolute_container_bottom_left_margin.rs +++ b/tests/generated/grid_absolute_container_bottom_left_margin.rs @@ -7,20 +7,20 @@ fn grid_absolute_container_bottom_left_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -37,13 +37,13 @@ fn grid_absolute_container_bottom_left_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_left_overrides_right.rs b/tests/generated/grid_absolute_container_left_overrides_right.rs index fd9735a24..e09a5c830 100644 --- a/tests/generated/grid_absolute_container_left_overrides_right.rs +++ b/tests/generated/grid_absolute_container_left_overrides_right.rs @@ -6,10 +6,10 @@ fn grid_absolute_container_left_overrides_right() { let node0 = taffy .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), top: auto(), bottom: auto(), }, @@ -28,13 +28,13 @@ fn grid_absolute_container_left_overrides_right() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_left_right.rs b/tests/generated/grid_absolute_container_left_right.rs index 94243b841..cc666134b 100644 --- a/tests/generated/grid_absolute_container_left_right.rs +++ b/tests/generated/grid_absolute_container_left_right.rs @@ -7,8 +7,8 @@ fn grid_absolute_container_left_right() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), top: auto(), bottom: auto(), }, @@ -27,13 +27,13 @@ fn grid_absolute_container_left_right() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_left_right_margin.rs b/tests/generated/grid_absolute_container_left_right_margin.rs index 6771c765a..77fa653d6 100644 --- a/tests/generated/grid_absolute_container_left_right_margin.rs +++ b/tests/generated/grid_absolute_container_left_right_margin.rs @@ -7,14 +7,14 @@ fn grid_absolute_container_left_right_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), top: auto(), bottom: auto(), }, @@ -33,13 +33,13 @@ fn grid_absolute_container_left_right_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_negative_position.rs b/tests/generated/grid_absolute_container_negative_position.rs index b02cf9d53..1fbb57b5c 100644 --- a/tests/generated/grid_absolute_container_negative_position.rs +++ b/tests/generated/grid_absolute_container_negative_position.rs @@ -8,8 +8,8 @@ fn grid_absolute_container_negative_position() { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(-15f32), - top: taffy::style::LengthPercentageAuto::Points(-5f32), + right: taffy::style::LengthPercentageAuto::Length(-15f32), + top: taffy::style::LengthPercentageAuto::Length(-5f32), bottom: auto(), }, ..Default::default() @@ -19,10 +19,10 @@ fn grid_absolute_container_negative_position() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(-35f32), + left: taffy::style::LengthPercentageAuto::Length(-35f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(-25f32), + bottom: taffy::style::LengthPercentageAuto::Length(-25f32), }, ..Default::default() }) @@ -38,13 +38,13 @@ fn grid_absolute_container_negative_position() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_negative_position_margin.rs b/tests/generated/grid_absolute_container_negative_position_margin.rs index 756099a11..9fca0efdb 100644 --- a/tests/generated/grid_absolute_container_negative_position_margin.rs +++ b/tests/generated/grid_absolute_container_negative_position_margin.rs @@ -7,15 +7,15 @@ fn grid_absolute_container_negative_position_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(-15f32), - top: taffy::style::LengthPercentageAuto::Points(-5f32), + right: taffy::style::LengthPercentageAuto::Length(-15f32), + top: taffy::style::LengthPercentageAuto::Length(-5f32), bottom: auto(), }, ..Default::default() @@ -25,16 +25,16 @@ fn grid_absolute_container_negative_position_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(-35f32), + left: taffy::style::LengthPercentageAuto::Length(-35f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(-25f32), + bottom: taffy::style::LengthPercentageAuto::Length(-25f32), }, ..Default::default() }) @@ -50,13 +50,13 @@ fn grid_absolute_container_negative_position_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_top_bottom.rs b/tests/generated/grid_absolute_container_top_bottom.rs index f88b4c421..3e21ca8ef 100644 --- a/tests/generated/grid_absolute_container_top_bottom.rs +++ b/tests/generated/grid_absolute_container_top_bottom.rs @@ -9,8 +9,8 @@ fn grid_absolute_container_top_bottom() { inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -27,13 +27,13 @@ fn grid_absolute_container_top_bottom() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_top_bottom_margin.rs b/tests/generated/grid_absolute_container_top_bottom_margin.rs index 72277c380..687f62b22 100644 --- a/tests/generated/grid_absolute_container_top_bottom_margin.rs +++ b/tests/generated/grid_absolute_container_top_bottom_margin.rs @@ -7,16 +7,16 @@ fn grid_absolute_container_top_bottom_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -33,13 +33,13 @@ fn grid_absolute_container_top_bottom_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_top_right.rs b/tests/generated/grid_absolute_container_top_right.rs index 833763ae1..718a8eea6 100644 --- a/tests/generated/grid_absolute_container_top_right.rs +++ b/tests/generated/grid_absolute_container_top_right.rs @@ -8,8 +8,8 @@ fn grid_absolute_container_top_right() { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), - top: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -27,13 +27,13 @@ fn grid_absolute_container_top_right() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_container_top_right_margin.rs b/tests/generated/grid_absolute_container_top_right_margin.rs index b3c5895a4..e7fe56880 100644 --- a/tests/generated/grid_absolute_container_top_right_margin.rs +++ b/tests/generated/grid_absolute_container_top_right_margin.rs @@ -7,15 +7,15 @@ fn grid_absolute_container_top_right_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), - top: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -33,13 +33,13 @@ fn grid_absolute_container_top_right_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_justify_self_sized_all.rs b/tests/generated/grid_absolute_justify_self_sized_all.rs index 6fef0477c..748d52c2d 100644 --- a/tests/generated/grid_absolute_justify_self_sized_all.rs +++ b/tests/generated/grid_absolute_justify_self_sized_all.rs @@ -8,8 +8,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,8 +30,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -41,8 +41,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -52,8 +52,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -63,8 +63,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -74,8 +74,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -85,8 +85,8 @@ fn grid_absolute_justify_self_sized_all() { position: taffy::style::Position::Absolute, justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -95,11 +95,11 @@ fn grid_absolute_justify_self_sized_all() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_layout_within_border.rs b/tests/generated/grid_absolute_layout_within_border.rs index 510f165d2..088345321 100644 --- a/tests/generated/grid_absolute_layout_within_border.rs +++ b/tests/generated/grid_absolute_layout_within_border.rs @@ -7,13 +7,13 @@ fn grid_absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -23,14 +23,14 @@ fn grid_absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -39,19 +39,19 @@ fn grid_absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -61,20 +61,20 @@ fn grid_absolute_layout_within_border() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -84,20 +84,20 @@ fn grid_absolute_layout_within_border() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_layout_within_border_static.rs b/tests/generated/grid_absolute_layout_within_border_static.rs index 562fb41b8..f2c9b9c36 100644 --- a/tests/generated/grid_absolute_layout_within_border_static.rs +++ b/tests/generated/grid_absolute_layout_within_border_static.rs @@ -9,8 +9,8 @@ fn grid_absolute_layout_within_border_static() { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn grid_absolute_layout_within_border_static() { align_self: Some(taffy::style::AlignSelf::End), justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -33,14 +33,14 @@ fn grid_absolute_layout_within_border_static() { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -51,14 +51,14 @@ fn grid_absolute_layout_within_border_static() { align_self: Some(taffy::style::AlignSelf::End), justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -68,20 +68,20 @@ fn grid_absolute_layout_within_border_static() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_row_end.rs b/tests/generated/grid_absolute_row_end.rs index 971e88393..fea7ed114 100644 --- a/tests/generated/grid_absolute_row_end.rs +++ b/tests/generated/grid_absolute_row_end.rs @@ -8,10 +8,10 @@ fn grid_absolute_row_end() { position: taffy::style::Position::Absolute, grid_row: taffy::geometry::Line { start: taffy::style::GridPlacement::Auto, end: line(1i16) }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(3f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(3f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) @@ -20,13 +20,13 @@ fn grid_absolute_row_end() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_row_start.rs b/tests/generated/grid_absolute_row_start.rs index d4a1201f7..de6af9370 100644 --- a/tests/generated/grid_absolute_row_start.rs +++ b/tests/generated/grid_absolute_row_start.rs @@ -8,10 +8,10 @@ fn grid_absolute_row_start() { position: taffy::style::Position::Absolute, grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(3f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(2f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(3f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(2f32), }, ..Default::default() }) @@ -20,13 +20,13 @@ fn grid_absolute_row_start() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_top_overrides_bottom.rs b/tests/generated/grid_absolute_top_overrides_bottom.rs index cb24ec3f6..11c146828 100644 --- a/tests/generated/grid_absolute_top_overrides_bottom.rs +++ b/tests/generated/grid_absolute_top_overrides_bottom.rs @@ -6,12 +6,12 @@ fn grid_absolute_top_overrides_bottom() { let node0 = taffy .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -28,13 +28,13 @@ fn grid_absolute_top_overrides_bottom() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_with_padding.rs b/tests/generated/grid_absolute_with_padding.rs index 28c77cba5..964340aa9 100644 --- a/tests/generated/grid_absolute_with_padding.rs +++ b/tests/generated/grid_absolute_with_padding.rs @@ -8,8 +8,8 @@ fn grid_absolute_with_padding() { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), - top: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -19,10 +19,10 @@ fn grid_absolute_with_padding() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -38,13 +38,13 @@ fn grid_absolute_with_padding() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_absolute_with_padding_and_margin.rs b/tests/generated/grid_absolute_with_padding_and_margin.rs index 31eaa7803..58b00e327 100644 --- a/tests/generated/grid_absolute_with_padding_and_margin.rs +++ b/tests/generated/grid_absolute_with_padding_and_margin.rs @@ -7,15 +7,15 @@ fn grid_absolute_with_padding_and_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { left: auto(), - right: taffy::style::LengthPercentageAuto::Points(0f32), - top: taffy::style::LengthPercentageAuto::Points(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), bottom: auto(), }, ..Default::default() @@ -25,16 +25,16 @@ fn grid_absolute_with_padding_and_margin() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -50,13 +50,13 @@ fn grid_absolute_with_padding_and_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_center.rs b/tests/generated/grid_align_content_center.rs index acb3dbb81..9f9fa57bb 100644 --- a/tests/generated/grid_align_content_center.rs +++ b/tests/generated/grid_align_content_center.rs @@ -17,11 +17,11 @@ fn grid_align_content_center() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::Center), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_end.rs b/tests/generated/grid_align_content_end.rs index 650b52b8b..d1a1d0392 100644 --- a/tests/generated/grid_align_content_end.rs +++ b/tests/generated/grid_align_content_end.rs @@ -17,11 +17,11 @@ fn grid_align_content_end() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_end_with_padding_border.rs b/tests/generated/grid_align_content_end_with_padding_border.rs index cbd123dae..4b8376fc7 100644 --- a/tests/generated/grid_align_content_end_with_padding_border.rs +++ b/tests/generated/grid_align_content_end_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_align_content_end_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_around.rs b/tests/generated/grid_align_content_space_around.rs index 2a1c90e59..d8b7de10e 100644 --- a/tests/generated/grid_align_content_space_around.rs +++ b/tests/generated/grid_align_content_space_around.rs @@ -17,11 +17,11 @@ fn grid_align_content_space_around() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceAround), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_around_with_padding_border.rs b/tests/generated/grid_align_content_space_around_with_padding_border.rs index dced46c85..f30c1bcbe 100644 --- a/tests/generated/grid_align_content_space_around_with_padding_border.rs +++ b/tests/generated/grid_align_content_space_around_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_align_content_space_around_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceAround), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_between.rs b/tests/generated/grid_align_content_space_between.rs index 411d7b758..8f38b2e38 100644 --- a/tests/generated/grid_align_content_space_between.rs +++ b/tests/generated/grid_align_content_space_between.rs @@ -17,11 +17,11 @@ fn grid_align_content_space_between() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceBetween), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_between_with_padding_border.rs b/tests/generated/grid_align_content_space_between_with_padding_border.rs index c95d95d2c..d3fcd9e48 100644 --- a/tests/generated/grid_align_content_space_between_with_padding_border.rs +++ b/tests/generated/grid_align_content_space_between_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_align_content_space_between_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceBetween), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_evenly.rs b/tests/generated/grid_align_content_space_evenly.rs index 6a1e78376..5fef3974c 100644 --- a/tests/generated/grid_align_content_space_evenly.rs +++ b/tests/generated/grid_align_content_space_evenly.rs @@ -17,11 +17,11 @@ fn grid_align_content_space_evenly() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_space_evenly_with_padding_border.rs b/tests/generated/grid_align_content_space_evenly_with_padding_border.rs index 3c19720c4..a83c07a08 100644 --- a/tests/generated/grid_align_content_space_evenly_with_padding_border.rs +++ b/tests/generated/grid_align_content_space_evenly_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_align_content_space_evenly_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_start.rs b/tests/generated/grid_align_content_start.rs index 7525b5756..d27b9ea07 100644 --- a/tests/generated/grid_align_content_start.rs +++ b/tests/generated/grid_align_content_start.rs @@ -17,11 +17,11 @@ fn grid_align_content_start() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_content_start_with_padding_border.rs b/tests/generated/grid_align_content_start_with_padding_border.rs index f5dbd2483..0c66cdbf1 100644 --- a/tests/generated/grid_align_content_start_with_padding_border.rs +++ b/tests/generated/grid_align_content_start_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_align_content_start_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, align_content: Some(taffy::style::AlignContent::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline.rs b/tests/generated/grid_align_items_baseline.rs index fc42e591a..0fa9610ac 100644 --- a/tests/generated/grid_align_items_baseline.rs +++ b/tests/generated/grid_align_items_baseline.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -29,8 +29,8 @@ fn grid_align_items_baseline() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child.rs b/tests/generated/grid_align_items_baseline_child.rs index 0f738c220..2128f1f5c 100644 --- a/tests/generated/grid_align_items_baseline_child.rs +++ b/tests/generated/grid_align_items_baseline_child.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn grid_align_items_baseline_child() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -42,8 +42,8 @@ fn grid_align_items_baseline_child() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_margin.rs b/tests/generated/grid_align_items_baseline_child_margin.rs index 7e3c761e2..5cd74de40 100644 --- a/tests/generated/grid_align_items_baseline_child_margin.rs +++ b/tests/generated/grid_align_items_baseline_child_margin.rs @@ -7,14 +7,14 @@ fn grid_align_items_baseline_child_margin() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -23,14 +23,14 @@ fn grid_align_items_baseline_child_margin() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, ..Default::default() }) @@ -40,8 +40,8 @@ fn grid_align_items_baseline_child_margin() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -54,8 +54,8 @@ fn grid_align_items_baseline_child_margin() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_margin_percent.rs b/tests/generated/grid_align_items_baseline_child_margin_percent.rs index 27aa6d151..38b8bee3c 100644 --- a/tests/generated/grid_align_items_baseline_child_margin_percent.rs +++ b/tests/generated/grid_align_items_baseline_child_margin_percent.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_margin_percent() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.05f32), @@ -23,8 +23,8 @@ fn grid_align_items_baseline_child_margin_percent() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.01f32), @@ -40,8 +40,8 @@ fn grid_align_items_baseline_child_margin_percent() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -54,8 +54,8 @@ fn grid_align_items_baseline_child_margin_percent() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_multiline.rs b/tests/generated/grid_align_items_baseline_child_multiline.rs index 50fcc3289..e6cbcb125 100644 --- a/tests/generated/grid_align_items_baseline_child_multiline.rs +++ b/tests/generated/grid_align_items_baseline_child_multiline.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn grid_align_items_baseline_child_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn grid_align_items_baseline_child_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -47,8 +47,8 @@ fn grid_align_items_baseline_child_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -59,7 +59,7 @@ fn grid_align_items_baseline_child_multiline() { display: taffy::style::Display::Grid, flex_wrap: taffy::style::FlexWrap::Wrap, grid_template_columns: vec![auto(), auto()], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node10, node11, node12, node13], @@ -70,7 +70,7 @@ fn grid_align_items_baseline_child_multiline() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/grid_align_items_baseline_child_multiline_no_override_on_secondline.rs b/tests/generated/grid_align_items_baseline_child_multiline_no_override_on_secondline.rs index 56041a8f5..8fdd5d481 100644 --- a/tests/generated/grid_align_items_baseline_child_multiline_no_override_on_secondline.rs +++ b/tests/generated/grid_align_items_baseline_child_multiline_no_override_on_secondline.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -48,8 +48,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { display: taffy::style::Display::Grid, align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { display: taffy::style::Display::Grid, grid_template_columns: vec![auto(), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(25f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(25f32), }, ..Default::default() }, @@ -74,8 +74,8 @@ fn grid_align_items_baseline_child_multiline_no_override_on_secondline() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_multiline_override.rs b/tests/generated/grid_align_items_baseline_child_multiline_override.rs index f19b8b7ba..12b5cec31 100644 --- a/tests/generated/grid_align_items_baseline_child_multiline_override.rs +++ b/tests/generated/grid_align_items_baseline_child_multiline_override.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_multiline_override() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child_multiline_override() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn grid_align_items_baseline_child_multiline_override() { display: taffy::style::Display::Grid, align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -38,8 +38,8 @@ fn grid_align_items_baseline_child_multiline_override() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -49,8 +49,8 @@ fn grid_align_items_baseline_child_multiline_override() { display: taffy::style::Display::Grid, align_self: Some(taffy::style::AlignSelf::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(25f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(25f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -61,8 +61,8 @@ fn grid_align_items_baseline_child_multiline_override() { display: taffy::style::Display::Grid, grid_template_columns: vec![auto(), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(25f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(25f32), }, ..Default::default() }, @@ -75,8 +75,8 @@ fn grid_align_items_baseline_child_multiline_override() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_padding.rs b/tests/generated/grid_align_items_baseline_child_padding.rs index 6b9218206..57ca591cd 100644 --- a/tests/generated/grid_align_items_baseline_child_padding.rs +++ b/tests/generated/grid_align_items_baseline_child_padding.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_padding() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child_padding() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -28,14 +28,14 @@ fn grid_align_items_baseline_child_padding() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, @@ -48,14 +48,14 @@ fn grid_align_items_baseline_child_padding() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(5f32), - right: taffy::style::LengthPercentage::Points(5f32), - top: taffy::style::LengthPercentage::Points(5f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(5f32), + right: taffy::style::LengthPercentage::Length(5f32), + top: taffy::style::LengthPercentage::Length(5f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_top.rs b/tests/generated/grid_align_items_baseline_child_top.rs index 88b4ef214..b96388d64 100644 --- a/tests/generated/grid_align_items_baseline_child_top.rs +++ b/tests/generated/grid_align_items_baseline_child_top.rs @@ -7,13 +7,13 @@ fn grid_align_items_baseline_child_top() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: auto(), }, ..Default::default() @@ -23,8 +23,8 @@ fn grid_align_items_baseline_child_top() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -34,8 +34,8 @@ fn grid_align_items_baseline_child_top() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -48,8 +48,8 @@ fn grid_align_items_baseline_child_top() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_child_top2.rs b/tests/generated/grid_align_items_baseline_child_top2.rs index 67bebbe6f..97e3e7eab 100644 --- a/tests/generated/grid_align_items_baseline_child_top2.rs +++ b/tests/generated/grid_align_items_baseline_child_top2.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_child_top2() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_child_top2() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -28,13 +28,13 @@ fn grid_align_items_baseline_child_top2() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), bottom: auto(), }, ..Default::default() @@ -48,8 +48,8 @@ fn grid_align_items_baseline_child_top2() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_complex.rs b/tests/generated/grid_align_items_baseline_complex.rs index d7a450d04..6e0f1ba19 100644 --- a/tests/generated/grid_align_items_baseline_complex.rs +++ b/tests/generated/grid_align_items_baseline_complex.rs @@ -6,15 +6,15 @@ fn grid_align_items_baseline_complex() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) .unwrap(); let node10 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -22,8 +22,8 @@ fn grid_align_items_baseline_complex() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -32,7 +32,7 @@ fn grid_align_items_baseline_complex() { .unwrap(); let node20 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -40,8 +40,8 @@ fn grid_align_items_baseline_complex() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -51,8 +51,8 @@ fn grid_align_items_baseline_complex() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -60,8 +60,8 @@ fn grid_align_items_baseline_complex() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -69,15 +69,15 @@ fn grid_align_items_baseline_complex() { let node5 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) .unwrap(); let node60 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -85,8 +85,8 @@ fn grid_align_items_baseline_complex() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -95,7 +95,7 @@ fn grid_align_items_baseline_complex() { .unwrap(); let node70 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(5f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(5f32) }, ..Default::default() }) .unwrap(); @@ -103,8 +103,8 @@ fn grid_align_items_baseline_complex() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -114,8 +114,8 @@ fn grid_align_items_baseline_complex() { let node8 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -125,11 +125,11 @@ fn grid_align_items_baseline_complex() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_double_nested_child.rs b/tests/generated/grid_align_items_baseline_double_nested_child.rs index b896c8781..b717fa5b0 100644 --- a/tests/generated/grid_align_items_baseline_double_nested_child.rs +++ b/tests/generated/grid_align_items_baseline_double_nested_child.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_double_nested_child() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -18,8 +18,8 @@ fn grid_align_items_baseline_double_nested_child() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -30,8 +30,8 @@ fn grid_align_items_baseline_double_nested_child() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(15f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(15f32), }, ..Default::default() }) @@ -41,8 +41,8 @@ fn grid_align_items_baseline_double_nested_child() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -55,8 +55,8 @@ fn grid_align_items_baseline_double_nested_child() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_multiline.rs b/tests/generated/grid_align_items_baseline_multiline.rs index 40a46b47c..4654bef6f 100644 --- a/tests/generated/grid_align_items_baseline_multiline.rs +++ b/tests/generated/grid_align_items_baseline_multiline.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn grid_align_items_baseline_multiline() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -40,8 +40,8 @@ fn grid_align_items_baseline_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn grid_align_items_baseline_multiline() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -63,8 +63,8 @@ fn grid_align_items_baseline_multiline() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -76,8 +76,8 @@ fn grid_align_items_baseline_multiline() { align_items: Some(taffy::style::AlignItems::Baseline), grid_template_columns: vec![auto(), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_multiline_column.rs b/tests/generated/grid_align_items_baseline_multiline_column.rs index 5f7f0470c..37cf4b9fd 100644 --- a/tests/generated/grid_align_items_baseline_multiline_column.rs +++ b/tests/generated/grid_align_items_baseline_multiline_column.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_multiline_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_multiline_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn grid_align_items_baseline_multiline_column() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -40,8 +40,8 @@ fn grid_align_items_baseline_multiline_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn grid_align_items_baseline_multiline_column() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(70f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(70f32), }, ..Default::default() }, @@ -63,8 +63,8 @@ fn grid_align_items_baseline_multiline_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -76,8 +76,8 @@ fn grid_align_items_baseline_multiline_column() { align_items: Some(taffy::style::AlignItems::Baseline), grid_template_columns: vec![auto(), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_multiline_row_and_column.rs b/tests/generated/grid_align_items_baseline_multiline_row_and_column.rs index 94347d369..d3e0345dc 100644 --- a/tests/generated/grid_align_items_baseline_multiline_row_and_column.rs +++ b/tests/generated/grid_align_items_baseline_multiline_row_and_column.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -28,8 +28,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, @@ -40,8 +40,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -51,8 +51,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }, @@ -63,8 +63,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -76,8 +76,8 @@ fn grid_align_items_baseline_multiline_row_and_column() { align_items: Some(taffy::style::AlignItems::Baseline), grid_template_columns: vec![auto(), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_baseline_nested_column.rs b/tests/generated/grid_align_items_baseline_nested_column.rs index 0cf745a5d..67a7faa78 100644 --- a/tests/generated/grid_align_items_baseline_nested_column.rs +++ b/tests/generated/grid_align_items_baseline_nested_column.rs @@ -7,8 +7,8 @@ fn grid_align_items_baseline_nested_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_items_baseline_nested_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn grid_align_items_baseline_nested_column() { .new_leaf(taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -38,8 +38,8 @@ fn grid_align_items_baseline_nested_column() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }, @@ -58,8 +58,8 @@ fn grid_align_items_baseline_nested_column() { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Baseline), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_sized_center.rs b/tests/generated/grid_align_items_sized_center.rs index d469f3990..4ebd3ca20 100644 --- a/tests/generated/grid_align_items_sized_center.rs +++ b/tests/generated/grid_align_items_sized_center.rs @@ -8,8 +8,8 @@ fn grid_align_items_sized_center() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_align_items_sized_center() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_align_items_sized_center() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Center), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_sized_end.rs b/tests/generated/grid_align_items_sized_end.rs index d54d4f92f..e0aa4614e 100644 --- a/tests/generated/grid_align_items_sized_end.rs +++ b/tests/generated/grid_align_items_sized_end.rs @@ -8,8 +8,8 @@ fn grid_align_items_sized_end() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_align_items_sized_end() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_align_items_sized_end() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_sized_start.rs b/tests/generated/grid_align_items_sized_start.rs index 23bf1fea1..640503ce7 100644 --- a/tests/generated/grid_align_items_sized_start.rs +++ b/tests/generated/grid_align_items_sized_start.rs @@ -8,8 +8,8 @@ fn grid_align_items_sized_start() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_align_items_sized_start() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_align_items_sized_start() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_items_sized_stretch.rs b/tests/generated/grid_align_items_sized_stretch.rs index e83e698b2..3768e050f 100644 --- a/tests/generated/grid_align_items_sized_stretch.rs +++ b/tests/generated/grid_align_items_sized_stretch.rs @@ -8,8 +8,8 @@ fn grid_align_items_sized_stretch() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_align_items_sized_stretch() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_align_items_sized_stretch() { taffy::style::Style { display: taffy::style::Display::Grid, align_items: Some(taffy::style::AlignItems::Stretch), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_align_self_sized_all.rs b/tests/generated/grid_align_self_sized_all.rs index 109e4fa3b..ed8bce4f4 100644 --- a/tests/generated/grid_align_self_sized_all.rs +++ b/tests/generated/grid_align_self_sized_all.rs @@ -7,8 +7,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -47,8 +47,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -57,8 +57,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -67,8 +67,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -77,8 +77,8 @@ fn grid_align_self_sized_all() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -87,11 +87,11 @@ fn grid_align_self_sized_all() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_absolute_aspect_ratio_overrides_height_of_full_inset.rs b/tests/generated/grid_aspect_ratio_absolute_aspect_ratio_overrides_height_of_full_inset.rs index 71d3e1725..8299badc0 100644 --- a/tests/generated/grid_aspect_ratio_absolute_aspect_ratio_overrides_height_of_full_inset.rs +++ b/tests/generated/grid_aspect_ratio_absolute_aspect_ratio_overrides_height_of_full_inset.rs @@ -21,8 +21,8 @@ fn grid_aspect_ratio_absolute_aspect_ratio_overrides_height_of_full_inset() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_absolute_fill_height_from_inset.rs b/tests/generated/grid_aspect_ratio_absolute_fill_height_from_inset.rs index 6737736ea..ee3f8d060 100644 --- a/tests/generated/grid_aspect_ratio_absolute_fill_height_from_inset.rs +++ b/tests/generated/grid_aspect_ratio_absolute_fill_height_from_inset.rs @@ -21,8 +21,8 @@ fn grid_aspect_ratio_absolute_fill_height_from_inset() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_absolute_fill_width_from_inset.rs b/tests/generated/grid_aspect_ratio_absolute_fill_width_from_inset.rs index aa9af3d68..88bc1423d 100644 --- a/tests/generated/grid_aspect_ratio_absolute_fill_width_from_inset.rs +++ b/tests/generated/grid_aspect_ratio_absolute_fill_width_from_inset.rs @@ -21,8 +21,8 @@ fn grid_aspect_ratio_absolute_fill_width_from_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_absolute_height_overrides_inset.rs b/tests/generated/grid_aspect_ratio_absolute_height_overrides_inset.rs index 6dfb01f56..377f29fb3 100644 --- a/tests/generated/grid_aspect_ratio_absolute_height_overrides_inset.rs +++ b/tests/generated/grid_aspect_ratio_absolute_height_overrides_inset.rs @@ -22,8 +22,8 @@ fn grid_aspect_ratio_absolute_height_overrides_inset() { taffy::style::Style { display: taffy::style::Display::Flex, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_absolute_width_overrides_inset.rs b/tests/generated/grid_aspect_ratio_absolute_width_overrides_inset.rs index f20c74662..244566afb 100644 --- a/tests/generated/grid_aspect_ratio_absolute_width_overrides_inset.rs +++ b/tests/generated/grid_aspect_ratio_absolute_width_overrides_inset.rs @@ -22,8 +22,8 @@ fn grid_aspect_ratio_absolute_width_overrides_inset() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_child_fill_content_height.rs b/tests/generated/grid_aspect_ratio_child_fill_content_height.rs index 7734c54e1..2d7a5ac4d 100644 --- a/tests/generated/grid_aspect_ratio_child_fill_content_height.rs +++ b/tests/generated/grid_aspect_ratio_child_fill_content_height.rs @@ -20,7 +20,7 @@ fn grid_aspect_ratio_child_fill_content_height() { .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/grid_aspect_ratio_child_fill_content_width.rs b/tests/generated/grid_aspect_ratio_child_fill_content_width.rs index c25b3115f..b73ac79e8 100644 --- a/tests/generated/grid_aspect_ratio_child_fill_content_width.rs +++ b/tests/generated/grid_aspect_ratio_child_fill_content_width.rs @@ -20,7 +20,7 @@ fn grid_aspect_ratio_child_fill_content_width() { .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/grid_aspect_ratio_fill_child_height.rs b/tests/generated/grid_aspect_ratio_fill_child_height.rs index 316ee014c..9b8c08aed 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_height.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_height.rs @@ -5,7 +5,7 @@ fn grid_aspect_ratio_fill_child_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -15,8 +15,8 @@ fn grid_aspect_ratio_fill_child_height() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_fill_child_max_height.rs b/tests/generated/grid_aspect_ratio_fill_child_max_height.rs index 454a5475a..26d2786a1 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_max_height.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_max_height.rs @@ -6,7 +6,7 @@ fn grid_aspect_ratio_fill_child_max_height() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -27,8 +27,8 @@ fn grid_aspect_ratio_fill_child_max_height() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_fill_child_max_width.rs b/tests/generated/grid_aspect_ratio_fill_child_max_width.rs index 08ef34a12..60e965ed4 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_max_width.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_max_width.rs @@ -6,7 +6,7 @@ fn grid_aspect_ratio_fill_child_max_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -27,8 +27,8 @@ fn grid_aspect_ratio_fill_child_max_width() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_fill_child_min_height.rs b/tests/generated/grid_aspect_ratio_fill_child_min_height.rs index 446cb2dfd..edc8b7c28 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_min_height.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_min_height.rs @@ -5,7 +5,7 @@ fn grid_aspect_ratio_fill_child_min_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -15,8 +15,8 @@ fn grid_aspect_ratio_fill_child_min_height() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_fill_child_min_width.rs b/tests/generated/grid_aspect_ratio_fill_child_min_width.rs index 5347ee29f..842d2d0b8 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_min_width.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_min_width.rs @@ -6,7 +6,7 @@ fn grid_aspect_ratio_fill_child_min_width() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, aspect_ratio: Some(2f32), ..Default::default() }, @@ -27,8 +27,8 @@ fn grid_aspect_ratio_fill_child_min_width() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_fill_child_width.rs b/tests/generated/grid_aspect_ratio_fill_child_width.rs index 0cb436f23..7c7cfa794 100644 --- a/tests/generated/grid_aspect_ratio_fill_child_width.rs +++ b/tests/generated/grid_aspect_ratio_fill_child_width.rs @@ -5,7 +5,7 @@ fn grid_aspect_ratio_fill_child_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, aspect_ratio: Some(2f32), ..Default::default() }) @@ -15,8 +15,8 @@ fn grid_aspect_ratio_fill_child_width() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes.rs b/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes.rs index 24e1e9601..6c89ec77e 100644 --- a/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes.rs +++ b/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes.rs @@ -6,8 +6,8 @@ fn grid_aspect_ratio_overriden_by_explicit_sizes() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, aspect_ratio: Some(2f32), ..Default::default() @@ -18,8 +18,8 @@ fn grid_aspect_ratio_overriden_by_explicit_sizes() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes_flex.rs b/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes_flex.rs index 36c44f271..a6053e45b 100644 --- a/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes_flex.rs +++ b/tests/generated/grid_aspect_ratio_overriden_by_explicit_sizes_flex.rs @@ -6,8 +6,8 @@ fn grid_aspect_ratio_overriden_by_explicit_sizes_flex() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, aspect_ratio: Some(2f32), ..Default::default() @@ -18,8 +18,8 @@ fn grid_aspect_ratio_overriden_by_explicit_sizes_flex() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_auto_columns_fixed_width.rs b/tests/generated/grid_auto_columns_fixed_width.rs index 62717aeea..da09c737c 100644 --- a/tests/generated/grid_auto_columns_fixed_width.rs +++ b/tests/generated/grid_auto_columns_fixed_width.rs @@ -23,11 +23,11 @@ fn grid_auto_columns_fixed_width() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), auto(), points(40f32), auto()], - grid_template_columns: vec![points(40f32), auto(), points(40f32), auto()], + grid_template_rows: vec![length(40f32), auto(), length(40f32), auto()], + grid_template_columns: vec![length(40f32), auto(), length(40f32), auto()], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_auto_fill_fixed_size.rs b/tests/generated/grid_auto_fill_fixed_size.rs index 81aaa99db..4fceedef7 100644 --- a/tests/generated/grid_auto_fill_fixed_size.rs +++ b/tests/generated/grid_auto_fill_fixed_size.rs @@ -16,11 +16,11 @@ fn grid_auto_fill_fixed_size() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), repeat(GridTrackRepetition::AutoFill, vec![points(40f32)])], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), repeat(GridTrackRepetition::AutoFill, vec![length(40f32)])], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_auto_fill_with_empty_auto_track.rs b/tests/generated/grid_auto_fill_with_empty_auto_track.rs index b2dbb38fd..5de22241b 100644 --- a/tests/generated/grid_auto_fill_with_empty_auto_track.rs +++ b/tests/generated/grid_auto_fill_with_empty_auto_track.rs @@ -10,11 +10,11 @@ fn grid_auto_fill_with_empty_auto_track() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![repeat(GridTrackRepetition::AutoFill, vec![points(40f32)])], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![repeat(GridTrackRepetition::AutoFill, vec![length(40f32)])], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_auto_fit_with_empty_auto_track.rs b/tests/generated/grid_auto_fit_with_empty_auto_track.rs index df3e20c1f..e838e9d27 100644 --- a/tests/generated/grid_auto_fit_with_empty_auto_track.rs +++ b/tests/generated/grid_auto_fit_with_empty_auto_track.rs @@ -10,11 +10,11 @@ fn grid_auto_fit_with_empty_auto_track() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![repeat(GridTrackRepetition::AutoFit, vec![points(40f32)])], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![repeat(GridTrackRepetition::AutoFit, vec![length(40f32)])], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_auto_single_item.rs b/tests/generated/grid_auto_single_item.rs index c07e8db2a..e8ae54a8f 100644 --- a/tests/generated/grid_auto_single_item.rs +++ b/tests/generated/grid_auto_single_item.rs @@ -6,7 +6,7 @@ fn grid_auto_single_item() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,8 +21,8 @@ fn grid_auto_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), auto(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), auto(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_auto_single_item_fixed_width.rs b/tests/generated/grid_auto_single_item_fixed_width.rs index 9977e6370..17b964f22 100644 --- a/tests/generated/grid_auto_single_item_fixed_width.rs +++ b/tests/generated/grid_auto_single_item_fixed_width.rs @@ -6,7 +6,7 @@ fn grid_auto_single_item_fixed_width() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,9 +21,9 @@ fn grid_auto_single_item_fixed_width() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), auto(), auto()], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), auto(), auto()], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_auto_single_item_fixed_width_with_definite_width.rs b/tests/generated/grid_auto_single_item_fixed_width_with_definite_width.rs index 3be0b9ee7..b780cadc8 100644 --- a/tests/generated/grid_auto_single_item_fixed_width_with_definite_width.rs +++ b/tests/generated/grid_auto_single_item_fixed_width_with_definite_width.rs @@ -6,7 +6,7 @@ fn grid_auto_single_item_fixed_width_with_definite_width() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,9 +21,9 @@ fn grid_auto_single_item_fixed_width_with_definite_width() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), auto(), auto()], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), auto(), auto()], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_auto_takes_precedence_over_fr.rs b/tests/generated/grid_auto_takes_precedence_over_fr.rs index dca961873..a2ed9dd92 100644 --- a/tests/generated/grid_auto_takes_precedence_over_fr.rs +++ b/tests/generated/grid_auto_takes_precedence_over_fr.rs @@ -9,11 +9,11 @@ fn grid_auto_takes_precedence_over_fr() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![auto(), fr(1f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_basic.rs b/tests/generated/grid_basic.rs index 6b2b8867c..116cb81f5 100644 --- a/tests/generated/grid_basic.rs +++ b/tests/generated/grid_basic.rs @@ -16,11 +16,11 @@ fn grid_basic() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_basic_implicit_tracks.rs b/tests/generated/grid_basic_implicit_tracks.rs index e34867ec7..4b4477cc8 100644 --- a/tests/generated/grid_basic_implicit_tracks.rs +++ b/tests/generated/grid_basic_implicit_tracks.rs @@ -7,8 +7,8 @@ fn grid_basic_implicit_tracks() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(35f32), - height: taffy::style::Dimension::Points(35f32), + width: taffy::style::Dimension::Length(35f32), + height: taffy::style::Dimension::Length(35f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_basic_implicit_tracks() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![length(40f32)], ..Default::default() }, &[node0, node1], diff --git a/tests/generated/grid_basic_with_overflow.rs b/tests/generated/grid_basic_with_overflow.rs index f75f4d00e..e358a0c86 100644 --- a/tests/generated/grid_basic_with_overflow.rs +++ b/tests/generated/grid_basic_with_overflow.rs @@ -17,11 +17,11 @@ fn grid_basic_with_overflow() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_basic_with_padding.rs b/tests/generated/grid_basic_with_padding.rs index aaa8e28ec..a36d6df59 100644 --- a/tests/generated/grid_basic_with_padding.rs +++ b/tests/generated/grid_basic_with_padding.rs @@ -16,13 +16,13 @@ fn grid_basic_with_padding() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_display_none_fixed_size.rs b/tests/generated/grid_display_none_fixed_size.rs index 2f49ad234..4e6b86f8c 100644 --- a/tests/generated/grid_display_none_fixed_size.rs +++ b/tests/generated/grid_display_none_fixed_size.rs @@ -8,8 +8,8 @@ fn grid_display_none_fixed_size() { .new_leaf(taffy::style::Style { display: taffy::style::Display::None, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_display_none_fixed_size() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_fit_content_percent_definite_argument.rs b/tests/generated/grid_fit_content_percent_definite_argument.rs index 5614ef842..da3c53e97 100644 --- a/tests/generated/grid_fit_content_percent_definite_argument.rs +++ b/tests/generated/grid_fit_content_percent_definite_argument.rs @@ -22,9 +22,9 @@ fn grid_fit_content_percent_definite_argument() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_percent_definite_max_content.rs b/tests/generated/grid_fit_content_percent_definite_max_content.rs index 55f854967..f0e07f6aa 100644 --- a/tests/generated/grid_fit_content_percent_definite_max_content.rs +++ b/tests/generated/grid_fit_content_percent_definite_max_content.rs @@ -22,9 +22,9 @@ fn grid_fit_content_percent_definite_max_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_percent_definite_min_content.rs b/tests/generated/grid_fit_content_percent_definite_min_content.rs index c16657812..109cf67f7 100644 --- a/tests/generated/grid_fit_content_percent_definite_min_content.rs +++ b/tests/generated/grid_fit_content_percent_definite_min_content.rs @@ -22,9 +22,9 @@ fn grid_fit_content_percent_definite_min_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_percent_indefinite_argument.rs b/tests/generated/grid_fit_content_percent_indefinite_argument.rs index d3f6ecc3f..bd6be2e20 100644 --- a/tests/generated/grid_fit_content_percent_indefinite_argument.rs +++ b/tests/generated/grid_fit_content_percent_indefinite_argument.rs @@ -22,7 +22,7 @@ fn grid_fit_content_percent_indefinite_argument() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], ..Default::default() }, diff --git a/tests/generated/grid_fit_content_percent_indefinite_max_content.rs b/tests/generated/grid_fit_content_percent_indefinite_max_content.rs index 949fa0624..ef3abe66e 100644 --- a/tests/generated/grid_fit_content_percent_indefinite_max_content.rs +++ b/tests/generated/grid_fit_content_percent_indefinite_max_content.rs @@ -22,7 +22,7 @@ fn grid_fit_content_percent_indefinite_max_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], ..Default::default() }, diff --git a/tests/generated/grid_fit_content_percent_indefinite_max_content_hidden.rs b/tests/generated/grid_fit_content_percent_indefinite_max_content_hidden.rs index 565778aec..20e6b508f 100644 --- a/tests/generated/grid_fit_content_percent_indefinite_max_content_hidden.rs +++ b/tests/generated/grid_fit_content_percent_indefinite_max_content_hidden.rs @@ -28,7 +28,7 @@ fn grid_fit_content_percent_indefinite_max_content_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], ..Default::default() }, diff --git a/tests/generated/grid_fit_content_percent_indefinite_min_content.rs b/tests/generated/grid_fit_content_percent_indefinite_min_content.rs index 1834ce7f3..db6c79564 100644 --- a/tests/generated/grid_fit_content_percent_indefinite_min_content.rs +++ b/tests/generated/grid_fit_content_percent_indefinite_min_content.rs @@ -22,7 +22,7 @@ fn grid_fit_content_percent_indefinite_min_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], ..Default::default() }, diff --git a/tests/generated/grid_fit_content_percent_indefinite_min_content_hidden.rs b/tests/generated/grid_fit_content_percent_indefinite_min_content_hidden.rs index 11d886d23..5510a5135 100644 --- a/tests/generated/grid_fit_content_percent_indefinite_min_content_hidden.rs +++ b/tests/generated/grid_fit_content_percent_indefinite_min_content_hidden.rs @@ -28,7 +28,7 @@ fn grid_fit_content_percent_indefinite_min_content_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fit_content(percent(0.5f32))], ..Default::default() }, diff --git a/tests/generated/grid_fit_content_points_argument.rs b/tests/generated/grid_fit_content_points_argument.rs index 0dd708ec4..06762d6c7 100644 --- a/tests/generated/grid_fit_content_points_argument.rs +++ b/tests/generated/grid_fit_content_points_argument.rs @@ -22,8 +22,8 @@ fn grid_fit_content_points_argument() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![fit_content(length(30f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_points_max_content.rs b/tests/generated/grid_fit_content_points_max_content.rs index a2d598b50..a6d638ad4 100644 --- a/tests/generated/grid_fit_content_points_max_content.rs +++ b/tests/generated/grid_fit_content_points_max_content.rs @@ -22,8 +22,8 @@ fn grid_fit_content_points_max_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![fit_content(length(30f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_points_min_content.rs b/tests/generated/grid_fit_content_points_min_content.rs index 78780340a..a76717c23 100644 --- a/tests/generated/grid_fit_content_points_min_content.rs +++ b/tests/generated/grid_fit_content_points_min_content.rs @@ -22,8 +22,8 @@ fn grid_fit_content_points_min_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![fit_content(length(30f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fit_content_points_min_content_hidden.rs b/tests/generated/grid_fit_content_points_min_content_hidden.rs index 1a4e89ede..754b76c63 100644 --- a/tests/generated/grid_fit_content_points_min_content_hidden.rs +++ b/tests/generated/grid_fit_content_points_min_content_hidden.rs @@ -28,8 +28,8 @@ fn grid_fit_content_points_min_content_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![fit_content(length(30f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_fr_fixed_size_no_content_proportions.rs b/tests/generated/grid_fr_fixed_size_no_content_proportions.rs index 628fcef08..e34d114e8 100644 --- a/tests/generated/grid_fr_fixed_size_no_content_proportions.rs +++ b/tests/generated/grid_fr_fixed_size_no_content_proportions.rs @@ -10,9 +10,9 @@ fn grid_fr_fixed_size_no_content_proportions() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fr(1f32), fr(2f32), fr(3f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_fr_fixed_size_no_content_proportions_sub_1_sum.rs b/tests/generated/grid_fr_fixed_size_no_content_proportions_sub_1_sum.rs index fa981c124..ca839fd4a 100644 --- a/tests/generated/grid_fr_fixed_size_no_content_proportions_sub_1_sum.rs +++ b/tests/generated/grid_fr_fixed_size_no_content_proportions_sub_1_sum.rs @@ -9,9 +9,9 @@ fn grid_fr_fixed_size_no_content_proportions_sub_1_sum() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![fr(0.3f32), fr(0.2f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/grid_fr_fixed_size_single_item.rs b/tests/generated/grid_fr_fixed_size_single_item.rs index 5d124dd87..a34d1eb13 100644 --- a/tests/generated/grid_fr_fixed_size_single_item.rs +++ b/tests/generated/grid_fr_fixed_size_single_item.rs @@ -9,7 +9,7 @@ fn grid_fr_fixed_size_single_item() { let node3 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node4 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,11 +21,11 @@ fn grid_fr_fixed_size_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), fr(1f32), fr(1f32)], - grid_template_columns: vec![points(40f32), fr(1f32), fr(1f32)], + grid_template_rows: vec![length(40f32), fr(1f32), fr(1f32)], + grid_template_columns: vec![length(40f32), fr(1f32), fr(1f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_fr_no_sized_items_indefinite.rs b/tests/generated/grid_fr_no_sized_items_indefinite.rs index 4a6174519..58b2ef73d 100644 --- a/tests/generated/grid_fr_no_sized_items_indefinite.rs +++ b/tests/generated/grid_fr_no_sized_items_indefinite.rs @@ -16,8 +16,8 @@ fn grid_fr_no_sized_items_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), fr(1f32), fr(1f32)], - grid_template_columns: vec![points(40f32), fr(1f32), fr(1f32)], + grid_template_rows: vec![length(40f32), fr(1f32), fr(1f32)], + grid_template_columns: vec![length(40f32), fr(1f32), fr(1f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_fr_single_item_indefinite.rs b/tests/generated/grid_fr_single_item_indefinite.rs index 5dafd96b5..8de1c863d 100644 --- a/tests/generated/grid_fr_single_item_indefinite.rs +++ b/tests/generated/grid_fr_single_item_indefinite.rs @@ -6,7 +6,7 @@ fn grid_fr_single_item_indefinite() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,8 +21,8 @@ fn grid_fr_single_item_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), fr(1f32), fr(1f32)], - grid_template_columns: vec![points(40f32), fr(1f32), fr(1f32)], + grid_template_rows: vec![length(40f32), fr(1f32), fr(1f32)], + grid_template_columns: vec![length(40f32), fr(1f32), fr(1f32)], size: taffy::geometry::Size { width: taffy::style::Dimension::Auto, height: taffy::style::Dimension::Auto, diff --git a/tests/generated/grid_fr_span_2_proportion.rs b/tests/generated/grid_fr_span_2_proportion.rs index 7987d1afa..5886c7924 100644 --- a/tests/generated/grid_fr_span_2_proportion.rs +++ b/tests/generated/grid_fr_span_2_proportion.rs @@ -9,7 +9,7 @@ fn grid_fr_span_2_proportion() { start: taffy::style::GridPlacement::Span(2u16), end: taffy::style::GridPlacement::Auto, }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -19,7 +19,7 @@ fn grid_fr_span_2_proportion() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![fr(1f32), fr(2f32)], ..Default::default() }, diff --git a/tests/generated/grid_fr_span_2_proportion_sub_1_sum.rs b/tests/generated/grid_fr_span_2_proportion_sub_1_sum.rs index 6f13f50d4..7768a86af 100644 --- a/tests/generated/grid_fr_span_2_proportion_sub_1_sum.rs +++ b/tests/generated/grid_fr_span_2_proportion_sub_1_sum.rs @@ -9,7 +9,7 @@ fn grid_fr_span_2_proportion_sub_1_sum() { start: taffy::style::GridPlacement::Span(2u16), end: taffy::style::GridPlacement::Auto, }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -19,7 +19,7 @@ fn grid_fr_span_2_proportion_sub_1_sum() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![fr(0.2f32), fr(0.3f32)], ..Default::default() }, diff --git a/tests/generated/grid_fr_span_2_proportion_with_non_spanned_track.rs b/tests/generated/grid_fr_span_2_proportion_with_non_spanned_track.rs index c29bb53fb..90df6a552 100644 --- a/tests/generated/grid_fr_span_2_proportion_with_non_spanned_track.rs +++ b/tests/generated/grid_fr_span_2_proportion_with_non_spanned_track.rs @@ -9,7 +9,7 @@ fn grid_fr_span_2_proportion_with_non_spanned_track() { start: taffy::style::GridPlacement::Span(2u16), end: taffy::style::GridPlacement::Auto, }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,7 +21,7 @@ fn grid_fr_span_2_proportion_with_non_spanned_track() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![fr(1f32), fr(2f32), fr(3f32)], ..Default::default() }, diff --git a/tests/generated/grid_fr_span_2_proportion_zero_sum.rs b/tests/generated/grid_fr_span_2_proportion_zero_sum.rs index 4b1277434..2d83227d4 100644 --- a/tests/generated/grid_fr_span_2_proportion_zero_sum.rs +++ b/tests/generated/grid_fr_span_2_proportion_zero_sum.rs @@ -9,7 +9,7 @@ fn grid_fr_span_2_proportion_zero_sum() { start: taffy::style::GridPlacement::Span(2u16), end: taffy::style::GridPlacement::Auto, }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -19,7 +19,7 @@ fn grid_fr_span_2_proportion_zero_sum() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![fr(0f32), fr(0f32)], ..Default::default() }, diff --git a/tests/generated/grid_fr_span_2_proportion_zero_sum_with_non_spanned_track.rs b/tests/generated/grid_fr_span_2_proportion_zero_sum_with_non_spanned_track.rs index f3f4bdebc..5465724e4 100644 --- a/tests/generated/grid_fr_span_2_proportion_zero_sum_with_non_spanned_track.rs +++ b/tests/generated/grid_fr_span_2_proportion_zero_sum_with_non_spanned_track.rs @@ -9,7 +9,7 @@ fn grid_fr_span_2_proportion_zero_sum_with_non_spanned_track() { start: taffy::style::GridPlacement::Span(2u16), end: taffy::style::GridPlacement::Auto, }, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -21,7 +21,7 @@ fn grid_fr_span_2_proportion_zero_sum_with_non_spanned_track() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![fr(0f32), fr(0f32), fr(0f32)], ..Default::default() }, diff --git a/tests/generated/grid_gap.rs b/tests/generated/grid_gap.rs index c93e01926..1d6fbf663 100644 --- a/tests/generated/grid_gap.rs +++ b/tests/generated/grid_gap.rs @@ -17,14 +17,14 @@ fn grid_gap() { taffy::style::Style { display: taffy::style::Display::Grid, gap: taffy::geometry::Size { - width: taffy::style::LengthPercentage::Points(40f32), - height: taffy::style::LengthPercentage::Points(40f32), + width: taffy::style::LengthPercentage::Length(40f32), + height: taffy::style::LengthPercentage::Length(40f32), }, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_hidden.rs b/tests/generated/grid_hidden.rs index 887330f87..b2ac34dca 100644 --- a/tests/generated/grid_hidden.rs +++ b/tests/generated/grid_hidden.rs @@ -19,11 +19,11 @@ fn grid_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_center.rs b/tests/generated/grid_justify_content_center.rs index 99681226a..db5de6c9c 100644 --- a/tests/generated/grid_justify_content_center.rs +++ b/tests/generated/grid_justify_content_center.rs @@ -17,11 +17,11 @@ fn grid_justify_content_center() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::Center), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_center_with_padding_border.rs b/tests/generated/grid_justify_content_center_with_padding_border.rs index d9e631dea..436eafe92 100644 --- a/tests/generated/grid_justify_content_center_with_padding_border.rs +++ b/tests/generated/grid_justify_content_center_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_center_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::Center), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_end.rs b/tests/generated/grid_justify_content_end.rs index 792c4d8bf..a3ef4d553 100644 --- a/tests/generated/grid_justify_content_end.rs +++ b/tests/generated/grid_justify_content_end.rs @@ -17,11 +17,11 @@ fn grid_justify_content_end() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_end_with_padding_border.rs b/tests/generated/grid_justify_content_end_with_padding_border.rs index 4e932b22b..d5f48637d 100644 --- a/tests/generated/grid_justify_content_end_with_padding_border.rs +++ b/tests/generated/grid_justify_content_end_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_end_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_around.rs b/tests/generated/grid_justify_content_space_around.rs index addca094a..64f4a628b 100644 --- a/tests/generated/grid_justify_content_space_around.rs +++ b/tests/generated/grid_justify_content_space_around.rs @@ -17,11 +17,11 @@ fn grid_justify_content_space_around() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceAround), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_around_with_padding_border.rs b/tests/generated/grid_justify_content_space_around_with_padding_border.rs index 1fa401678..f7a2d8892 100644 --- a/tests/generated/grid_justify_content_space_around_with_padding_border.rs +++ b/tests/generated/grid_justify_content_space_around_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_space_around_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceAround), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_between.rs b/tests/generated/grid_justify_content_space_between.rs index 4edc8a06c..0cb9375d4 100644 --- a/tests/generated/grid_justify_content_space_between.rs +++ b/tests/generated/grid_justify_content_space_between.rs @@ -17,11 +17,11 @@ fn grid_justify_content_space_between() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceBetween), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_between_with_padding_border.rs b/tests/generated/grid_justify_content_space_between_with_padding_border.rs index a55faf21d..3bf647ad4 100644 --- a/tests/generated/grid_justify_content_space_between_with_padding_border.rs +++ b/tests/generated/grid_justify_content_space_between_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_space_between_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceBetween), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_evenly.rs b/tests/generated/grid_justify_content_space_evenly.rs index 9cd5edda5..94f8833a4 100644 --- a/tests/generated/grid_justify_content_space_evenly.rs +++ b/tests/generated/grid_justify_content_space_evenly.rs @@ -17,11 +17,11 @@ fn grid_justify_content_space_evenly() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_space_evenly_with_padding_border.rs b/tests/generated/grid_justify_content_space_evenly_with_padding_border.rs index 7478dcfe7..18762c8fe 100644 --- a/tests/generated/grid_justify_content_space_evenly_with_padding_border.rs +++ b/tests/generated/grid_justify_content_space_evenly_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_space_evenly_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_start.rs b/tests/generated/grid_justify_content_start.rs index 008276b91..b410af698 100644 --- a/tests/generated/grid_justify_content_start.rs +++ b/tests/generated/grid_justify_content_start.rs @@ -17,11 +17,11 @@ fn grid_justify_content_start() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_content_start_with_padding_border.rs b/tests/generated/grid_justify_content_start_with_padding_border.rs index eae9cd7bc..56c33c7c8 100644 --- a/tests/generated/grid_justify_content_start_with_padding_border.rs +++ b/tests/generated/grid_justify_content_start_with_padding_border.rs @@ -17,23 +17,23 @@ fn grid_justify_content_start_with_padding_border() { taffy::style::Style { display: taffy::style::Display::Grid, justify_content: Some(taffy::style::JustifyContent::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_items_sized_center.rs b/tests/generated/grid_justify_items_sized_center.rs index 3600df23d..603d88367 100644 --- a/tests/generated/grid_justify_items_sized_center.rs +++ b/tests/generated/grid_justify_items_sized_center.rs @@ -8,8 +8,8 @@ fn grid_justify_items_sized_center() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_justify_items_sized_center() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_justify_items_sized_center() { taffy::style::Style { display: taffy::style::Display::Grid, justify_items: Some(taffy::style::JustifyItems::Center), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_items_sized_end.rs b/tests/generated/grid_justify_items_sized_end.rs index 3ff675684..a7232c5b6 100644 --- a/tests/generated/grid_justify_items_sized_end.rs +++ b/tests/generated/grid_justify_items_sized_end.rs @@ -8,8 +8,8 @@ fn grid_justify_items_sized_end() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_justify_items_sized_end() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_justify_items_sized_end() { taffy::style::Style { display: taffy::style::Display::Grid, justify_items: Some(taffy::style::JustifyItems::End), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_items_sized_start.rs b/tests/generated/grid_justify_items_sized_start.rs index 9d46dc4e4..b269bcfbf 100644 --- a/tests/generated/grid_justify_items_sized_start.rs +++ b/tests/generated/grid_justify_items_sized_start.rs @@ -8,8 +8,8 @@ fn grid_justify_items_sized_start() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_justify_items_sized_start() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_justify_items_sized_start() { taffy::style::Style { display: taffy::style::Display::Grid, justify_items: Some(taffy::style::JustifyItems::Start), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_items_sized_stretch.rs b/tests/generated/grid_justify_items_sized_stretch.rs index 8ffc9f1d5..f6e9fc086 100644 --- a/tests/generated/grid_justify_items_sized_stretch.rs +++ b/tests/generated/grid_justify_items_sized_stretch.rs @@ -8,8 +8,8 @@ fn grid_justify_items_sized_stretch() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn grid_justify_items_sized_stretch() { grid_row: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(3i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -30,11 +30,11 @@ fn grid_justify_items_sized_stretch() { taffy::style::Style { display: taffy::style::Display::Grid, justify_items: Some(taffy::style::JustifyItems::Stretch), - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_justify_self_sized_all.rs b/tests/generated/grid_justify_self_sized_all.rs index 74e7ce248..b44a12921 100644 --- a/tests/generated/grid_justify_self_sized_all.rs +++ b/tests/generated/grid_justify_self_sized_all.rs @@ -7,8 +7,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -47,8 +47,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -57,8 +57,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -67,8 +67,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -77,8 +77,8 @@ fn grid_justify_self_sized_all() { .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -87,11 +87,11 @@ fn grid_justify_self_sized_all() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_auto_margins.rs b/tests/generated/grid_margins_auto_margins.rs index 9dc35ea6b..6b6562550 100644 --- a/tests/generated/grid_margins_auto_margins.rs +++ b/tests/generated/grid_margins_auto_margins.rs @@ -8,12 +8,12 @@ fn grid_margins_auto_margins() { let node2 = taffy .new_leaf(taffy::style::Style { justify_self: Some(taffy::style::JustifySelf::Start), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, right: taffy::style::LengthPercentageAuto::Auto, - top: taffy::style::LengthPercentageAuto::Points(0f32), - bottom: taffy::style::LengthPercentageAuto::Points(0f32), + top: taffy::style::LengthPercentageAuto::Length(0f32), + bottom: taffy::style::LengthPercentageAuto::Length(0f32), }, ..Default::default() }) @@ -22,10 +22,10 @@ fn grid_margins_auto_margins() { let node4 = taffy .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Start), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(0f32), - right: taffy::style::LengthPercentageAuto::Points(0f32), + left: taffy::style::LengthPercentageAuto::Length(0f32), + right: taffy::style::LengthPercentageAuto::Length(0f32), top: taffy::style::LengthPercentageAuto::Auto, bottom: taffy::style::LengthPercentageAuto::Auto, }, @@ -38,8 +38,8 @@ fn grid_margins_auto_margins() { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -56,13 +56,13 @@ fn grid_margins_auto_margins() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_auto_margins_override_stretch.rs b/tests/generated/grid_margins_auto_margins_override_stretch.rs index b67e2503f..b7fb01447 100644 --- a/tests/generated/grid_margins_auto_margins_override_stretch.rs +++ b/tests/generated/grid_margins_auto_margins_override_stretch.rs @@ -40,13 +40,13 @@ fn grid_margins_auto_margins_override_stretch() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_fixed_center.rs b/tests/generated/grid_margins_fixed_center.rs index 3998afeef..08df514b6 100644 --- a/tests/generated/grid_margins_fixed_center.rs +++ b/tests/generated/grid_margins_fixed_center.rs @@ -8,14 +8,14 @@ fn grid_margins_fixed_center() { align_self: Some(taffy::style::AlignSelf::Center), justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(8f32), - right: taffy::style::LengthPercentageAuto::Points(4f32), - top: taffy::style::LengthPercentageAuto::Points(2f32), - bottom: taffy::style::LengthPercentageAuto::Points(6f32), + left: taffy::style::LengthPercentageAuto::Length(8f32), + right: taffy::style::LengthPercentageAuto::Length(4f32), + top: taffy::style::LengthPercentageAuto::Length(2f32), + bottom: taffy::style::LengthPercentageAuto::Length(6f32), }, ..Default::default() }) @@ -29,13 +29,13 @@ fn grid_margins_fixed_center() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_fixed_end.rs b/tests/generated/grid_margins_fixed_end.rs index 9baba4507..e4177f1e7 100644 --- a/tests/generated/grid_margins_fixed_end.rs +++ b/tests/generated/grid_margins_fixed_end.rs @@ -8,14 +8,14 @@ fn grid_margins_fixed_end() { align_self: Some(taffy::style::AlignSelf::End), justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, ..Default::default() }) @@ -29,13 +29,13 @@ fn grid_margins_fixed_end() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_fixed_start.rs b/tests/generated/grid_margins_fixed_start.rs index 293b8e5d2..a714cd415 100644 --- a/tests/generated/grid_margins_fixed_start.rs +++ b/tests/generated/grid_margins_fixed_start.rs @@ -8,14 +8,14 @@ fn grid_margins_fixed_start() { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, ..Default::default() }) @@ -29,13 +29,13 @@ fn grid_margins_fixed_start() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_fixed_stretch.rs b/tests/generated/grid_margins_fixed_stretch.rs index 906fb3066..628afef32 100644 --- a/tests/generated/grid_margins_fixed_stretch.rs +++ b/tests/generated/grid_margins_fixed_stretch.rs @@ -8,14 +8,14 @@ fn grid_margins_fixed_stretch() { align_self: Some(taffy::style::AlignSelf::Stretch), justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(4f32), - right: taffy::style::LengthPercentageAuto::Points(2f32), - top: taffy::style::LengthPercentageAuto::Points(1f32), - bottom: taffy::style::LengthPercentageAuto::Points(3f32), + left: taffy::style::LengthPercentageAuto::Length(4f32), + right: taffy::style::LengthPercentageAuto::Length(2f32), + top: taffy::style::LengthPercentageAuto::Length(1f32), + bottom: taffy::style::LengthPercentageAuto::Length(3f32), }, ..Default::default() }) @@ -29,13 +29,13 @@ fn grid_margins_fixed_stretch() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(40f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(30f32), + left: taffy::style::LengthPercentage::Length(40f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(30f32), }, ..Default::default() }, diff --git a/tests/generated/grid_margins_percent_center.rs b/tests/generated/grid_margins_percent_center.rs index 6212eea4a..fc8dd7bef 100644 --- a/tests/generated/grid_margins_percent_center.rs +++ b/tests/generated/grid_margins_percent_center.rs @@ -8,8 +8,8 @@ fn grid_margins_percent_center() { align_self: Some(taffy::style::AlignSelf::Center), justify_self: Some(taffy::style::JustifySelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.2f32), @@ -29,8 +29,8 @@ fn grid_margins_percent_center() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(20f32), points(20f32), points(20f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(20f32), length(20f32), length(20f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5], diff --git a/tests/generated/grid_margins_percent_end.rs b/tests/generated/grid_margins_percent_end.rs index ba864e533..359d75b13 100644 --- a/tests/generated/grid_margins_percent_end.rs +++ b/tests/generated/grid_margins_percent_end.rs @@ -8,8 +8,8 @@ fn grid_margins_percent_end() { align_self: Some(taffy::style::AlignSelf::End), justify_self: Some(taffy::style::JustifySelf::End), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.2f32), @@ -29,8 +29,8 @@ fn grid_margins_percent_end() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(20f32), points(20f32), points(20f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(20f32), length(20f32), length(20f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5], diff --git a/tests/generated/grid_margins_percent_start.rs b/tests/generated/grid_margins_percent_start.rs index 806b3f785..fa73ec6d3 100644 --- a/tests/generated/grid_margins_percent_start.rs +++ b/tests/generated/grid_margins_percent_start.rs @@ -8,8 +8,8 @@ fn grid_margins_percent_start() { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.2f32), @@ -29,8 +29,8 @@ fn grid_margins_percent_start() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(20f32), points(20f32), points(20f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(20f32), length(20f32), length(20f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5], diff --git a/tests/generated/grid_margins_percent_stretch.rs b/tests/generated/grid_margins_percent_stretch.rs index e71475494..37d9d6fe0 100644 --- a/tests/generated/grid_margins_percent_stretch.rs +++ b/tests/generated/grid_margins_percent_stretch.rs @@ -8,8 +8,8 @@ fn grid_margins_percent_stretch() { align_self: Some(taffy::style::AlignSelf::Stretch), justify_self: Some(taffy::style::JustifySelf::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.2f32), @@ -29,8 +29,8 @@ fn grid_margins_percent_stretch() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(20f32), points(20f32), points(20f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(20f32), length(20f32), length(20f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5], diff --git a/tests/generated/grid_max_content_maximum_single_item.rs b/tests/generated/grid_max_content_maximum_single_item.rs index 410f772a7..fb99480ae 100644 --- a/tests/generated/grid_max_content_maximum_single_item.rs +++ b/tests/generated/grid_max_content_maximum_single_item.rs @@ -30,8 +30,8 @@ fn grid_max_content_maximum_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(0f32), max_content()), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(0f32), max_content()), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item.rs b/tests/generated/grid_max_content_single_item.rs index cf3d993e4..65872afd0 100644 --- a/tests/generated/grid_max_content_single_item.rs +++ b/tests/generated/grid_max_content_single_item.rs @@ -30,8 +30,8 @@ fn grid_max_content_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_margin_auto.rs b/tests/generated/grid_max_content_single_item_margin_auto.rs index 331d9a9a6..5731e5959 100644 --- a/tests/generated/grid_max_content_single_item_margin_auto.rs +++ b/tests/generated/grid_max_content_single_item_margin_auto.rs @@ -38,8 +38,8 @@ fn grid_max_content_single_item_margin_auto() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_margin_fixed.rs b/tests/generated/grid_max_content_single_item_margin_fixed.rs index 52812575c..fdf5aad9f 100644 --- a/tests/generated/grid_max_content_single_item_margin_fixed.rs +++ b/tests/generated/grid_max_content_single_item_margin_fixed.rs @@ -8,10 +8,10 @@ fn grid_max_content_single_item_margin_fixed() { .new_leaf_with_measure( taffy::style::Style { margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(15f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(15f32), }, ..Default::default() }, @@ -38,8 +38,8 @@ fn grid_max_content_single_item_margin_fixed() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_margin_percent.rs b/tests/generated/grid_max_content_single_item_margin_percent.rs index ea0c503a2..e7aed84fc 100644 --- a/tests/generated/grid_max_content_single_item_margin_percent.rs +++ b/tests/generated/grid_max_content_single_item_margin_percent.rs @@ -38,8 +38,8 @@ fn grid_max_content_single_item_margin_percent() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_span_2.rs b/tests/generated/grid_max_content_single_item_span_2.rs index 5c76c7959..5e28a7b60 100644 --- a/tests/generated/grid_max_content_single_item_span_2.rs +++ b/tests/generated/grid_max_content_single_item_span_2.rs @@ -36,8 +36,8 @@ fn grid_max_content_single_item_span_2() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), max_content()], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), max_content()], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_span_2_gap_fixed.rs b/tests/generated/grid_max_content_single_item_span_2_gap_fixed.rs index 798b31f57..506bb2cdb 100644 --- a/tests/generated/grid_max_content_single_item_span_2_gap_fixed.rs +++ b/tests/generated/grid_max_content_single_item_span_2_gap_fixed.rs @@ -36,9 +36,9 @@ fn grid_max_content_single_item_span_2_gap_fixed() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Points(20f32), height: zero() }, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), max_content()], + gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Length(20f32), height: zero() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), max_content()], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_span_2_gap_percent_definite.rs b/tests/generated/grid_max_content_single_item_span_2_gap_percent_definite.rs index 92030fae6..0481e9a7e 100644 --- a/tests/generated/grid_max_content_single_item_span_2_gap_percent_definite.rs +++ b/tests/generated/grid_max_content_single_item_span_2_gap_percent_definite.rs @@ -37,9 +37,9 @@ fn grid_max_content_single_item_span_2_gap_percent_definite() { taffy::style::Style { display: taffy::style::Display::Grid, gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Percent(0.2f32), height: zero() }, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), max_content()], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), max_content()], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_max_content_single_item_span_2_gap_percent_indefinite.rs b/tests/generated/grid_max_content_single_item_span_2_gap_percent_indefinite.rs index 662e0ace7..c7cbad15d 100644 --- a/tests/generated/grid_max_content_single_item_span_2_gap_percent_indefinite.rs +++ b/tests/generated/grid_max_content_single_item_span_2_gap_percent_indefinite.rs @@ -37,8 +37,8 @@ fn grid_max_content_single_item_span_2_gap_percent_indefinite() { taffy::style::Style { display: taffy::style::Display::Grid, gap: taffy::geometry::Size { width: taffy::style::LengthPercentage::Percent(0.2f32), height: zero() }, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), max_content(), max_content()], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), max_content(), max_content()], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_min_content_flex_column.rs b/tests/generated/grid_min_content_flex_column.rs index 584873586..91d107424 100644 --- a/tests/generated/grid_min_content_flex_column.rs +++ b/tests/generated/grid_min_content_flex_column.rs @@ -62,7 +62,7 @@ fn grid_min_content_flex_column() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content()], ..Default::default() }, diff --git a/tests/generated/grid_min_content_flex_row.rs b/tests/generated/grid_min_content_flex_row.rs index ff47fd2a6..b506ab545 100644 --- a/tests/generated/grid_min_content_flex_row.rs +++ b/tests/generated/grid_min_content_flex_row.rs @@ -58,7 +58,7 @@ fn grid_min_content_flex_row() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content()], ..Default::default() }, diff --git a/tests/generated/grid_min_content_flex_single_item.rs b/tests/generated/grid_min_content_flex_single_item.rs index 24007ae64..320abc2fd 100644 --- a/tests/generated/grid_min_content_flex_single_item.rs +++ b/tests/generated/grid_min_content_flex_single_item.rs @@ -6,7 +6,7 @@ fn grid_min_content_flex_single_item() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -40,8 +40,8 @@ fn grid_min_content_flex_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), min_content(), fr(1f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), min_content(), fr(1f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7], diff --git a/tests/generated/grid_min_content_flex_single_item_margin_auto.rs b/tests/generated/grid_min_content_flex_single_item_margin_auto.rs index 00cb9cafe..c27b3e292 100644 --- a/tests/generated/grid_min_content_flex_single_item_margin_auto.rs +++ b/tests/generated/grid_min_content_flex_single_item_margin_auto.rs @@ -6,7 +6,7 @@ fn grid_min_content_flex_single_item_margin_auto() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, right: taffy::style::LengthPercentageAuto::Auto, @@ -52,8 +52,8 @@ fn grid_min_content_flex_single_item_margin_auto() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), min_content(), fr(1f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), min_content(), fr(1f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7], diff --git a/tests/generated/grid_min_content_flex_single_item_margin_fixed.rs b/tests/generated/grid_min_content_flex_single_item_margin_fixed.rs index 4c515d7d3..2f50dd5db 100644 --- a/tests/generated/grid_min_content_flex_single_item_margin_fixed.rs +++ b/tests/generated/grid_min_content_flex_single_item_margin_fixed.rs @@ -6,12 +6,12 @@ fn grid_min_content_flex_single_item_margin_fixed() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(15f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(15f32), }, ..Default::default() }) @@ -26,10 +26,10 @@ fn grid_min_content_flex_single_item_margin_fixed() { end: taffy::style::GridPlacement::Auto, }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(15f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(15f32), }, ..Default::default() }, @@ -52,8 +52,8 @@ fn grid_min_content_flex_single_item_margin_fixed() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), min_content(), fr(1f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), min_content(), fr(1f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7], diff --git a/tests/generated/grid_min_content_flex_single_item_margin_percent.rs b/tests/generated/grid_min_content_flex_single_item_margin_percent.rs index e3c4183d2..49bca1e4c 100644 --- a/tests/generated/grid_min_content_flex_single_item_margin_percent.rs +++ b/tests/generated/grid_min_content_flex_single_item_margin_percent.rs @@ -6,7 +6,7 @@ fn grid_min_content_flex_single_item_margin_percent() { let node0 = taffy.new_leaf(taffy::style::Style { ..Default::default() }).unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.2f32), right: taffy::style::LengthPercentageAuto::Percent(0.1f32), @@ -52,8 +52,8 @@ fn grid_min_content_flex_single_item_margin_percent() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), min_content(), fr(1f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), min_content(), fr(1f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7], diff --git a/tests/generated/grid_min_content_maximum_single_item.rs b/tests/generated/grid_min_content_maximum_single_item.rs index ed2389b43..81420a4f1 100644 --- a/tests/generated/grid_min_content_maximum_single_item.rs +++ b/tests/generated/grid_min_content_maximum_single_item.rs @@ -30,8 +30,8 @@ fn grid_min_content_maximum_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(0f32), min_content()), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(0f32), min_content()), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_min_content_single_item.rs b/tests/generated/grid_min_content_single_item.rs index c21440ebe..1735f86c6 100644 --- a/tests/generated/grid_min_content_single_item.rs +++ b/tests/generated/grid_min_content_single_item.rs @@ -30,8 +30,8 @@ fn grid_min_content_single_item() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), min_content(), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), min_content(), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_minmax_auto_fixed_10px.rs b/tests/generated/grid_minmax_auto_fixed_10px.rs index 341c106ff..15079c725 100644 --- a/tests/generated/grid_minmax_auto_fixed_10px.rs +++ b/tests/generated/grid_minmax_auto_fixed_10px.rs @@ -22,8 +22,8 @@ fn grid_minmax_auto_fixed_10px() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![minmax(auto(), points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![minmax(auto(), length(10f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_auto_max_content.rs b/tests/generated/grid_minmax_auto_max_content.rs index 7162d3605..548abde48 100644 --- a/tests/generated/grid_minmax_auto_max_content.rs +++ b/tests/generated/grid_minmax_auto_max_content.rs @@ -22,7 +22,7 @@ fn grid_minmax_auto_max_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(auto(), max_content())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_auto_min_content.rs b/tests/generated/grid_minmax_auto_min_content.rs index e08ce37fe..c2a03a025 100644 --- a/tests/generated/grid_minmax_auto_min_content.rs +++ b/tests/generated/grid_minmax_auto_min_content.rs @@ -22,7 +22,7 @@ fn grid_minmax_auto_min_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(auto(), min_content())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_auto_percent_definite.rs b/tests/generated/grid_minmax_auto_percent_definite.rs index 5be188fd2..88729428b 100644 --- a/tests/generated/grid_minmax_auto_percent_definite.rs +++ b/tests/generated/grid_minmax_auto_percent_definite.rs @@ -22,9 +22,9 @@ fn grid_minmax_auto_percent_definite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(auto(), percent(0.2f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_auto_percent_indefinite.rs b/tests/generated/grid_minmax_auto_percent_indefinite.rs index c41a954d5..3d6fd04bf 100644 --- a/tests/generated/grid_minmax_auto_percent_indefinite.rs +++ b/tests/generated/grid_minmax_auto_percent_indefinite.rs @@ -22,7 +22,7 @@ fn grid_minmax_auto_percent_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(auto(), percent(0.2f32))], ..Default::default() }, diff --git a/tests/generated/grid_minmax_column_fixed_width_above_range.rs b/tests/generated/grid_minmax_column_fixed_width_above_range.rs index 8f3b0e5d7..c295dcf9a 100644 --- a/tests/generated/grid_minmax_column_fixed_width_above_range.rs +++ b/tests/generated/grid_minmax_column_fixed_width_above_range.rs @@ -16,9 +16,9 @@ fn grid_minmax_column_fixed_width_above_range() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(20f32), points(40f32)), points(40f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(140f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(20f32), length(40f32)), length(40f32)], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(140f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_minmax_column_fixed_width_below_range.rs b/tests/generated/grid_minmax_column_fixed_width_below_range.rs index 6d81e2e73..063049827 100644 --- a/tests/generated/grid_minmax_column_fixed_width_below_range.rs +++ b/tests/generated/grid_minmax_column_fixed_width_below_range.rs @@ -16,9 +16,9 @@ fn grid_minmax_column_fixed_width_below_range() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(20f32), points(40f32)), points(40f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(90f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(20f32), length(40f32)), length(40f32)], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(90f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_minmax_column_fixed_width_within_range.rs b/tests/generated/grid_minmax_column_fixed_width_within_range.rs index f974eb474..9539e18b7 100644 --- a/tests/generated/grid_minmax_column_fixed_width_within_range.rs +++ b/tests/generated/grid_minmax_column_fixed_width_within_range.rs @@ -16,9 +16,9 @@ fn grid_minmax_column_fixed_width_within_range() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(20f32), points(40f32)), points(40f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(110f32), height: auto() }, + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(20f32), length(40f32)), length(40f32)], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(110f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_minmax_column_indefinite.rs b/tests/generated/grid_minmax_column_indefinite.rs index eb0b54c75..5b8e516b5 100644 --- a/tests/generated/grid_minmax_column_indefinite.rs +++ b/tests/generated/grid_minmax_column_indefinite.rs @@ -16,8 +16,8 @@ fn grid_minmax_column_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), minmax(points(20f32), points(40f32)), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), minmax(length(20f32), length(40f32)), length(40f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5, node6, node7, node8], diff --git a/tests/generated/grid_minmax_column_with_auto_fixed.rs b/tests/generated/grid_minmax_column_with_auto_fixed.rs index b4f1f5c00..f53ee3950 100644 --- a/tests/generated/grid_minmax_column_with_auto_fixed.rs +++ b/tests/generated/grid_minmax_column_with_auto_fixed.rs @@ -9,9 +9,9 @@ fn grid_minmax_column_with_auto_fixed() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![minmax(points(20f32), points(40f32)), auto()], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![minmax(length(20f32), length(40f32)), auto()], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/grid_minmax_column_with_fr_fixed.rs b/tests/generated/grid_minmax_column_with_fr_fixed.rs index 80060c585..5564e222a 100644 --- a/tests/generated/grid_minmax_column_with_fr_fixed.rs +++ b/tests/generated/grid_minmax_column_with_fr_fixed.rs @@ -9,9 +9,9 @@ fn grid_minmax_column_with_fr_fixed() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![minmax(points(20f32), points(40f32)), fr(1f32)], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![minmax(length(20f32), length(40f32)), fr(1f32)], + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/grid_minmax_max_content_1fr.rs b/tests/generated/grid_minmax_max_content_1fr.rs index f38a44fe2..fb96cd14e 100644 --- a/tests/generated/grid_minmax_max_content_1fr.rs +++ b/tests/generated/grid_minmax_max_content_1fr.rs @@ -22,7 +22,7 @@ fn grid_minmax_max_content_1fr() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(max_content(), fr(1f32))], ..Default::default() }, diff --git a/tests/generated/grid_minmax_max_content_auto.rs b/tests/generated/grid_minmax_max_content_auto.rs index e1484dbe5..c2ee7d4f9 100644 --- a/tests/generated/grid_minmax_max_content_auto.rs +++ b/tests/generated/grid_minmax_max_content_auto.rs @@ -22,7 +22,7 @@ fn grid_minmax_max_content_auto() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(max_content(), auto())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_max_content_fixed_10px.rs b/tests/generated/grid_minmax_max_content_fixed_10px.rs index 130af7a74..3ac6bb7bc 100644 --- a/tests/generated/grid_minmax_max_content_fixed_10px.rs +++ b/tests/generated/grid_minmax_max_content_fixed_10px.rs @@ -22,8 +22,8 @@ fn grid_minmax_max_content_fixed_10px() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![minmax(max_content(), points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![minmax(max_content(), length(10f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_max_content_min_content.rs b/tests/generated/grid_minmax_max_content_min_content.rs index 50eefc8ec..9d9f252c1 100644 --- a/tests/generated/grid_minmax_max_content_min_content.rs +++ b/tests/generated/grid_minmax_max_content_min_content.rs @@ -22,7 +22,7 @@ fn grid_minmax_max_content_min_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(max_content(), min_content())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_max_content_percent_definite.rs b/tests/generated/grid_minmax_max_content_percent_definite.rs index e2c58271e..2cd62dd6f 100644 --- a/tests/generated/grid_minmax_max_content_percent_definite.rs +++ b/tests/generated/grid_minmax_max_content_percent_definite.rs @@ -22,9 +22,9 @@ fn grid_minmax_max_content_percent_definite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(max_content(), percent(0.2f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_max_content_percent_indefinite.rs b/tests/generated/grid_minmax_max_content_percent_indefinite.rs index c01b78f75..bd45de88d 100644 --- a/tests/generated/grid_minmax_max_content_percent_indefinite.rs +++ b/tests/generated/grid_minmax_max_content_percent_indefinite.rs @@ -22,7 +22,7 @@ fn grid_minmax_max_content_percent_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(max_content(), percent(0.2f32))], ..Default::default() }, diff --git a/tests/generated/grid_minmax_min_content_1fr.rs b/tests/generated/grid_minmax_min_content_1fr.rs index 4041b7c88..94c348e92 100644 --- a/tests/generated/grid_minmax_min_content_1fr.rs +++ b/tests/generated/grid_minmax_min_content_1fr.rs @@ -22,7 +22,7 @@ fn grid_minmax_min_content_1fr() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(min_content(), fr(1f32))], ..Default::default() }, diff --git a/tests/generated/grid_minmax_min_content_auto.rs b/tests/generated/grid_minmax_min_content_auto.rs index 211f1b9de..99b6f05da 100644 --- a/tests/generated/grid_minmax_min_content_auto.rs +++ b/tests/generated/grid_minmax_min_content_auto.rs @@ -22,7 +22,7 @@ fn grid_minmax_min_content_auto() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(min_content(), auto())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_min_content_fixed_10px.rs b/tests/generated/grid_minmax_min_content_fixed_10px.rs index c2c9fb2d9..18334bc09 100644 --- a/tests/generated/grid_minmax_min_content_fixed_10px.rs +++ b/tests/generated/grid_minmax_min_content_fixed_10px.rs @@ -22,8 +22,8 @@ fn grid_minmax_min_content_fixed_10px() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![minmax(min_content(), points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![minmax(min_content(), length(10f32))], ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_min_content_max_content.rs b/tests/generated/grid_minmax_min_content_max_content.rs index 14ebefdec..ad7e44fc8 100644 --- a/tests/generated/grid_minmax_min_content_max_content.rs +++ b/tests/generated/grid_minmax_min_content_max_content.rs @@ -22,7 +22,7 @@ fn grid_minmax_min_content_max_content() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(min_content(), max_content())], ..Default::default() }, diff --git a/tests/generated/grid_minmax_min_content_percent_definite.rs b/tests/generated/grid_minmax_min_content_percent_definite.rs index 3cddf8aaf..5b86025d0 100644 --- a/tests/generated/grid_minmax_min_content_percent_definite.rs +++ b/tests/generated/grid_minmax_min_content_percent_definite.rs @@ -22,9 +22,9 @@ fn grid_minmax_min_content_percent_definite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(min_content(), percent(0.2f32))], - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_minmax_min_content_percent_indefinite.rs b/tests/generated/grid_minmax_min_content_percent_indefinite.rs index 22e0e9917..3f93e492d 100644 --- a/tests/generated/grid_minmax_min_content_percent_indefinite.rs +++ b/tests/generated/grid_minmax_min_content_percent_indefinite.rs @@ -22,7 +22,7 @@ fn grid_minmax_min_content_percent_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![minmax(min_content(), percent(0.2f32))], ..Default::default() }, diff --git a/tests/generated/grid_out_of_order_items.rs b/tests/generated/grid_out_of_order_items.rs index db52831c3..a95f7f863 100644 --- a/tests/generated/grid_out_of_order_items.rs +++ b/tests/generated/grid_out_of_order_items.rs @@ -9,8 +9,8 @@ fn grid_out_of_order_items() { .new_leaf(taffy::style::Style { grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(35f32), - height: taffy::style::Dimension::Points(35f32), + width: taffy::style::Dimension::Length(35f32), + height: taffy::style::Dimension::Length(35f32), }, ..Default::default() }) @@ -22,8 +22,8 @@ fn grid_out_of_order_items() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn grid_out_of_order_items() { .new_leaf(taffy::style::Style { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -44,12 +44,12 @@ fn grid_out_of_order_items() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], grid_auto_flow: taffy::style::GridAutoFlow::RowDense, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_overflow_inline_axis_hidden.rs b/tests/generated/grid_overflow_inline_axis_hidden.rs index 61061e52a..9fcd1d9f2 100644 --- a/tests/generated/grid_overflow_inline_axis_hidden.rs +++ b/tests/generated/grid_overflow_inline_axis_hidden.rs @@ -29,8 +29,8 @@ fn grid_overflow_inline_axis_hidden() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/grid_overflow_inline_axis_visible.rs b/tests/generated/grid_overflow_inline_axis_visible.rs index fae428124..fc400e473 100644 --- a/tests/generated/grid_overflow_inline_axis_visible.rs +++ b/tests/generated/grid_overflow_inline_axis_visible.rs @@ -23,8 +23,8 @@ fn grid_overflow_inline_axis_visible() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/grid_overflow_rows.rs b/tests/generated/grid_overflow_rows.rs index 42b37b45a..4dd5fc7a0 100644 --- a/tests/generated/grid_overflow_rows.rs +++ b/tests/generated/grid_overflow_rows.rs @@ -30,8 +30,8 @@ fn grid_overflow_rows() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], - grid_template_columns: vec![min_content(), max_content(), points(10f32), percent(0.2f32)], + grid_template_rows: vec![length(40f32), length(40f32)], + grid_template_columns: vec![min_content(), max_content(), length(10f32), percent(0.2f32)], ..Default::default() }, &[node0, node1, node2, node3, node4, node5], diff --git a/tests/generated/grid_padding_border_overrides_container_max_size.rs b/tests/generated/grid_padding_border_overrides_container_max_size.rs index e74aed4d4..120669afa 100644 --- a/tests/generated/grid_padding_border_overrides_container_max_size.rs +++ b/tests/generated/grid_padding_border_overrides_container_max_size.rs @@ -9,20 +9,20 @@ fn grid_padding_border_overrides_container_max_size() { taffy::style::Style { display: taffy::style::Display::Grid, max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, diff --git a/tests/generated/grid_padding_border_overrides_container_size.rs b/tests/generated/grid_padding_border_overrides_container_size.rs index 66ac12531..c17647204 100644 --- a/tests/generated/grid_padding_border_overrides_container_size.rs +++ b/tests/generated/grid_padding_border_overrides_container_size.rs @@ -9,20 +9,20 @@ fn grid_padding_border_overrides_container_size() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }, diff --git a/tests/generated/grid_padding_border_overrides_max_size.rs b/tests/generated/grid_padding_border_overrides_max_size.rs index 6ad3519cc..df6a4a772 100644 --- a/tests/generated/grid_padding_border_overrides_max_size.rs +++ b/tests/generated/grid_padding_border_overrides_max_size.rs @@ -6,20 +6,20 @@ fn grid_padding_border_overrides_max_size() { let node0 = taffy .new_leaf(taffy::style::Style { max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/grid_padding_border_overrides_min_size.rs b/tests/generated/grid_padding_border_overrides_min_size.rs index 69743dc7f..5e3d75471 100644 --- a/tests/generated/grid_padding_border_overrides_min_size.rs +++ b/tests/generated/grid_padding_border_overrides_min_size.rs @@ -6,20 +6,20 @@ fn grid_padding_border_overrides_min_size() { let node0 = taffy .new_leaf(taffy::style::Style { min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(0f32), + width: taffy::style::Dimension::Length(0f32), + height: taffy::style::Dimension::Length(0f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/grid_padding_border_overrides_size.rs b/tests/generated/grid_padding_border_overrides_size.rs index e05c6dfbb..380ecf3b8 100644 --- a/tests/generated/grid_padding_border_overrides_size.rs +++ b/tests/generated/grid_padding_border_overrides_size.rs @@ -6,20 +6,20 @@ fn grid_padding_border_overrides_size() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/grid_percent_item_inside_stretch_item.rs b/tests/generated/grid_percent_item_inside_stretch_item.rs index efa696634..3c76b4356 100644 --- a/tests/generated/grid_percent_item_inside_stretch_item.rs +++ b/tests/generated/grid_percent_item_inside_stretch_item.rs @@ -21,8 +21,8 @@ fn grid_percent_item_inside_stretch_item() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_items_nested_inside_stretch_alignment.rs b/tests/generated/grid_percent_items_nested_inside_stretch_alignment.rs index c6a83345a..12a720c01 100644 --- a/tests/generated/grid_percent_items_nested_inside_stretch_alignment.rs +++ b/tests/generated/grid_percent_items_nested_inside_stretch_alignment.rs @@ -25,7 +25,7 @@ fn grid_percent_items_nested_inside_stretch_alignment() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_percent_items_nested_moderate.rs b/tests/generated/grid_percent_items_nested_moderate.rs index 0e417eb0b..aa8a12d03 100644 --- a/tests/generated/grid_percent_items_nested_moderate.rs +++ b/tests/generated/grid_percent_items_nested_moderate.rs @@ -14,10 +14,10 @@ fn grid_percent_items_nested_moderate() { bottom: taffy::style::LengthPercentageAuto::Percent(0.05f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }) @@ -28,10 +28,10 @@ fn grid_percent_items_nested_moderate() { display: taffy::style::Display::Grid, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { left: taffy::style::LengthPercentage::Percent(0.03f32), @@ -48,12 +48,12 @@ fn grid_percent_items_nested_moderate() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_items_nested_with_margin.rs b/tests/generated/grid_percent_items_nested_with_margin.rs index 6f278917c..99358e50a 100644 --- a/tests/generated/grid_percent_items_nested_with_margin.rs +++ b/tests/generated/grid_percent_items_nested_with_margin.rs @@ -29,7 +29,7 @@ fn grid_percent_items_nested_with_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_percent_items_nested_with_padding_margin.rs b/tests/generated/grid_percent_items_nested_with_padding_margin.rs index af903fa0f..2f671d62d 100644 --- a/tests/generated/grid_percent_items_nested_with_padding_margin.rs +++ b/tests/generated/grid_percent_items_nested_with_padding_margin.rs @@ -13,10 +13,10 @@ fn grid_percent_items_nested_with_padding_margin() { bottom: taffy::style::LengthPercentageAuto::Percent(0.05f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }) @@ -27,10 +27,10 @@ fn grid_percent_items_nested_with_padding_margin() { display: taffy::style::Display::Grid, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { left: taffy::style::LengthPercentage::Percent(0.03f32), @@ -49,16 +49,16 @@ fn grid_percent_items_nested_with_padding_margin() { display: taffy::style::Display::Grid, min_size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.6f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }, @@ -72,8 +72,8 @@ fn grid_percent_items_nested_with_padding_margin() { display: taffy::style::Display::Grid, grid_template_rows: vec![fr(1f32), fr(4f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_items_width_and_margin.rs b/tests/generated/grid_percent_items_width_and_margin.rs index 3a9ebc53a..e092f8325 100644 --- a/tests/generated/grid_percent_items_width_and_margin.rs +++ b/tests/generated/grid_percent_items_width_and_margin.rs @@ -13,10 +13,10 @@ fn grid_percent_items_width_and_margin() { bottom: taffy::style::LengthPercentageAuto::Percent(0.05f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }) @@ -25,12 +25,12 @@ fn grid_percent_items_width_and_margin() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_items_width_and_padding.rs b/tests/generated/grid_percent_items_width_and_padding.rs index fa20a64b0..01304ffc2 100644 --- a/tests/generated/grid_percent_items_width_and_padding.rs +++ b/tests/generated/grid_percent_items_width_and_padding.rs @@ -19,7 +19,7 @@ fn grid_percent_items_width_and_padding() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/grid_percent_tracks_definite_overflow.rs b/tests/generated/grid_percent_tracks_definite_overflow.rs index c25ddc1b8..6d2b1ce31 100644 --- a/tests/generated/grid_percent_tracks_definite_overflow.rs +++ b/tests/generated/grid_percent_tracks_definite_overflow.rs @@ -16,8 +16,8 @@ fn grid_percent_tracks_definite_overflow() { grid_template_rows: vec![percent(0.5f32), percent(0.8f32)], grid_template_columns: vec![percent(0.4f32), percent(0.4f32), percent(0.4f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_tracks_definite_underflow.rs b/tests/generated/grid_percent_tracks_definite_underflow.rs index 95296cb4d..12bd7212e 100644 --- a/tests/generated/grid_percent_tracks_definite_underflow.rs +++ b/tests/generated/grid_percent_tracks_definite_underflow.rs @@ -16,8 +16,8 @@ fn grid_percent_tracks_definite_underflow() { grid_template_rows: vec![percent(0.3f32), percent(0.6f32)], grid_template_columns: vec![percent(0.1f32), percent(0.2f32), percent(0.3f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }, diff --git a/tests/generated/grid_percent_tracks_indefinite_with_content_overflow.rs b/tests/generated/grid_percent_tracks_indefinite_with_content_overflow.rs index 24180f8e0..a29b97a67 100644 --- a/tests/generated/grid_percent_tracks_indefinite_with_content_overflow.rs +++ b/tests/generated/grid_percent_tracks_indefinite_with_content_overflow.rs @@ -8,8 +8,8 @@ fn grid_percent_tracks_indefinite_with_content_overflow() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/grid_percent_tracks_indefinite_with_content_underflow.rs b/tests/generated/grid_percent_tracks_indefinite_with_content_underflow.rs index d0a42f0e2..646fb7e5b 100644 --- a/tests/generated/grid_percent_tracks_indefinite_with_content_underflow.rs +++ b/tests/generated/grid_percent_tracks_indefinite_with_content_underflow.rs @@ -8,8 +8,8 @@ fn grid_percent_tracks_indefinite_with_content_underflow() { grid_row: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, grid_column: taffy::geometry::Line { start: line(1i16), end: taffy::style::GridPlacement::Auto }, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/grid_placement_auto_negative.rs b/tests/generated/grid_placement_auto_negative.rs index 2beae72d7..c734172a4 100644 --- a/tests/generated/grid_placement_auto_negative.rs +++ b/tests/generated/grid_placement_auto_negative.rs @@ -21,11 +21,11 @@ fn grid_placement_auto_negative() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_placement_definite_in_secondary_axis_with_fully_definite_negative.rs b/tests/generated/grid_placement_definite_in_secondary_axis_with_fully_definite_negative.rs index 6f4f4433d..7ab2cd096 100644 --- a/tests/generated/grid_placement_definite_in_secondary_axis_with_fully_definite_negative.rs +++ b/tests/generated/grid_placement_definite_in_secondary_axis_with_fully_definite_negative.rs @@ -26,11 +26,11 @@ fn grid_placement_definite_in_secondary_axis_with_fully_definite_negative() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_relative_all_sides.rs b/tests/generated/grid_relative_all_sides.rs index 49a687c56..e980f92db 100644 --- a/tests/generated/grid_relative_all_sides.rs +++ b/tests/generated/grid_relative_all_sides.rs @@ -5,12 +5,12 @@ fn grid_relative_all_sides() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(40f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(40f32), height: auto() }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -20,8 +20,8 @@ fn grid_relative_all_sides() { taffy::style::Style { display: taffy::style::Display::Grid, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/grid_relayout_vertical_text.rs b/tests/generated/grid_relayout_vertical_text.rs index 1ce1d8abd..8f59b4a54 100644 --- a/tests/generated/grid_relayout_vertical_text.rs +++ b/tests/generated/grid_relayout_vertical_text.rs @@ -37,7 +37,7 @@ fn grid_relayout_vertical_text() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content()], ..Default::default() }, diff --git a/tests/generated/grid_repeat_integer.rs b/tests/generated/grid_repeat_integer.rs index 018d0c3f2..5f8341875 100644 --- a/tests/generated/grid_repeat_integer.rs +++ b/tests/generated/grid_repeat_integer.rs @@ -16,11 +16,11 @@ fn grid_repeat_integer() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![repeat(GridTrackRepetition::Count(3u16), vec![points(40f32)])], - grid_template_columns: vec![repeat(GridTrackRepetition::Count(3u16), vec![points(40f32)])], + grid_template_rows: vec![repeat(GridTrackRepetition::Count(3u16), vec![length(40f32)])], + grid_template_columns: vec![repeat(GridTrackRepetition::Count(3u16), vec![length(40f32)])], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_repeat_mixed.rs b/tests/generated/grid_repeat_mixed.rs index bdd7e4453..38da44ce6 100644 --- a/tests/generated/grid_repeat_mixed.rs +++ b/tests/generated/grid_repeat_mixed.rs @@ -17,18 +17,18 @@ fn grid_repeat_mixed() { taffy::style::Style { display: taffy::style::Display::Grid, grid_template_rows: vec![ - points(40f32), - repeat(GridTrackRepetition::Count(1u16), vec![points(40f32)]), - repeat(GridTrackRepetition::AutoFill, vec![points(40f32)]), + length(40f32), + repeat(GridTrackRepetition::Count(1u16), vec![length(40f32)]), + repeat(GridTrackRepetition::AutoFill, vec![length(40f32)]), ], grid_template_columns: vec![ - points(40f32), - repeat(GridTrackRepetition::Count(1u16), vec![points(40f32)]), - repeat(GridTrackRepetition::AutoFill, vec![points(40f32)]), + length(40f32), + repeat(GridTrackRepetition::Count(1u16), vec![length(40f32)]), + repeat(GridTrackRepetition::AutoFill, vec![length(40f32)]), ], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_size_child_fixed_tracks.rs b/tests/generated/grid_size_child_fixed_tracks.rs index ac9bea485..c719a2c96 100644 --- a/tests/generated/grid_size_child_fixed_tracks.rs +++ b/tests/generated/grid_size_child_fixed_tracks.rs @@ -65,7 +65,7 @@ fn grid_size_child_fixed_tracks() { taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { @@ -85,7 +85,7 @@ fn grid_size_child_fixed_tracks() { taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Start), justify_self: Some(taffy::style::JustifySelf::Start), - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(30f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(30f32), height: auto() }, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { @@ -104,11 +104,11 @@ fn grid_size_child_fixed_tracks() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32), points(40f32)], - grid_template_columns: vec![points(40f32), points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32), length(40f32)], + grid_template_columns: vec![length(40f32), length(40f32), length(40f32)], size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(120f32), - height: taffy::style::Dimension::Points(120f32), + width: taffy::style::Dimension::Length(120f32), + height: taffy::style::Dimension::Length(120f32), }, ..Default::default() }, diff --git a/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite.rs b/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite.rs index efb650848..22c75dc33 100644 --- a/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite.rs +++ b/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite.rs @@ -38,18 +38,18 @@ fn grid_span_13_most_non_flex_with_minmax_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![ min_content(), max_content(), - fit_content(points(20f32)), + fit_content(length(20f32)), auto(), - points(10f32), + length(10f32), percent(0.2f32), - minmax(points(2f32), auto()), - minmax(points(2f32), points(4f32)), - minmax(points(2f32), min_content()), - minmax(points(2f32), max_content()), + minmax(length(2f32), auto()), + minmax(length(2f32), length(4f32)), + minmax(length(2f32), min_content()), + minmax(length(2f32), max_content()), minmax(min_content(), max_content()), minmax(min_content(), auto()), minmax(max_content(), auto()), diff --git a/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs b/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs index 7739a8525..ccbc63c01 100644 --- a/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs +++ b/tests/generated/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs @@ -42,18 +42,18 @@ fn grid_span_13_most_non_flex_with_minmax_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![ min_content(), max_content(), - fit_content(points(20f32)), + fit_content(length(20f32)), auto(), - points(10f32), + length(10f32), percent(0.2f32), - minmax(points(2f32), auto()), - minmax(points(2f32), points(4f32)), - minmax(points(2f32), min_content()), - minmax(points(2f32), max_content()), + minmax(length(2f32), auto()), + minmax(length(2f32), length(4f32)), + minmax(length(2f32), min_content()), + minmax(length(2f32), max_content()), minmax(min_content(), max_content()), minmax(min_content(), auto()), minmax(max_content(), auto()), diff --git a/tests/generated/grid_span_2_max_content_auto_indefinite.rs b/tests/generated/grid_span_2_max_content_auto_indefinite.rs index 73794caf1..6b1b33df9 100644 --- a/tests/generated/grid_span_2_max_content_auto_indefinite.rs +++ b/tests/generated/grid_span_2_max_content_auto_indefinite.rs @@ -40,7 +40,7 @@ fn grid_span_2_max_content_auto_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![max_content(), auto()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_max_content_auto_indefinite_hidden.rs b/tests/generated/grid_span_2_max_content_auto_indefinite_hidden.rs index edce3070c..069c4f44e 100644 --- a/tests/generated/grid_span_2_max_content_auto_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_max_content_auto_indefinite_hidden.rs @@ -21,7 +21,7 @@ fn grid_span_2_max_content_auto_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![max_content(), auto()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite.rs b/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite.rs index da8345076..2affac2db 100644 --- a/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite.rs +++ b/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite.rs @@ -40,8 +40,8 @@ fn grid_span_2_max_content_fit_content_10px_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![max_content(), fit_content(points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![max_content(), fit_content(length(10f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs b/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs index ad7a8f6f1..15d306fa6 100644 --- a/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs @@ -44,8 +44,8 @@ fn grid_span_2_max_content_fit_content_10px_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![max_content(), fit_content(points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![max_content(), fit_content(length(10f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite.rs b/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite.rs index 8733a424c..29b8dbfc8 100644 --- a/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite.rs +++ b/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite.rs @@ -40,8 +40,8 @@ fn grid_span_2_max_content_fit_content_80px_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![max_content(), fit_content(points(80f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![max_content(), fit_content(length(80f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs b/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs index d082db6f2..be012e413 100644 --- a/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs @@ -44,8 +44,8 @@ fn grid_span_2_max_content_fit_content_80px_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![max_content(), fit_content(points(80f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![max_content(), fit_content(length(80f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_max_content_max_content_indefinite.rs b/tests/generated/grid_span_2_max_content_max_content_indefinite.rs index 5b552eb31..3dca84357 100644 --- a/tests/generated/grid_span_2_max_content_max_content_indefinite.rs +++ b/tests/generated/grid_span_2_max_content_max_content_indefinite.rs @@ -40,7 +40,7 @@ fn grid_span_2_max_content_max_content_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![max_content(), max_content()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_min_content_auto_indefinite.rs b/tests/generated/grid_span_2_min_content_auto_indefinite.rs index 92b48d383..df0cfba8a 100644 --- a/tests/generated/grid_span_2_min_content_auto_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_auto_indefinite.rs @@ -27,7 +27,7 @@ fn grid_span_2_min_content_auto_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content(), auto()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_min_content_auto_indefinite_hidden.rs b/tests/generated/grid_span_2_min_content_auto_indefinite_hidden.rs index 16408599c..cb70de737 100644 --- a/tests/generated/grid_span_2_min_content_auto_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_min_content_auto_indefinite_hidden.rs @@ -31,7 +31,7 @@ fn grid_span_2_min_content_auto_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content(), auto()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite.rs b/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite.rs index c2bc2c186..9f873c1b6 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite.rs @@ -40,8 +40,8 @@ fn grid_span_2_min_content_fit_content_10px_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(10f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs b/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs index 15f4a6bc3..e08518290 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs @@ -44,8 +44,8 @@ fn grid_span_2_min_content_fit_content_10px_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(10f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(10f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite.rs b/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite.rs index f7122a055..c7c38f130 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite.rs @@ -40,8 +40,8 @@ fn grid_span_2_min_content_fit_content_30px_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(30f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs b/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs index 2bbcceba0..64c6310f5 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs @@ -44,8 +44,8 @@ fn grid_span_2_min_content_fit_content_30px_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(30f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(30f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite.rs b/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite.rs index 38f16141d..a85aaaec3 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite.rs @@ -40,8 +40,8 @@ fn grid_span_2_min_content_fit_content_80px_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(80f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(80f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs b/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs index 4a4b6f4d7..fb835c26b 100644 --- a/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs +++ b/tests/generated/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs @@ -44,8 +44,8 @@ fn grid_span_2_min_content_fit_content_80px_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], - grid_template_columns: vec![min_content(), fit_content(points(80f32))], + grid_template_rows: vec![length(40f32)], + grid_template_columns: vec![min_content(), fit_content(length(80f32))], ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/grid_span_2_min_content_max_content_indefinite.rs b/tests/generated/grid_span_2_min_content_max_content_indefinite.rs index b4d188bd9..2db3a2a20 100644 --- a/tests/generated/grid_span_2_min_content_max_content_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_max_content_indefinite.rs @@ -40,7 +40,7 @@ fn grid_span_2_min_content_max_content_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content(), max_content()], ..Default::default() }, diff --git a/tests/generated/grid_span_2_min_content_min_content_indefinite.rs b/tests/generated/grid_span_2_min_content_min_content_indefinite.rs index 680546656..e96929685 100644 --- a/tests/generated/grid_span_2_min_content_min_content_indefinite.rs +++ b/tests/generated/grid_span_2_min_content_min_content_indefinite.rs @@ -40,7 +40,7 @@ fn grid_span_2_min_content_min_content_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32)], + grid_template_rows: vec![length(40f32)], grid_template_columns: vec![min_content(), min_content()], ..Default::default() }, diff --git a/tests/generated/grid_span_6_all_non_flex_indefinite.rs b/tests/generated/grid_span_6_all_non_flex_indefinite.rs index 3401c75de..2949ebffb 100644 --- a/tests/generated/grid_span_6_all_non_flex_indefinite.rs +++ b/tests/generated/grid_span_6_all_non_flex_indefinite.rs @@ -31,13 +31,13 @@ fn grid_span_6_all_non_flex_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![ min_content(), max_content(), - fit_content(points(20f32)), + fit_content(length(20f32)), auto(), - points(10f32), + length(10f32), percent(0.2f32), ], ..Default::default() diff --git a/tests/generated/grid_span_6_all_non_flex_indefinite_hidden.rs b/tests/generated/grid_span_6_all_non_flex_indefinite_hidden.rs index 6786332c8..1bd100281 100644 --- a/tests/generated/grid_span_6_all_non_flex_indefinite_hidden.rs +++ b/tests/generated/grid_span_6_all_non_flex_indefinite_hidden.rs @@ -35,13 +35,13 @@ fn grid_span_6_all_non_flex_indefinite_hidden() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![ min_content(), max_content(), - fit_content(points(20f32)), + fit_content(length(20f32)), auto(), - points(10f32), + length(10f32), percent(0.2f32), ], ..Default::default() diff --git a/tests/generated/grid_span_8_all_track_types_indefinite.rs b/tests/generated/grid_span_8_all_track_types_indefinite.rs index eef6a5d01..09f93a707 100644 --- a/tests/generated/grid_span_8_all_track_types_indefinite.rs +++ b/tests/generated/grid_span_8_all_track_types_indefinite.rs @@ -33,13 +33,13 @@ fn grid_span_8_all_track_types_indefinite() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(40f32), points(40f32)], + grid_template_rows: vec![length(40f32), length(40f32)], grid_template_columns: vec![ min_content(), max_content(), - fit_content(points(20f32)), + fit_content(length(20f32)), auto(), - points(10f32), + length(10f32), percent(0.2f32), fr(1f32), fr(2f32), diff --git a/tests/generated/gridflex_kitchen_sink.rs b/tests/generated/gridflex_kitchen_sink.rs index 6a07c7495..4abcc185d 100644 --- a/tests/generated/gridflex_kitchen_sink.rs +++ b/tests/generated/gridflex_kitchen_sink.rs @@ -5,13 +5,13 @@ fn gridflex_kitchen_sink() { let mut taffy = taffy::Taffy::new(); let node000 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); let node00100 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(20f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(20f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -33,7 +33,7 @@ fn gridflex_kitchen_sink() { .new_with_children( taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node0010], diff --git a/tests/generated/gridflex_kitchen_sink_minimise.rs b/tests/generated/gridflex_kitchen_sink_minimise.rs index b8057e439..8ab89ee32 100644 --- a/tests/generated/gridflex_kitchen_sink_minimise.rs +++ b/tests/generated/gridflex_kitchen_sink_minimise.rs @@ -5,7 +5,7 @@ fn gridflex_kitchen_sink_minimise() { let mut taffy = taffy::Taffy::new(); let node00 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,7 +14,7 @@ fn gridflex_kitchen_sink_minimise() { .new_with_children( taffy::style::Style { display: taffy::style::Display::Grid, - grid_template_rows: vec![points(20f32)], + grid_template_rows: vec![length(20f32)], grid_template_columns: vec![fr(1f32), fr(1f32)], ..Default::default() }, diff --git a/tests/generated/gridflex_kitchen_sink_minimise2.rs b/tests/generated/gridflex_kitchen_sink_minimise2.rs index b2eaee0c1..81825ef61 100644 --- a/tests/generated/gridflex_kitchen_sink_minimise2.rs +++ b/tests/generated/gridflex_kitchen_sink_minimise2.rs @@ -6,8 +6,8 @@ fn gridflex_kitchen_sink_minimise2() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -27,7 +27,7 @@ fn gridflex_kitchen_sink_minimise2() { .new_with_children( taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/gridflex_kitchen_sink_minimise3.rs b/tests/generated/gridflex_kitchen_sink_minimise3.rs index 94956784c..b6bd5ab37 100644 --- a/tests/generated/gridflex_kitchen_sink_minimise3.rs +++ b/tests/generated/gridflex_kitchen_sink_minimise3.rs @@ -6,8 +6,8 @@ fn gridflex_kitchen_sink_minimise3() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -29,7 +29,7 @@ fn gridflex_kitchen_sink_minimise3() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/justify_content_column_center.rs b/tests/generated/justify_content_column_center.rs index 90da4fd5f..3c4d887ef 100644 --- a/tests/generated/justify_content_column_center.rs +++ b/tests/generated/justify_content_column_center.rs @@ -5,19 +5,19 @@ fn justify_content_column_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_center() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_column_flex_end.rs b/tests/generated/justify_content_column_flex_end.rs index c2fb74f65..ea608edce 100644 --- a/tests/generated/justify_content_column_flex_end.rs +++ b/tests/generated/justify_content_column_flex_end.rs @@ -5,19 +5,19 @@ fn justify_content_column_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_flex_end() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_column_flex_start.rs b/tests/generated/justify_content_column_flex_start.rs index be3505bf1..594141875 100644 --- a/tests/generated/justify_content_column_flex_start.rs +++ b/tests/generated/justify_content_column_flex_start.rs @@ -5,19 +5,19 @@ fn justify_content_column_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_flex_start() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_column_max_height_and_margin.rs b/tests/generated/justify_content_column_max_height_and_margin.rs index 916d221ad..759dcf4f5 100644 --- a/tests/generated/justify_content_column_max_height_and_margin.rs +++ b/tests/generated/justify_content_column_max_height_and_margin.rs @@ -6,8 +6,8 @@ fn justify_content_column_max_height_and_margin() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -17,12 +17,12 @@ fn justify_content_column_max_height_and_margin() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(80f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(80f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(100f32), + top: taffy::style::LengthPercentageAuto::Length(100f32), bottom: zero(), }, ..Default::default() diff --git a/tests/generated/justify_content_column_min_height_and_margin.rs b/tests/generated/justify_content_column_min_height_and_margin.rs index 323db22df..004aa3cda 100644 --- a/tests/generated/justify_content_column_min_height_and_margin.rs +++ b/tests/generated/justify_content_column_min_height_and_margin.rs @@ -6,8 +6,8 @@ fn justify_content_column_min_height_and_margin() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -17,11 +17,11 @@ fn justify_content_column_min_height_and_margin() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(100f32), + top: taffy::style::LengthPercentageAuto::Length(100f32), bottom: zero(), }, ..Default::default() diff --git a/tests/generated/justify_content_column_min_height_and_margin_bottom.rs b/tests/generated/justify_content_column_min_height_and_margin_bottom.rs index 0854876dd..5b2f766fc 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 @@ -6,14 +6,14 @@ fn justify_content_column_min_height_and_margin_bottom() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: zero(), right: zero(), top: zero(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -23,7 +23,7 @@ fn justify_content_column_min_height_and_margin_bottom() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node0], 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 5bef0fddd..dafac6293 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 @@ -6,13 +6,13 @@ fn justify_content_column_min_height_and_margin_top() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: zero(), }, ..Default::default() @@ -23,7 +23,7 @@ fn justify_content_column_min_height_and_margin_top() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/justify_content_column_space_around.rs b/tests/generated/justify_content_column_space_around.rs index 9ca5b11d7..aca634d7f 100644 --- a/tests/generated/justify_content_column_space_around.rs +++ b/tests/generated/justify_content_column_space_around.rs @@ -5,19 +5,19 @@ fn justify_content_column_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_space_around() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::SpaceAround), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_column_space_between.rs b/tests/generated/justify_content_column_space_between.rs index 7bf72a4f9..e1c90ffbe 100644 --- a/tests/generated/justify_content_column_space_between.rs +++ b/tests/generated/justify_content_column_space_between.rs @@ -5,19 +5,19 @@ fn justify_content_column_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_space_between() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::SpaceBetween), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_column_space_evenly.rs b/tests/generated/justify_content_column_space_evenly.rs index 0b26eb1ff..d41f52044 100644 --- a/tests/generated/justify_content_column_space_evenly.rs +++ b/tests/generated/justify_content_column_space_evenly.rs @@ -5,19 +5,19 @@ fn justify_content_column_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn justify_content_column_space_evenly() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_min_max.rs b/tests/generated/justify_content_min_max.rs index be933fcda..d4329c99b 100644 --- a/tests/generated/justify_content_min_max.rs +++ b/tests/generated/justify_content_min_max.rs @@ -6,8 +6,8 @@ fn justify_content_min_max() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(60f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(60f32), }, ..Default::default() }) @@ -17,9 +17,9 @@ fn justify_content_min_max() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, ..Default::default() }, &[node0], 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 c9c3ee825..0e4e98121 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 @@ -7,8 +7,8 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { .new_leaf(taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(300f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(300f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -18,10 +18,10 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(400f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(100f32), - right: taffy::style::LengthPercentage::Points(100f32), + left: taffy::style::LengthPercentage::Length(100f32), + right: taffy::style::LengthPercentage::Length(100f32), top: zero(), bottom: zero(), }, @@ -42,8 +42,8 @@ fn justify_content_min_width_with_padding_child_width_greater_than_parent() { flex_direction: taffy::style::FlexDirection::Column, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1000f32), - height: taffy::style::Dimension::Points(1584f32), + width: taffy::style::Dimension::Length(1000f32), + height: taffy::style::Dimension::Length(1584f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs b/tests/generated/justify_content_min_width_with_padding_child_width_lower_than_parent.rs index 532444753..a66a006ca 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 @@ -7,8 +7,8 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { .new_leaf(taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(199f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(199f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -18,10 +18,10 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { taffy::style::Style { align_content: Some(taffy::style::AlignContent::Stretch), justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(400f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(400f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(100f32), - right: taffy::style::LengthPercentage::Points(100f32), + left: taffy::style::LengthPercentage::Length(100f32), + right: taffy::style::LengthPercentage::Length(100f32), top: zero(), bottom: zero(), }, @@ -42,8 +42,8 @@ fn justify_content_min_width_with_padding_child_width_lower_than_parent() { flex_direction: taffy::style::FlexDirection::Column, align_content: Some(taffy::style::AlignContent::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1080f32), - height: taffy::style::Dimension::Points(1584f32), + width: taffy::style::Dimension::Length(1080f32), + height: taffy::style::Dimension::Length(1584f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_overflow_min_max.rs b/tests/generated/justify_content_overflow_min_max.rs index 2c8e56a93..e8980efac 100644 --- a/tests/generated/justify_content_overflow_min_max.rs +++ b/tests/generated/justify_content_overflow_min_max.rs @@ -7,8 +7,8 @@ fn justify_content_overflow_min_max() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn justify_content_overflow_min_max() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -27,8 +27,8 @@ fn justify_content_overflow_min_max() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -38,8 +38,8 @@ fn justify_content_overflow_min_max() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(110f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(110f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/justify_content_row_center.rs b/tests/generated/justify_content_row_center.rs index 0d7b20aae..1f3d05e21 100644 --- a/tests/generated/justify_content_row_center.rs +++ b/tests/generated/justify_content_row_center.rs @@ -5,19 +5,19 @@ fn justify_content_row_center() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_center() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_flex_end.rs b/tests/generated/justify_content_row_flex_end.rs index fee008479..9c649b662 100644 --- a/tests/generated/justify_content_row_flex_end.rs +++ b/tests/generated/justify_content_row_flex_end.rs @@ -5,19 +5,19 @@ fn justify_content_row_flex_end() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_flex_end() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_flex_start.rs b/tests/generated/justify_content_row_flex_start.rs index 076eda8ae..73f4d0a27 100644 --- a/tests/generated/justify_content_row_flex_start.rs +++ b/tests/generated/justify_content_row_flex_start.rs @@ -5,19 +5,19 @@ fn justify_content_row_flex_start() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_flex_start() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_max_width_and_margin.rs b/tests/generated/justify_content_row_max_width_and_margin.rs index ad0c1d5e6..d18ac2023 100644 --- a/tests/generated/justify_content_row_max_width_and_margin.rs +++ b/tests/generated/justify_content_row_max_width_and_margin.rs @@ -6,11 +6,11 @@ fn justify_content_row_max_width_and_margin() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(100f32), + left: taffy::style::LengthPercentageAuto::Length(100f32), right: zero(), top: zero(), bottom: zero(), @@ -22,8 +22,8 @@ fn justify_content_row_max_width_and_margin() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(80f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(80f32), height: auto() }, ..Default::default() }, &[node0], 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 93b433307..a271eed75 100644 --- a/tests/generated/justify_content_row_min_width_and_margin.rs +++ b/tests/generated/justify_content_row_min_width_and_margin.rs @@ -6,11 +6,11 @@ fn justify_content_row_min_width_and_margin() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: zero(), top: zero(), bottom: zero(), @@ -22,7 +22,7 @@ fn justify_content_row_min_width_and_margin() { .new_with_children( taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/justify_content_row_space_around.rs b/tests/generated/justify_content_row_space_around.rs index 855d8e767..695e94f4d 100644 --- a/tests/generated/justify_content_row_space_around.rs +++ b/tests/generated/justify_content_row_space_around.rs @@ -5,19 +5,19 @@ fn justify_content_row_space_around() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_space_around() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceAround), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_space_between.rs b/tests/generated/justify_content_row_space_between.rs index 4583b10f0..3ba5e955d 100644 --- a/tests/generated/justify_content_row_space_between.rs +++ b/tests/generated/justify_content_row_space_between.rs @@ -5,19 +5,19 @@ fn justify_content_row_space_between() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_space_between() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceBetween), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/justify_content_row_space_evenly.rs b/tests/generated/justify_content_row_space_evenly.rs index b3f87bd50..16d783b12 100644 --- a/tests/generated/justify_content_row_space_evenly.rs +++ b/tests/generated/justify_content_row_space_evenly.rs @@ -5,19 +5,19 @@ fn justify_content_row_space_evenly() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -26,8 +26,8 @@ fn justify_content_row_space_evenly() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::SpaceEvenly), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/leaf_padding_border_overrides_max_size.rs b/tests/generated/leaf_padding_border_overrides_max_size.rs index cc112124e..6cd76533d 100644 --- a/tests/generated/leaf_padding_border_overrides_max_size.rs +++ b/tests/generated/leaf_padding_border_overrides_max_size.rs @@ -6,20 +6,20 @@ fn leaf_padding_border_overrides_max_size() { let node = taffy .new_leaf(taffy::style::Style { max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/leaf_padding_border_overrides_min_size.rs b/tests/generated/leaf_padding_border_overrides_min_size.rs index c181fdb4f..af01e10ec 100644 --- a/tests/generated/leaf_padding_border_overrides_min_size.rs +++ b/tests/generated/leaf_padding_border_overrides_min_size.rs @@ -6,20 +6,20 @@ fn leaf_padding_border_overrides_min_size() { let node = taffy .new_leaf(taffy::style::Style { min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(0f32), + width: taffy::style::Dimension::Length(0f32), + height: taffy::style::Dimension::Length(0f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/leaf_padding_border_overrides_size.rs b/tests/generated/leaf_padding_border_overrides_size.rs index 52061fb1c..480615037 100644 --- a/tests/generated/leaf_padding_border_overrides_size.rs +++ b/tests/generated/leaf_padding_border_overrides_size.rs @@ -6,20 +6,20 @@ fn leaf_padding_border_overrides_size() { let node = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/margin_and_flex_column.rs b/tests/generated/margin_and_flex_column.rs index 09ad54947..5c8846b5e 100644 --- a/tests/generated/margin_and_flex_column.rs +++ b/tests/generated/margin_and_flex_column.rs @@ -9,8 +9,8 @@ fn margin_and_flex_column() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -20,8 +20,8 @@ fn margin_and_flex_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_and_flex_row.rs b/tests/generated/margin_and_flex_row.rs index 604c71021..41b14f2e5 100644 --- a/tests/generated/margin_and_flex_row.rs +++ b/tests/generated/margin_and_flex_row.rs @@ -7,8 +7,8 @@ fn margin_and_flex_row() { .new_leaf(taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -19,8 +19,8 @@ fn margin_and_flex_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_and_stretch_column.rs b/tests/generated/margin_and_stretch_column.rs index 0d77d82b8..5adc9957d 100644 --- a/tests/generated/margin_and_stretch_column.rs +++ b/tests/generated/margin_and_stretch_column.rs @@ -7,8 +7,8 @@ fn margin_and_stretch_column() { .new_leaf(taffy::style::Style { flex_grow: 1f32, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), - right: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -20,8 +20,8 @@ fn margin_and_stretch_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_and_stretch_row.rs b/tests/generated/margin_and_stretch_row.rs index 3547012b5..0d27f2831 100644 --- a/tests/generated/margin_and_stretch_row.rs +++ b/tests/generated/margin_and_stretch_row.rs @@ -9,8 +9,8 @@ fn margin_and_stretch_row() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -19,8 +19,8 @@ fn margin_and_stretch_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_bottom.rs b/tests/generated/margin_auto_bottom.rs index f898f3ace..de5fccb3e 100644 --- a/tests/generated/margin_auto_bottom.rs +++ b/tests/generated/margin_auto_bottom.rs @@ -6,8 +6,8 @@ fn margin_auto_bottom() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_bottom() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_bottom() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_bottom_and_top.rs b/tests/generated/margin_auto_bottom_and_top.rs index b8c98aa9a..f3da0f799 100644 --- a/tests/generated/margin_auto_bottom_and_top.rs +++ b/tests/generated/margin_auto_bottom_and_top.rs @@ -6,8 +6,8 @@ fn margin_auto_bottom_and_top() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_bottom_and_top() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_bottom_and_top() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_bottom_and_top_justify_center.rs b/tests/generated/margin_auto_bottom_and_top_justify_center.rs index 738d3e09d..606eff6d8 100644 --- a/tests/generated/margin_auto_bottom_and_top_justify_center.rs +++ b/tests/generated/margin_auto_bottom_and_top_justify_center.rs @@ -6,8 +6,8 @@ fn margin_auto_bottom_and_top_justify_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_bottom_and_top_justify_center() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_bottom_and_top_justify_center() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left.rs b/tests/generated/margin_auto_left.rs index 994e54a03..0700cc9ee 100644 --- a/tests/generated/margin_auto_left.rs +++ b/tests/generated/margin_auto_left.rs @@ -6,8 +6,8 @@ fn margin_auto_left() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -21,8 +21,8 @@ fn margin_auto_left() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_left() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_and_right.rs b/tests/generated/margin_auto_left_and_right.rs index c21be9020..d9d01e6b9 100644 --- a/tests/generated/margin_auto_left_and_right.rs +++ b/tests/generated/margin_auto_left_and_right.rs @@ -6,8 +6,8 @@ fn margin_auto_left_and_right() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -21,8 +21,8 @@ fn margin_auto_left_and_right() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn margin_auto_left_and_right() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_and_right_column.rs b/tests/generated/margin_auto_left_and_right_column.rs index 7f14ab918..aa5fa5346 100644 --- a/tests/generated/margin_auto_left_and_right_column.rs +++ b/tests/generated/margin_auto_left_and_right_column.rs @@ -6,8 +6,8 @@ fn margin_auto_left_and_right_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -21,8 +21,8 @@ fn margin_auto_left_and_right_column() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_left_and_right_column() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_and_right_column_and_center.rs b/tests/generated/margin_auto_left_and_right_column_and_center.rs index 72214745c..7f0770f9b 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 @@ -6,8 +6,8 @@ fn margin_auto_left_and_right_column_and_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -21,8 +21,8 @@ fn margin_auto_left_and_right_column_and_center() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_left_and_right_column_and_center() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_and_right_stretch.rs b/tests/generated/margin_auto_left_and_right_stretch.rs index e95458ec3..dbb84eb41 100644 --- a/tests/generated/margin_auto_left_and_right_stretch.rs +++ b/tests/generated/margin_auto_left_and_right_stretch.rs @@ -6,8 +6,8 @@ fn margin_auto_left_and_right_stretch() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -21,8 +21,8 @@ fn margin_auto_left_and_right_stretch() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_left_and_right_stretch() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_child_bigger_than_parent.rs index c1a7166aa..a7608a4f4 100644 --- a/tests/generated/margin_auto_left_child_bigger_than_parent.rs +++ b/tests/generated/margin_auto_left_child_bigger_than_parent.rs @@ -6,8 +6,8 @@ fn margin_auto_left_child_bigger_than_parent() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(72f32), + height: taffy::style::Dimension::Length(72f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -23,8 +23,8 @@ fn margin_auto_left_child_bigger_than_parent() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(52f32), + height: taffy::style::Dimension::Length(52f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_fix_right_child_bigger_than_parent.rs index e83d5fa09..06e5197ce 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 @@ -6,12 +6,12 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(72f32), + height: taffy::style::Dimension::Length(72f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -23,8 +23,8 @@ fn margin_auto_left_fix_right_child_bigger_than_parent() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(52f32), + height: taffy::style::Dimension::Length(52f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs b/tests/generated/margin_auto_left_right_child_bigger_than_parent.rs index c0081f941..5947c97c3 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 @@ -6,8 +6,8 @@ fn margin_auto_left_right_child_bigger_than_parent() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(72f32), + height: taffy::style::Dimension::Length(72f32), }, margin: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Auto, @@ -23,8 +23,8 @@ fn margin_auto_left_right_child_bigger_than_parent() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(52f32), + height: taffy::style::Dimension::Length(52f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_left_stretching_child.rs b/tests/generated/margin_auto_left_stretching_child.rs index 8f9c5df85..2e3d9e71e 100644 --- a/tests/generated/margin_auto_left_stretching_child.rs +++ b/tests/generated/margin_auto_left_stretching_child.rs @@ -20,8 +20,8 @@ fn margin_auto_left_stretching_child() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn margin_auto_left_stretching_child() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_mutiple_children_column.rs b/tests/generated/margin_auto_mutiple_children_column.rs index b5cb28ce6..09c5e771a 100644 --- a/tests/generated/margin_auto_mutiple_children_column.rs +++ b/tests/generated/margin_auto_mutiple_children_column.rs @@ -6,8 +6,8 @@ fn margin_auto_mutiple_children_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_mutiple_children_column() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -36,8 +36,8 @@ fn margin_auto_mutiple_children_column() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -48,8 +48,8 @@ fn margin_auto_mutiple_children_column() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_mutiple_children_row.rs b/tests/generated/margin_auto_mutiple_children_row.rs index 0c22237ca..7ff9941bd 100644 --- a/tests/generated/margin_auto_mutiple_children_row.rs +++ b/tests/generated/margin_auto_mutiple_children_row.rs @@ -6,8 +6,8 @@ fn margin_auto_mutiple_children_row() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_mutiple_children_row() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -36,8 +36,8 @@ fn margin_auto_mutiple_children_row() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -47,8 +47,8 @@ fn margin_auto_mutiple_children_row() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_right.rs b/tests/generated/margin_auto_right.rs index 794f33888..a57e00da5 100644 --- a/tests/generated/margin_auto_right.rs +++ b/tests/generated/margin_auto_right.rs @@ -6,8 +6,8 @@ fn margin_auto_right() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_right() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_right() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_top.rs b/tests/generated/margin_auto_top.rs index e71cc3c28..b3a9b78c5 100644 --- a/tests/generated/margin_auto_top.rs +++ b/tests/generated/margin_auto_top.rs @@ -6,8 +6,8 @@ fn margin_auto_top() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_top() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,8 +32,8 @@ fn margin_auto_top() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_top_and_bottom_stretch.rs b/tests/generated/margin_auto_top_and_bottom_stretch.rs index 8eee7ae63..786c58960 100644 --- a/tests/generated/margin_auto_top_and_bottom_stretch.rs +++ b/tests/generated/margin_auto_top_and_bottom_stretch.rs @@ -6,8 +6,8 @@ fn margin_auto_top_and_bottom_stretch() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, margin: taffy::geometry::Rect { left: zero(), @@ -21,8 +21,8 @@ fn margin_auto_top_and_bottom_stretch() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn margin_auto_top_and_bottom_stretch() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Stretch), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_auto_top_stretching_child.rs b/tests/generated/margin_auto_top_stretching_child.rs index 840e5884c..4f9b4a4be 100644 --- a/tests/generated/margin_auto_top_stretching_child.rs +++ b/tests/generated/margin_auto_top_stretching_child.rs @@ -20,8 +20,8 @@ fn margin_auto_top_stretching_child() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn margin_auto_top_stretching_child() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/margin_bottom.rs b/tests/generated/margin_bottom.rs index 34fb40079..79b9de164 100644 --- a/tests/generated/margin_bottom.rs +++ b/tests/generated/margin_bottom.rs @@ -5,12 +5,12 @@ fn margin_bottom() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), top: zero(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn margin_bottom() { flex_direction: taffy::style::FlexDirection::Column, justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs b/tests/generated/margin_fix_left_auto_right_child_bigger_than_parent.rs index 9890e64a0..546b1a1e2 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 @@ -6,11 +6,11 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(72f32), - height: taffy::style::Dimension::Points(72f32), + width: taffy::style::Dimension::Length(72f32), + height: taffy::style::Dimension::Length(72f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: taffy::style::LengthPercentageAuto::Auto, top: zero(), bottom: zero(), @@ -23,8 +23,8 @@ fn margin_fix_left_auto_right_child_bigger_than_parent() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(52f32), + height: taffy::style::Dimension::Length(52f32), }, ..Default::default() }, diff --git a/tests/generated/margin_left.rs b/tests/generated/margin_left.rs index 6300fdc97..ccfa05ca8 100644 --- a/tests/generated/margin_left.rs +++ b/tests/generated/margin_left.rs @@ -5,9 +5,9 @@ fn margin_left() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(10f32), + left: taffy::style::LengthPercentageAuto::Length(10f32), right: zero(), top: zero(), bottom: zero(), @@ -19,8 +19,8 @@ fn margin_left() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_right.rs b/tests/generated/margin_right.rs index 71011ba87..c8dc5e64c 100644 --- a/tests/generated/margin_right.rs +++ b/tests/generated/margin_right.rs @@ -5,10 +5,10 @@ fn margin_right() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, margin: taffy::geometry::Rect { left: zero(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -20,8 +20,8 @@ fn margin_right() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_should_not_be_part_of_max_height.rs b/tests/generated/margin_should_not_be_part_of_max_height.rs index 3ed52eacc..c53edf8b0 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 @@ -6,14 +6,14 @@ fn margin_should_not_be_part_of_max_height() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(20f32), + top: taffy::style::LengthPercentageAuto::Length(20f32), bottom: zero(), }, ..Default::default() @@ -23,8 +23,8 @@ fn margin_should_not_be_part_of_max_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: taffy::style::Dimension::Length(250f32), + height: taffy::style::Dimension::Length(250f32), }, ..Default::default() }, diff --git a/tests/generated/margin_should_not_be_part_of_max_width.rs b/tests/generated/margin_should_not_be_part_of_max_width.rs index fb6d39882..ccc296241 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 @@ -6,12 +6,12 @@ fn margin_should_not_be_part_of_max_width() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), right: zero(), top: zero(), bottom: zero(), @@ -23,8 +23,8 @@ fn margin_should_not_be_part_of_max_width() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(250f32), - height: taffy::style::Dimension::Points(250f32), + width: taffy::style::Dimension::Length(250f32), + height: taffy::style::Dimension::Length(250f32), }, ..Default::default() }, diff --git a/tests/generated/margin_top.rs b/tests/generated/margin_top.rs index 20858642d..87d73301b 100644 --- a/tests/generated/margin_top.rs +++ b/tests/generated/margin_top.rs @@ -5,11 +5,11 @@ fn margin_top() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: zero(), }, ..Default::default() @@ -20,8 +20,8 @@ fn margin_top() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_with_sibling_column.rs b/tests/generated/margin_with_sibling_column.rs index 6ec643435..633b11a19 100644 --- a/tests/generated/margin_with_sibling_column.rs +++ b/tests/generated/margin_with_sibling_column.rs @@ -10,7 +10,7 @@ fn margin_with_sibling_column() { left: zero(), right: zero(), top: zero(), - bottom: taffy::style::LengthPercentageAuto::Points(10f32), + bottom: taffy::style::LengthPercentageAuto::Length(10f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn margin_with_sibling_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/margin_with_sibling_row.rs b/tests/generated/margin_with_sibling_row.rs index d2043b15b..3c5d6fc04 100644 --- a/tests/generated/margin_with_sibling_row.rs +++ b/tests/generated/margin_with_sibling_row.rs @@ -8,7 +8,7 @@ fn margin_with_sibling_row() { flex_grow: 1f32, margin: taffy::geometry::Rect { left: zero(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -20,8 +20,8 @@ fn margin_with_sibling_row() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/max_height.rs b/tests/generated/max_height.rs index 4ec92785a..743930728 100644 --- a/tests/generated/max_height.rs +++ b/tests/generated/max_height.rs @@ -5,8 +5,8 @@ fn max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -14,8 +14,8 @@ fn max_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/max_height_overrides_height.rs b/tests/generated/max_height_overrides_height.rs index c72182620..7c2120ce3 100644 --- a/tests/generated/max_height_overrides_height.rs +++ b/tests/generated/max_height_overrides_height.rs @@ -5,8 +5,8 @@ fn max_height_overrides_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/max_height_overrides_height_on_root.rs b/tests/generated/max_height_overrides_height_on_root.rs index 36e0b9209..45c7166fa 100644 --- a/tests/generated/max_height_overrides_height_on_root.rs +++ b/tests/generated/max_height_overrides_height_on_root.rs @@ -5,8 +5,8 @@ fn max_height_overrides_height_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/max_width.rs b/tests/generated/max_width.rs index 5dc245119..347da7fc9 100644 --- a/tests/generated/max_width.rs +++ b/tests/generated/max_width.rs @@ -5,8 +5,8 @@ fn max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -15,8 +15,8 @@ fn max_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/max_width_overrides_width.rs b/tests/generated/max_width_overrides_width.rs index 48dde1b3c..213df31b3 100644 --- a/tests/generated/max_width_overrides_width.rs +++ b/tests/generated/max_width_overrides_width.rs @@ -5,8 +5,8 @@ fn max_width_overrides_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/max_width_overrides_width_on_root.rs b/tests/generated/max_width_overrides_width_on_root.rs index 835a4911f..2f0fe6a56 100644 --- a/tests/generated/max_width_overrides_width_on_root.rs +++ b/tests/generated/max_width_overrides_width_on_root.rs @@ -5,8 +5,8 @@ fn max_width_overrides_width_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/measure_child_absolute.rs b/tests/generated/measure_child_absolute.rs index 5381755ad..b90d4c842 100644 --- a/tests/generated/measure_child_absolute.rs +++ b/tests/generated/measure_child_absolute.rs @@ -22,8 +22,8 @@ fn measure_child_absolute() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/measure_child_constraint.rs b/tests/generated/measure_child_constraint.rs index 71dc5cfb1..88cb3ddb9 100644 --- a/tests/generated/measure_child_constraint.rs +++ b/tests/generated/measure_child_constraint.rs @@ -8,7 +8,7 @@ fn measure_child_constraint() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_child_constraint_padding_parent.rs b/tests/generated/measure_child_constraint_padding_parent.rs index aded49dcd..f12dfd345 100644 --- a/tests/generated/measure_child_constraint_padding_parent.rs +++ b/tests/generated/measure_child_constraint_padding_parent.rs @@ -8,14 +8,14 @@ fn measure_child_constraint_padding_parent() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), height: taffy::style::Dimension::Auto, }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/measure_child_with_flex_grow.rs b/tests/generated/measure_child_with_flex_grow.rs index 7d969b436..4b95b55a6 100644 --- a/tests/generated/measure_child_with_flex_grow.rs +++ b/tests/generated/measure_child_with_flex_grow.rs @@ -6,8 +6,8 @@ fn measure_child_with_flex_grow() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -31,7 +31,7 @@ fn measure_child_with_flex_grow() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_child_with_flex_shrink.rs b/tests/generated/measure_child_with_flex_shrink.rs index 0d512f3c7..705b4e980 100644 --- a/tests/generated/measure_child_with_flex_shrink.rs +++ b/tests/generated/measure_child_with_flex_shrink.rs @@ -6,8 +6,8 @@ fn measure_child_with_flex_shrink() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -31,7 +31,7 @@ fn measure_child_with_flex_shrink() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_child_with_flex_shrink_hidden.rs b/tests/generated/measure_child_with_flex_shrink_hidden.rs index b3a958ad1..7fa7ba0ae 100644 --- a/tests/generated/measure_child_with_flex_shrink_hidden.rs +++ b/tests/generated/measure_child_with_flex_shrink_hidden.rs @@ -6,8 +6,8 @@ fn measure_child_with_flex_shrink_hidden() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn measure_child_with_flex_shrink_hidden() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_child_with_min_size_greater_than_available_space.rs b/tests/generated/measure_child_with_min_size_greater_than_available_space.rs index d737b55db..505f3299a 100644 --- a/tests/generated/measure_child_with_min_size_greater_than_available_space.rs +++ b/tests/generated/measure_child_with_min_size_greater_than_available_space.rs @@ -6,7 +6,7 @@ fn measure_child_with_min_size_greater_than_available_space() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { @@ -26,7 +26,7 @@ fn measure_child_with_min_size_greater_than_available_space() { taffy::style::Style { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/measure_flex_basis_overrides_measure.rs b/tests/generated/measure_flex_basis_overrides_measure.rs index fb69dcb07..50c56930d 100644 --- a/tests/generated/measure_flex_basis_overrides_measure.rs +++ b/tests/generated/measure_flex_basis_overrides_measure.rs @@ -22,8 +22,8 @@ fn measure_flex_basis_overrides_measure() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/measure_height_overrides_measure.rs b/tests/generated/measure_height_overrides_measure.rs index d8afa8db5..24a30e81d 100644 --- a/tests/generated/measure_height_overrides_measure.rs +++ b/tests/generated/measure_height_overrides_measure.rs @@ -6,7 +6,7 @@ fn measure_height_overrides_measure() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(5f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(5f32) }, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { diff --git a/tests/generated/measure_remeasure_child_after_growing.rs b/tests/generated/measure_remeasure_child_after_growing.rs index ebc83c7bb..9be61a920 100644 --- a/tests/generated/measure_remeasure_child_after_growing.rs +++ b/tests/generated/measure_remeasure_child_after_growing.rs @@ -6,8 +6,8 @@ fn measure_remeasure_child_after_growing() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -32,7 +32,7 @@ fn measure_remeasure_child_after_growing() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_remeasure_child_after_shrinking.rs b/tests/generated/measure_remeasure_child_after_shrinking.rs index 07af44c36..b445d05d9 100644 --- a/tests/generated/measure_remeasure_child_after_shrinking.rs +++ b/tests/generated/measure_remeasure_child_after_shrinking.rs @@ -7,8 +7,8 @@ fn measure_remeasure_child_after_shrinking() { .new_leaf(taffy::style::Style { flex_shrink: 0f32, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -33,7 +33,7 @@ fn measure_remeasure_child_after_shrinking() { taffy::style::Style { align_items: Some(taffy::style::AlignItems::Start), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), height: taffy::style::Dimension::Auto, }, ..Default::default() diff --git a/tests/generated/measure_remeasure_child_after_stretching.rs b/tests/generated/measure_remeasure_child_after_stretching.rs index ca56f87ac..3b7a3d9e9 100644 --- a/tests/generated/measure_remeasure_child_after_stretching.rs +++ b/tests/generated/measure_remeasure_child_after_stretching.rs @@ -22,8 +22,8 @@ fn measure_remeasure_child_after_stretching() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/measure_stretch_overrides_measure.rs b/tests/generated/measure_stretch_overrides_measure.rs index b63900018..2b18c8909 100644 --- a/tests/generated/measure_stretch_overrides_measure.rs +++ b/tests/generated/measure_stretch_overrides_measure.rs @@ -6,7 +6,7 @@ fn measure_stretch_overrides_measure() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(5f32), + flex_basis: taffy::style::Dimension::Length(5f32), ..Default::default() }) .unwrap(); @@ -14,7 +14,7 @@ fn measure_stretch_overrides_measure() { .new_leaf_with_measure( taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(5f32), + flex_basis: taffy::style::Dimension::Length(5f32), ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { @@ -33,8 +33,8 @@ fn measure_stretch_overrides_measure() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/measure_width_overrides_measure.rs b/tests/generated/measure_width_overrides_measure.rs index d24dd1043..af3d30259 100644 --- a/tests/generated/measure_width_overrides_measure.rs +++ b/tests/generated/measure_width_overrides_measure.rs @@ -6,7 +6,7 @@ fn measure_width_overrides_measure() { let node0 = taffy .new_leaf_with_measure( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { diff --git a/tests/generated/min_height.rs b/tests/generated/min_height.rs index 5c41e34a8..5b2f4d948 100644 --- a/tests/generated/min_height.rs +++ b/tests/generated/min_height.rs @@ -6,7 +6,7 @@ fn min_height() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(60f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(60f32) }, ..Default::default() }) .unwrap(); @@ -16,8 +16,8 @@ fn min_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/min_height_larger_than_height.rs b/tests/generated/min_height_larger_than_height.rs index 639e5baad..4a51b8a64 100644 --- a/tests/generated/min_height_larger_than_height.rs +++ b/tests/generated/min_height_larger_than_height.rs @@ -5,8 +5,8 @@ fn min_height_larger_than_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(25f32) }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(25f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); @@ -14,8 +14,8 @@ fn min_height_larger_than_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/min_height_overrides_height.rs b/tests/generated/min_height_overrides_height.rs index 5cdd0dbba..65060b4d8 100644 --- a/tests/generated/min_height_overrides_height.rs +++ b/tests/generated/min_height_overrides_height.rs @@ -5,8 +5,8 @@ fn min_height_overrides_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/min_height_overrides_height_on_root.rs b/tests/generated/min_height_overrides_height_on_root.rs index 79b3264c4..f2a92537b 100644 --- a/tests/generated/min_height_overrides_height_on_root.rs +++ b/tests/generated/min_height_overrides_height_on_root.rs @@ -5,8 +5,8 @@ fn min_height_overrides_height_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/min_height_overrides_max_height.rs b/tests/generated/min_height_overrides_max_height.rs index df2d90663..9a16f2a7a 100644 --- a/tests/generated/min_height_overrides_max_height.rs +++ b/tests/generated/min_height_overrides_max_height.rs @@ -5,8 +5,8 @@ fn min_height_overrides_max_height() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/min_height_with_nested_fixed_height.rs b/tests/generated/min_height_with_nested_fixed_height.rs index cbd62e123..dfda2503d 100644 --- a/tests/generated/min_height_with_nested_fixed_height.rs +++ b/tests/generated/min_height_with_nested_fixed_height.rs @@ -6,8 +6,8 @@ fn min_height_with_nested_fixed_height() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -18,12 +18,12 @@ fn min_height_with_nested_fixed_height() { flex_direction: taffy::style::FlexDirection::Column, align_self: Some(taffy::style::AlignSelf::FlexStart), flex_shrink: 0f32, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(28f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(28f32) }, margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(8f32), - bottom: taffy::style::LengthPercentageAuto::Points(9f32), + top: taffy::style::LengthPercentageAuto::Length(8f32), + bottom: taffy::style::LengthPercentageAuto::Length(9f32), }, ..Default::default() }, @@ -33,11 +33,11 @@ fn min_height_with_nested_fixed_height() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(320f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(44f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(320f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(44f32) }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(16f32), - right: taffy::style::LengthPercentage::Points(16f32), + left: taffy::style::LengthPercentage::Length(16f32), + right: taffy::style::LengthPercentage::Length(16f32), top: zero(), bottom: zero(), }, diff --git a/tests/generated/min_max_percent_different_width_height.rs b/tests/generated/min_max_percent_different_width_height.rs index 6ad2060ef..585a10991 100644 --- a/tests/generated/min_max_percent_different_width_height.rs +++ b/tests/generated/min_max_percent_different_width_height.rs @@ -34,8 +34,8 @@ fn min_max_percent_different_width_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/min_max_percent_no_width_height.rs b/tests/generated/min_max_percent_no_width_height.rs index 8977ccea9..220eeaf41 100644 --- a/tests/generated/min_max_percent_no_width_height.rs +++ b/tests/generated/min_max_percent_no_width_height.rs @@ -22,8 +22,8 @@ fn min_max_percent_no_width_height() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/min_width.rs b/tests/generated/min_width.rs index 8512ff9c6..58fa12bd2 100644 --- a/tests/generated/min_width.rs +++ b/tests/generated/min_width.rs @@ -6,7 +6,7 @@ fn min_width() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -15,8 +15,8 @@ fn min_width() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/min_width_larger_than_width.rs b/tests/generated/min_width_larger_than_width.rs index 05e8e10bc..11f4e29f0 100644 --- a/tests/generated/min_width_larger_than_width.rs +++ b/tests/generated/min_width_larger_than_width.rs @@ -5,8 +5,8 @@ fn min_width_larger_than_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(25f32), height: auto() }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(25f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -15,8 +15,8 @@ fn min_width_larger_than_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/min_width_overrides_max_width.rs b/tests/generated/min_width_overrides_max_width.rs index 829a547a0..2abe32e85 100644 --- a/tests/generated/min_width_overrides_max_width.rs +++ b/tests/generated/min_width_overrides_max_width.rs @@ -5,8 +5,8 @@ fn min_width_overrides_max_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/min_width_overrides_width.rs b/tests/generated/min_width_overrides_width.rs index 9bfc6d026..1312f14f7 100644 --- a/tests/generated/min_width_overrides_width.rs +++ b/tests/generated/min_width_overrides_width.rs @@ -5,8 +5,8 @@ fn min_width_overrides_width() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/min_width_overrides_width_on_root.rs b/tests/generated/min_width_overrides_width_on_root.rs index 1cf7fbe53..2cc14915c 100644 --- a/tests/generated/min_width_overrides_width_on_root.rs +++ b/tests/generated/min_width_overrides_width_on_root.rs @@ -5,8 +5,8 @@ fn min_width_overrides_width_on_root() { let mut taffy = taffy::Taffy::new(); let node = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(50f32), height: auto() }, - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(50f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); diff --git a/tests/generated/nested_overflowing_child.rs b/tests/generated/nested_overflowing_child.rs index 6f1553203..6eb9664a3 100644 --- a/tests/generated/nested_overflowing_child.rs +++ b/tests/generated/nested_overflowing_child.rs @@ -6,8 +6,8 @@ fn nested_overflowing_child() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }) @@ -17,8 +17,8 @@ fn nested_overflowing_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/nested_overflowing_child_in_constraint_parent.rs b/tests/generated/nested_overflowing_child_in_constraint_parent.rs index f60b75a7e..5b80d4192 100644 --- a/tests/generated/nested_overflowing_child_in_constraint_parent.rs +++ b/tests/generated/nested_overflowing_child_in_constraint_parent.rs @@ -6,8 +6,8 @@ fn nested_overflowing_child_in_constraint_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn nested_overflowing_child_in_constraint_parent() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, @@ -28,8 +28,8 @@ fn nested_overflowing_child_in_constraint_parent() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/only_shrinkable_item_with_flex_basis_zero.rs b/tests/generated/only_shrinkable_item_with_flex_basis_zero.rs index ff94e82e3..e7828ef09 100644 --- a/tests/generated/only_shrinkable_item_with_flex_basis_zero.rs +++ b/tests/generated/only_shrinkable_item_with_flex_basis_zero.rs @@ -6,19 +6,19 @@ fn only_shrinkable_item_with_flex_basis_zero() { let node0 = taffy .new_leaf(taffy::style::Style { flex_shrink: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(93f32), + flex_basis: taffy::style::Dimension::Length(93f32), margin: taffy::geometry::Rect { left: zero(), right: zero(), top: zero(), - bottom: taffy::style::LengthPercentageAuto::Points(6f32), + bottom: taffy::style::LengthPercentageAuto::Length(6f32), }, ..Default::default() }) @@ -26,7 +26,7 @@ fn only_shrinkable_item_with_flex_basis_zero() { let node2 = taffy .new_leaf(taffy::style::Style { flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(764f32), + flex_basis: taffy::style::Dimension::Length(764f32), ..Default::default() }) .unwrap(); @@ -34,8 +34,8 @@ fn only_shrinkable_item_with_flex_basis_zero() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(480f32), height: auto() }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(764f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(480f32), height: auto() }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(764f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/overflow_cross_axis.rs b/tests/generated/overflow_cross_axis.rs index 2e02368b5..b6371d1df 100644 --- a/tests/generated/overflow_cross_axis.rs +++ b/tests/generated/overflow_cross_axis.rs @@ -6,8 +6,8 @@ fn overflow_cross_axis() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn overflow_cross_axis() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/overflow_main_axis.rs b/tests/generated/overflow_main_axis.rs index 98a822545..e86bfbec5 100644 --- a/tests/generated/overflow_main_axis.rs +++ b/tests/generated/overflow_main_axis.rs @@ -6,7 +6,7 @@ fn overflow_main_axis() { let node0 = taffy .new_leaf(taffy::style::Style { flex_shrink: 0f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,8 +14,8 @@ fn overflow_main_axis() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/overflow_main_axis_shrink_hidden.rs b/tests/generated/overflow_main_axis_shrink_hidden.rs index cac2070cf..31a8daab3 100644 --- a/tests/generated/overflow_main_axis_shrink_hidden.rs +++ b/tests/generated/overflow_main_axis_shrink_hidden.rs @@ -29,8 +29,8 @@ fn overflow_main_axis_shrink_hidden() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/overflow_main_axis_shrink_visible.rs b/tests/generated/overflow_main_axis_shrink_visible.rs index fdf9abfe9..2fe4be6b1 100644 --- a/tests/generated/overflow_main_axis_shrink_visible.rs +++ b/tests/generated/overflow_main_axis_shrink_visible.rs @@ -22,8 +22,8 @@ fn overflow_main_axis_shrink_visible() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/padding_align_end_child.rs b/tests/generated/padding_align_end_child.rs index 7561c2158..813481041 100644 --- a/tests/generated/padding_align_end_child.rs +++ b/tests/generated/padding_align_end_child.rs @@ -6,14 +6,14 @@ fn padding_align_end_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(20f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(20f32), - bottom: taffy::style::LengthPercentage::Points(20f32), + left: taffy::style::LengthPercentage::Length(20f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(20f32), + bottom: taffy::style::LengthPercentage::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn padding_align_end_child() { align_items: Some(taffy::style::AlignItems::FlexEnd), justify_content: Some(taffy::style::JustifyContent::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/padding_border_overrides_max_size.rs b/tests/generated/padding_border_overrides_max_size.rs index 30da93e0d..0bb77ea9a 100644 --- a/tests/generated/padding_border_overrides_max_size.rs +++ b/tests/generated/padding_border_overrides_max_size.rs @@ -6,20 +6,20 @@ fn padding_border_overrides_max_size() { let node0 = taffy .new_leaf(taffy::style::Style { max_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/padding_border_overrides_min_size.rs b/tests/generated/padding_border_overrides_min_size.rs index a11528cee..df7d88d6c 100644 --- a/tests/generated/padding_border_overrides_min_size.rs +++ b/tests/generated/padding_border_overrides_min_size.rs @@ -6,20 +6,20 @@ fn padding_border_overrides_min_size() { let node0 = taffy .new_leaf(taffy::style::Style { min_size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(0f32), - height: taffy::style::Dimension::Points(0f32), + width: taffy::style::Dimension::Length(0f32), + height: taffy::style::Dimension::Length(0f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/padding_border_overrides_size.rs b/tests/generated/padding_border_overrides_size.rs index 6170689f4..c09efda08 100644 --- a/tests/generated/padding_border_overrides_size.rs +++ b/tests/generated/padding_border_overrides_size.rs @@ -6,20 +6,20 @@ fn padding_border_overrides_size() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) diff --git a/tests/generated/padding_border_overrides_size_flex_basis_0.rs b/tests/generated/padding_border_overrides_size_flex_basis_0.rs index 92b091d8e..a1a3716de 100644 --- a/tests/generated/padding_border_overrides_size_flex_basis_0.rs +++ b/tests/generated/padding_border_overrides_size_flex_basis_0.rs @@ -5,32 +5,32 @@ fn padding_border_overrides_size_flex_basis_0() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, ..Default::default() }) diff --git a/tests/generated/padding_border_overrides_size_flex_basis_0_growable.rs b/tests/generated/padding_border_overrides_size_flex_basis_0_growable.rs index 3e0748984..9c5f57ef8 100644 --- a/tests/generated/padding_border_overrides_size_flex_basis_0_growable.rs +++ b/tests/generated/padding_border_overrides_size_flex_basis_0_growable.rs @@ -6,22 +6,22 @@ fn padding_border_overrides_size_flex_basis_0_growable() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(8f32), - right: taffy::style::LengthPercentage::Points(4f32), - top: taffy::style::LengthPercentage::Points(2f32), - bottom: taffy::style::LengthPercentage::Points(6f32), + left: taffy::style::LengthPercentage::Length(8f32), + right: taffy::style::LengthPercentage::Length(4f32), + top: taffy::style::LengthPercentage::Length(2f32), + bottom: taffy::style::LengthPercentage::Length(6f32), }, border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(7f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(1f32), - bottom: taffy::style::LengthPercentage::Points(5f32), + left: taffy::style::LengthPercentage::Length(7f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(1f32), + bottom: taffy::style::LengthPercentage::Length(5f32), }, ..Default::default() }) @@ -29,10 +29,10 @@ fn padding_border_overrides_size_flex_basis_0_growable() { let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0f32), + flex_basis: taffy::style::Dimension::Length(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(12f32), - height: taffy::style::Dimension::Points(12f32), + width: taffy::style::Dimension::Length(12f32), + height: taffy::style::Dimension::Length(12f32), }, ..Default::default() }) diff --git a/tests/generated/padding_center_child.rs b/tests/generated/padding_center_child.rs index 717a6a071..18a389ae7 100644 --- a/tests/generated/padding_center_child.rs +++ b/tests/generated/padding_center_child.rs @@ -6,8 +6,8 @@ fn padding_center_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -18,14 +18,14 @@ fn padding_center_child() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(20f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(20f32), }, ..Default::default() }, diff --git a/tests/generated/padding_container_match_child.rs b/tests/generated/padding_container_match_child.rs index 5463418ad..62da5ecfa 100644 --- a/tests/generated/padding_container_match_child.rs +++ b/tests/generated/padding_container_match_child.rs @@ -6,8 +6,8 @@ fn padding_container_match_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -17,10 +17,10 @@ fn padding_container_match_child() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/padding_flex_child.rs b/tests/generated/padding_flex_child.rs index 333474542..4b4ff0d6b 100644 --- a/tests/generated/padding_flex_child.rs +++ b/tests/generated/padding_flex_child.rs @@ -6,7 +6,7 @@ fn padding_flex_child() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,14 +14,14 @@ fn padding_flex_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/padding_no_child.rs b/tests/generated/padding_no_child.rs index 6e5481194..b09a5101c 100644 --- a/tests/generated/padding_no_child.rs +++ b/tests/generated/padding_no_child.rs @@ -6,10 +6,10 @@ fn padding_no_child() { let node = taffy .new_leaf(taffy::style::Style { padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) diff --git a/tests/generated/padding_no_size.rs b/tests/generated/padding_no_size.rs index 6353703f3..e790f019c 100644 --- a/tests/generated/padding_no_size.rs +++ b/tests/generated/padding_no_size.rs @@ -6,10 +6,10 @@ fn padding_no_size() { let node = taffy .new_leaf(taffy::style::Style { padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }) diff --git a/tests/generated/padding_stretch_child.rs b/tests/generated/padding_stretch_child.rs index 1bfbfce44..7144f8e50 100644 --- a/tests/generated/padding_stretch_child.rs +++ b/tests/generated/padding_stretch_child.rs @@ -5,7 +5,7 @@ fn padding_stretch_child() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -13,14 +13,14 @@ fn padding_stretch_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/parent_wrap_child_size_overflowing_parent.rs b/tests/generated/parent_wrap_child_size_overflowing_parent.rs index f68045212..33be1e58f 100644 --- a/tests/generated/parent_wrap_child_size_overflowing_parent.rs +++ b/tests/generated/parent_wrap_child_size_overflowing_parent.rs @@ -6,8 +6,8 @@ fn parent_wrap_child_size_overflowing_parent() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }) @@ -15,7 +15,7 @@ fn parent_wrap_child_size_overflowing_parent() { let node0 = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node00], @@ -25,8 +25,8 @@ fn parent_wrap_child_size_overflowing_parent() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/percent_absolute_position.rs b/tests/generated/percent_absolute_position.rs index f83e4da4e..f151b30a9 100644 --- a/tests/generated/percent_absolute_position.rs +++ b/tests/generated/percent_absolute_position.rs @@ -21,7 +21,7 @@ fn percent_absolute_position() { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(50f32), + height: taffy::style::Dimension::Length(50f32), }, inset: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.5f32), @@ -39,8 +39,8 @@ fn percent_absolute_position() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(60f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(60f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }, diff --git a/tests/generated/percent_within_flex_grow.rs b/tests/generated/percent_within_flex_grow.rs index 56b70e0d6..83d9e2cf3 100644 --- a/tests/generated/percent_within_flex_grow.rs +++ b/tests/generated/percent_within_flex_grow.rs @@ -5,7 +5,7 @@ fn percent_within_flex_grow() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -27,7 +27,7 @@ fn percent_within_flex_grow() { .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -35,8 +35,8 @@ fn percent_within_flex_grow() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(350f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(350f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_absolute_position.rs b/tests/generated/percentage_absolute_position.rs index cfdbff16a..aa0aa429d 100644 --- a/tests/generated/percentage_absolute_position.rs +++ b/tests/generated/percentage_absolute_position.rs @@ -7,8 +7,8 @@ fn percentage_absolute_position() { .new_leaf(taffy::style::Style { position: taffy::style::Position::Absolute, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, inset: taffy::geometry::Rect { left: taffy::style::LengthPercentageAuto::Percent(0.3f32), @@ -24,8 +24,8 @@ fn percentage_absolute_position() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_container_in_wrapping_container.rs b/tests/generated/percentage_container_in_wrapping_container.rs index 48d98b5e9..026edf05b 100644 --- a/tests/generated/percentage_container_in_wrapping_container.rs +++ b/tests/generated/percentage_container_in_wrapping_container.rs @@ -6,8 +6,8 @@ fn percentage_container_in_wrapping_container() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn percentage_container_in_wrapping_container() { let node001 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(50f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(50f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -44,8 +44,8 @@ fn percentage_container_in_wrapping_container() { align_items: Some(taffy::style::AlignItems::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_different_width_height.rs b/tests/generated/percentage_different_width_height.rs index 65b804a26..e04c377d3 100644 --- a/tests/generated/percentage_different_width_height.rs +++ b/tests/generated/percentage_different_width_height.rs @@ -20,8 +20,8 @@ fn percentage_different_width_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_different_width_height_column.rs b/tests/generated/percentage_different_width_height_column.rs index b353b3b4f..dbd0f9eeb 100644 --- a/tests/generated/percentage_different_width_height_column.rs +++ b/tests/generated/percentage_different_width_height_column.rs @@ -15,8 +15,8 @@ fn percentage_different_width_height_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(300f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(300f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis.rs b/tests/generated/percentage_flex_basis.rs index 29cce6262..86ed7e628 100644 --- a/tests/generated/percentage_flex_basis.rs +++ b/tests/generated/percentage_flex_basis.rs @@ -21,8 +21,8 @@ fn percentage_flex_basis() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_cross.rs b/tests/generated/percentage_flex_basis_cross.rs index 633ad65c5..222b982a5 100644 --- a/tests/generated/percentage_flex_basis_cross.rs +++ b/tests/generated/percentage_flex_basis_cross.rs @@ -22,8 +22,8 @@ fn percentage_flex_basis_cross() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_cross_max_height.rs b/tests/generated/percentage_flex_basis_cross_max_height.rs index d7231219a..35c18b103 100644 --- a/tests/generated/percentage_flex_basis_cross_max_height.rs +++ b/tests/generated/percentage_flex_basis_cross_max_height.rs @@ -24,8 +24,8 @@ fn percentage_flex_basis_cross_max_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_cross_max_width.rs b/tests/generated/percentage_flex_basis_cross_max_width.rs index 4907fbe5d..9ac1171a6 100644 --- a/tests/generated/percentage_flex_basis_cross_max_width.rs +++ b/tests/generated/percentage_flex_basis_cross_max_width.rs @@ -24,8 +24,8 @@ fn percentage_flex_basis_cross_max_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_cross_min_height.rs b/tests/generated/percentage_flex_basis_cross_min_height.rs index 4b3f119be..2746b3930 100644 --- a/tests/generated/percentage_flex_basis_cross_min_height.rs +++ b/tests/generated/percentage_flex_basis_cross_min_height.rs @@ -22,8 +22,8 @@ fn percentage_flex_basis_cross_min_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_cross_min_width.rs b/tests/generated/percentage_flex_basis_cross_min_width.rs index 5679f17bd..30e3a1959 100644 --- a/tests/generated/percentage_flex_basis_cross_min_width.rs +++ b/tests/generated/percentage_flex_basis_cross_min_width.rs @@ -24,8 +24,8 @@ fn percentage_flex_basis_cross_min_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_main_max_height.rs b/tests/generated/percentage_flex_basis_main_max_height.rs index c612f5b59..45b7d2ca8 100644 --- a/tests/generated/percentage_flex_basis_main_max_height.rs +++ b/tests/generated/percentage_flex_basis_main_max_height.rs @@ -23,8 +23,8 @@ fn percentage_flex_basis_main_max_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_main_max_width.rs b/tests/generated/percentage_flex_basis_main_max_width.rs index fffd43e7a..dd5a57342 100644 --- a/tests/generated/percentage_flex_basis_main_max_width.rs +++ b/tests/generated/percentage_flex_basis_main_max_width.rs @@ -23,8 +23,8 @@ fn percentage_flex_basis_main_max_width() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_flex_basis_main_min_width.rs b/tests/generated/percentage_flex_basis_main_min_width.rs index a05816cbb..0c390587a 100644 --- a/tests/generated/percentage_flex_basis_main_min_width.rs +++ b/tests/generated/percentage_flex_basis_main_min_width.rs @@ -23,8 +23,8 @@ fn percentage_flex_basis_main_min_width() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_main_max_height.rs b/tests/generated/percentage_main_max_height.rs index f101bf4c0..04cc31f0b 100644 --- a/tests/generated/percentage_main_max_height.rs +++ b/tests/generated/percentage_main_max_height.rs @@ -4,11 +4,11 @@ fn percentage_main_max_height() { use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); let node00 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(15f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(15f32), ..Default::default() }) .unwrap(); let node01 = taffy .new_leaf(taffy::style::Style { - flex_basis: taffy::style::Dimension::Points(48f32), + flex_basis: taffy::style::Dimension::Length(48f32), max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Percent(0.33f32) }, ..Default::default() }) @@ -18,7 +18,7 @@ fn percentage_main_max_height() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::FlexStart), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(151f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(151f32) }, ..Default::default() }, &[node00, node01], @@ -28,7 +28,7 @@ fn percentage_main_max_height() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(71f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(71f32), height: auto() }, ..Default::default() }, &[node0], 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 df119fb63..2f5e7b3ef 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 @@ -6,8 +6,8 @@ fn percentage_margin_should_calculate_based_only_on_width() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn percentage_margin_should_calculate_based_only_on_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_moderate_complexity.rs b/tests/generated/percentage_moderate_complexity.rs index f4c464025..6205a306c 100644 --- a/tests/generated/percentage_moderate_complexity.rs +++ b/tests/generated/percentage_moderate_complexity.rs @@ -14,10 +14,10 @@ fn percentage_moderate_complexity() { bottom: taffy::style::LengthPercentageAuto::Percent(0.05f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }) @@ -29,10 +29,10 @@ fn percentage_moderate_complexity() { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { left: taffy::style::LengthPercentage::Percent(0.03f32), @@ -50,12 +50,12 @@ fn percentage_moderate_complexity() { taffy::style::Style { display: taffy::style::Display::Flex, flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_moderate_complexity2.rs b/tests/generated/percentage_moderate_complexity2.rs index caef3a2bb..99507f382 100644 --- a/tests/generated/percentage_moderate_complexity2.rs +++ b/tests/generated/percentage_moderate_complexity2.rs @@ -6,8 +6,8 @@ fn percentage_moderate_complexity2() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn percentage_moderate_complexity2() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs b/tests/generated/percentage_multiple_nested_with_padding_margin_and_percentage_values.rs index 5f68d74b1..5670b4c49 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 @@ -13,10 +13,10 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { bottom: taffy::style::LengthPercentageAuto::Percent(0.05f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }) @@ -27,10 +27,10 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.5f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { left: taffy::style::LengthPercentage::Percent(0.03f32), @@ -51,16 +51,16 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { flex_basis: taffy::style::Dimension::Percent(0.1f32), min_size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(0.6f32), height: auto() }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(5f32), - right: taffy::style::LengthPercentageAuto::Points(5f32), - top: taffy::style::LengthPercentageAuto::Points(5f32), - bottom: taffy::style::LengthPercentageAuto::Points(5f32), + left: taffy::style::LengthPercentageAuto::Length(5f32), + right: taffy::style::LengthPercentageAuto::Length(5f32), + top: taffy::style::LengthPercentageAuto::Length(5f32), + bottom: taffy::style::LengthPercentageAuto::Length(5f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(3f32), - right: taffy::style::LengthPercentage::Points(3f32), - top: taffy::style::LengthPercentage::Points(3f32), - bottom: taffy::style::LengthPercentage::Points(3f32), + left: taffy::style::LengthPercentage::Length(3f32), + right: taffy::style::LengthPercentage::Length(3f32), + top: taffy::style::LengthPercentage::Length(3f32), + bottom: taffy::style::LengthPercentage::Length(3f32), }, ..Default::default() }, @@ -80,8 +80,8 @@ fn percentage_multiple_nested_with_padding_margin_and_percentage_values() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs b/tests/generated/percentage_padding_should_calculate_based_only_on_width.rs index a1b1604dc..dc349c6e0 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 @@ -6,8 +6,8 @@ fn percentage_padding_should_calculate_based_only_on_width() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn percentage_padding_should_calculate_based_only_on_width() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_position_bottom_right.rs b/tests/generated/percentage_position_bottom_right.rs index 4ff4913b3..a9d03ce90 100644 --- a/tests/generated/percentage_position_bottom_right.rs +++ b/tests/generated/percentage_position_bottom_right.rs @@ -22,8 +22,8 @@ fn percentage_position_bottom_right() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_position_left_top.rs b/tests/generated/percentage_position_left_top.rs index 95bee987a..7349ff755 100644 --- a/tests/generated/percentage_position_left_top.rs +++ b/tests/generated/percentage_position_left_top.rs @@ -22,8 +22,8 @@ fn percentage_position_left_top() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(400f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(400f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_size_based_on_parent_inner_size.rs b/tests/generated/percentage_size_based_on_parent_inner_size.rs index 7bad49d86..f303ae2ef 100644 --- a/tests/generated/percentage_size_based_on_parent_inner_size.rs +++ b/tests/generated/percentage_size_based_on_parent_inner_size.rs @@ -17,14 +17,14 @@ fn percentage_size_based_on_parent_inner_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(20f32), - right: taffy::style::LengthPercentage::Points(20f32), - top: taffy::style::LengthPercentage::Points(20f32), - bottom: taffy::style::LengthPercentage::Points(20f32), + left: taffy::style::LengthPercentage::Length(20f32), + right: taffy::style::LengthPercentage::Length(20f32), + top: taffy::style::LengthPercentage::Length(20f32), + bottom: taffy::style::LengthPercentage::Length(20f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_size_of_flex_basis.rs b/tests/generated/percentage_size_of_flex_basis.rs index 933c4b40b..36c0279b9 100644 --- a/tests/generated/percentage_size_of_flex_basis.rs +++ b/tests/generated/percentage_size_of_flex_basis.rs @@ -7,21 +7,21 @@ fn percentage_size_of_flex_basis() { .new_leaf(taffy::style::Style { size: taffy::geometry::Size { width: taffy::style::Dimension::Percent(1f32), - height: taffy::style::Dimension::Points(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) .unwrap(); let node0 = taffy .new_with_children( - taffy::style::Style { flex_basis: taffy::style::Dimension::Points(50f32), ..Default::default() }, + taffy::style::Style { flex_basis: taffy::style::Dimension::Length(50f32), ..Default::default() }, &[node00], ) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0], diff --git a/tests/generated/percentage_sizes_should_not_prevent_flex_shrinking.rs b/tests/generated/percentage_sizes_should_not_prevent_flex_shrinking.rs index 39224bb0a..ab05d9ef6 100644 --- a/tests/generated/percentage_sizes_should_not_prevent_flex_shrinking.rs +++ b/tests/generated/percentage_sizes_should_not_prevent_flex_shrinking.rs @@ -17,8 +17,8 @@ fn percentage_sizes_should_not_prevent_flex_shrinking() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/percentage_width_height.rs b/tests/generated/percentage_width_height.rs index 27ad3a033..92e2d3879 100644 --- a/tests/generated/percentage_width_height.rs +++ b/tests/generated/percentage_width_height.rs @@ -16,8 +16,8 @@ fn percentage_width_height() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(400f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(400f32), }, ..Default::default() }, diff --git a/tests/generated/position_root_with_rtl_should_position_withoutdirection.rs b/tests/generated/position_root_with_rtl_should_position_withoutdirection.rs index 9cd60f0cb..c5d957eea 100644 --- a/tests/generated/position_root_with_rtl_should_position_withoutdirection.rs +++ b/tests/generated/position_root_with_rtl_should_position_withoutdirection.rs @@ -6,11 +6,11 @@ fn position_root_with_rtl_should_position_withoutdirection() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(52f32), - height: taffy::style::Dimension::Points(52f32), + width: taffy::style::Dimension::Length(52f32), + height: taffy::style::Dimension::Length(52f32), }, inset: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(72f32), + left: taffy::style::LengthPercentageAuto::Length(72f32), right: auto(), top: auto(), bottom: auto(), diff --git a/tests/generated/relative_position_should_not_nudge_siblings.rs b/tests/generated/relative_position_should_not_nudge_siblings.rs index 8b04d6479..c0cfe1095 100644 --- a/tests/generated/relative_position_should_not_nudge_siblings.rs +++ b/tests/generated/relative_position_should_not_nudge_siblings.rs @@ -5,11 +5,11 @@ fn relative_position_should_not_nudge_siblings() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(15f32), + top: taffy::style::LengthPercentageAuto::Length(15f32), bottom: auto(), }, ..Default::default() @@ -17,11 +17,11 @@ fn relative_position_should_not_nudge_siblings() { .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(15f32), + top: taffy::style::LengthPercentageAuto::Length(15f32), bottom: auto(), }, ..Default::default() @@ -32,8 +32,8 @@ fn relative_position_should_not_nudge_siblings() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs b/tests/generated/rounding_flex_basis_flex_grow_row_prime_number_width.rs index b3f87570d..4e6056643 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 @@ -12,8 +12,8 @@ fn rounding_flex_basis_flex_grow_row_prime_number_width() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(113f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(113f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs b/tests/generated/rounding_flex_basis_flex_grow_row_width_of_100.rs index bdc6e89c7..ee9a28c81 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 @@ -10,8 +10,8 @@ fn rounding_flex_basis_flex_grow_row_width_of_100() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_flex_basis_flex_shrink_row.rs b/tests/generated/rounding_flex_basis_flex_shrink_row.rs index 29861e591..bc5b58634 100644 --- a/tests/generated/rounding_flex_basis_flex_shrink_row.rs +++ b/tests/generated/rounding_flex_basis_flex_shrink_row.rs @@ -6,22 +6,22 @@ fn rounding_flex_basis_flex_shrink_row() { let node0 = taffy .new_leaf(taffy::style::Style { flex_shrink: 1f32, - flex_basis: taffy::style::Dimension::Points(100f32), + flex_basis: taffy::style::Dimension::Length(100f32), ..Default::default() }) .unwrap(); let node1 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(25f32), ..Default::default() }) .unwrap(); let node2 = taffy - .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Points(25f32), ..Default::default() }) + .new_leaf(taffy::style::Style { flex_basis: taffy::style::Dimension::Length(25f32), ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(101f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(101f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_flex_basis_overrides_main_size.rs b/tests/generated/rounding_flex_basis_overrides_main_size.rs index 7d76cde7f..3e0af8e7b 100644 --- a/tests/generated/rounding_flex_basis_overrides_main_size.rs +++ b/tests/generated/rounding_flex_basis_overrides_main_size.rs @@ -6,22 +6,22 @@ fn rounding_flex_basis_overrides_main_size() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_flex_basis_overrides_main_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(113f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_1.rs b/tests/generated/rounding_fractial_input_1.rs index 55abc9793..b04814083 100644 --- a/tests/generated/rounding_fractial_input_1.rs +++ b/tests/generated/rounding_fractial_input_1.rs @@ -6,22 +6,22 @@ fn rounding_fractial_input_1() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_fractial_input_1() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(113.4f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_2.rs b/tests/generated/rounding_fractial_input_2.rs index 5e9ad5bf6..f21429ce3 100644 --- a/tests/generated/rounding_fractial_input_2.rs +++ b/tests/generated/rounding_fractial_input_2.rs @@ -6,22 +6,22 @@ fn rounding_fractial_input_2() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_fractial_input_2() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.6f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(113.6f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_3.rs b/tests/generated/rounding_fractial_input_3.rs index 91b69f0d3..9acb9fc46 100644 --- a/tests/generated/rounding_fractial_input_3.rs +++ b/tests/generated/rounding_fractial_input_3.rs @@ -6,22 +6,22 @@ fn rounding_fractial_input_3() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_fractial_input_3() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(113.4f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_4.rs b/tests/generated/rounding_fractial_input_4.rs index e293bb5ec..e3e11cc46 100644 --- a/tests/generated/rounding_fractial_input_4.rs +++ b/tests/generated/rounding_fractial_input_4.rs @@ -6,22 +6,22 @@ fn rounding_fractial_input_4() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(50f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20f32) }, + flex_basis: taffy::style::Dimension::Length(50f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_fractial_input_4() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(113.4f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(113.4f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_5.rs b/tests/generated/rounding_fractial_input_5.rs index fe8997475..e118464ea 100644 --- a/tests/generated/rounding_fractial_input_5.rs +++ b/tests/generated/rounding_fractial_input_5.rs @@ -6,8 +6,8 @@ fn rounding_fractial_input_5() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.3f32), - height: taffy::style::Dimension::Points(100.3f32), + width: taffy::style::Dimension::Length(100.3f32), + height: taffy::style::Dimension::Length(100.3f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn rounding_fractial_input_5() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100.3f32), - height: taffy::style::Dimension::Points(100.3f32), + width: taffy::style::Dimension::Length(100.3f32), + height: taffy::style::Dimension::Length(100.3f32), }, ..Default::default() }) @@ -26,8 +26,8 @@ fn rounding_fractial_input_5() { taffy::style::Style { justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(963.333f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(963.333f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_fractial_input_6.rs b/tests/generated/rounding_fractial_input_6.rs index ccc78688a..c90401478 100644 --- a/tests/generated/rounding_fractial_input_6.rs +++ b/tests/generated/rounding_fractial_input_6.rs @@ -6,8 +6,8 @@ fn rounding_fractial_input_6() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(2f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(2f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn rounding_fractial_input_6() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(2f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(2f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -34,8 +34,8 @@ fn rounding_fractial_input_6() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(2f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(2f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -43,8 +43,8 @@ fn rounding_fractial_input_6() { let node11 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(2f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(2f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -62,7 +62,7 @@ fn rounding_fractial_input_6() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(7f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(7f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/rounding_fractial_input_7.rs b/tests/generated/rounding_fractial_input_7.rs index 172b5d042..4b3140d5b 100644 --- a/tests/generated/rounding_fractial_input_7.rs +++ b/tests/generated/rounding_fractial_input_7.rs @@ -6,8 +6,8 @@ fn rounding_fractial_input_7() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn rounding_fractial_input_7() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -34,8 +34,8 @@ fn rounding_fractial_input_7() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -43,8 +43,8 @@ fn rounding_fractial_input_7() { let node11 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -62,8 +62,8 @@ fn rounding_fractial_input_7() { let node20 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -71,8 +71,8 @@ fn rounding_fractial_input_7() { let node21 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -90,8 +90,8 @@ fn rounding_fractial_input_7() { let node30 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -99,8 +99,8 @@ fn rounding_fractial_input_7() { let node31 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(1f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(1f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -118,7 +118,7 @@ fn rounding_fractial_input_7() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(7f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(7f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/rounding_inner_node_controversy_combined.rs b/tests/generated/rounding_inner_node_controversy_combined.rs index 24beb6f25..6be097017 100644 --- a/tests/generated/rounding_inner_node_controversy_combined.rs +++ b/tests/generated/rounding_inner_node_controversy_combined.rs @@ -64,8 +64,8 @@ fn rounding_inner_node_controversy_combined() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(640f32), - height: taffy::style::Dimension::Points(320f32), + width: taffy::style::Dimension::Length(640f32), + height: taffy::style::Dimension::Length(320f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_inner_node_controversy_horizontal.rs b/tests/generated/rounding_inner_node_controversy_horizontal.rs index 12b26c1ac..e9c2dda06 100644 --- a/tests/generated/rounding_inner_node_controversy_horizontal.rs +++ b/tests/generated/rounding_inner_node_controversy_horizontal.rs @@ -6,14 +6,14 @@ fn rounding_inner_node_controversy_horizontal() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node10 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); @@ -22,7 +22,7 @@ fn rounding_inner_node_controversy_horizontal() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }, &[node10], @@ -31,14 +31,14 @@ fn rounding_inner_node_controversy_horizontal() { let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(320f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(320f32), height: auto() }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/rounding_inner_node_controversy_vertical.rs b/tests/generated/rounding_inner_node_controversy_vertical.rs index 1321dc232..518de5174 100644 --- a/tests/generated/rounding_inner_node_controversy_vertical.rs +++ b/tests/generated/rounding_inner_node_controversy_vertical.rs @@ -6,14 +6,14 @@ fn rounding_inner_node_controversy_vertical() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); let node10 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -22,7 +22,7 @@ fn rounding_inner_node_controversy_vertical() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }, &[node10], @@ -31,7 +31,7 @@ fn rounding_inner_node_controversy_vertical() { let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -39,7 +39,7 @@ fn rounding_inner_node_controversy_vertical() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(320f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(320f32) }, ..Default::default() }, &[node0, node1, node2], diff --git a/tests/generated/rounding_total_fractial.rs b/tests/generated/rounding_total_fractial.rs index f65bf3148..a7d299cbf 100644 --- a/tests/generated/rounding_total_fractial.rs +++ b/tests/generated/rounding_total_fractial.rs @@ -6,22 +6,22 @@ fn rounding_total_fractial() { let node0 = taffy .new_leaf(taffy::style::Style { flex_grow: 0.7f32, - flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20.3f32) }, + flex_basis: taffy::style::Dimension::Length(50.3f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20.3f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1.6f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1.1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10.7f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10.7f32) }, ..Default::default() }) .unwrap(); @@ -30,8 +30,8 @@ fn rounding_total_fractial() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: taffy::style::Dimension::Length(87.4f32), + height: taffy::style::Dimension::Length(113.4f32), }, ..Default::default() }, diff --git a/tests/generated/rounding_total_fractial_nested.rs b/tests/generated/rounding_total_fractial_nested.rs index 5a8c9279b..027195c93 100644 --- a/tests/generated/rounding_total_fractial_nested.rs +++ b/tests/generated/rounding_total_fractial_nested.rs @@ -6,13 +6,13 @@ fn rounding_total_fractial_nested() { let node00 = taffy .new_leaf(taffy::style::Style { flex_grow: 1f32, - flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(9.9f32) }, + flex_basis: taffy::style::Dimension::Length(0.3f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(9.9f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), top: auto(), - bottom: taffy::style::LengthPercentageAuto::Points(13.3f32), + bottom: taffy::style::LengthPercentageAuto::Length(13.3f32), }, ..Default::default() }) @@ -20,12 +20,12 @@ fn rounding_total_fractial_nested() { let node01 = taffy .new_leaf(taffy::style::Style { flex_grow: 4f32, - flex_basis: taffy::style::Dimension::Points(0.3f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(1.1f32) }, + flex_basis: taffy::style::Dimension::Length(0.3f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(1.1f32) }, inset: taffy::geometry::Rect { left: auto(), right: auto(), - top: taffy::style::LengthPercentageAuto::Points(13.3f32), + top: taffy::style::LengthPercentageAuto::Length(13.3f32), bottom: auto(), }, ..Default::default() @@ -36,8 +36,8 @@ fn rounding_total_fractial_nested() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 0.7f32, - flex_basis: taffy::style::Dimension::Points(50.3f32), - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(20.3f32) }, + flex_basis: taffy::style::Dimension::Length(50.3f32), + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(20.3f32) }, ..Default::default() }, &[node00, node01], @@ -46,14 +46,14 @@ fn rounding_total_fractial_nested() { let node1 = taffy .new_leaf(taffy::style::Style { flex_grow: 1.6f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10f32) }, ..Default::default() }) .unwrap(); let node2 = taffy .new_leaf(taffy::style::Style { flex_grow: 1.1f32, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(10.7f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(10.7f32) }, ..Default::default() }) .unwrap(); @@ -62,8 +62,8 @@ fn rounding_total_fractial_nested() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(87.4f32), - height: taffy::style::Dimension::Points(113.4f32), + width: taffy::style::Dimension::Length(87.4f32), + height: taffy::style::Dimension::Length(113.4f32), }, ..Default::default() }, diff --git a/tests/generated/simple_child.rs b/tests/generated/simple_child.rs index a208febf4..a27a91c8a 100644 --- a/tests/generated/simple_child.rs +++ b/tests/generated/simple_child.rs @@ -6,8 +6,8 @@ fn simple_child() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -16,8 +16,8 @@ fn simple_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }, @@ -28,8 +28,8 @@ fn simple_child() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -38,8 +38,8 @@ fn simple_child() { .new_leaf(taffy::style::Style { align_self: Some(taffy::style::AlignSelf::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -61,8 +61,8 @@ fn simple_child() { .new_with_children( taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/single_flex_child_after_absolute_child.rs b/tests/generated/single_flex_child_after_absolute_child.rs index bae72e7bd..10193a5ac 100644 --- a/tests/generated/single_flex_child_after_absolute_child.rs +++ b/tests/generated/single_flex_child_after_absolute_child.rs @@ -18,7 +18,7 @@ fn single_flex_child_after_absolute_child() { let node2 = taffy .new_leaf(taffy::style::Style { flex_shrink: 0f32, - flex_basis: taffy::style::Dimension::Points(174f32), + flex_basis: taffy::style::Dimension::Length(174f32), ..Default::default() }) .unwrap(); @@ -27,8 +27,8 @@ fn single_flex_child_after_absolute_child() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(428f32), - height: taffy::style::Dimension::Points(845f32), + width: taffy::style::Dimension::Length(428f32), + height: taffy::style::Dimension::Length(845f32), }, ..Default::default() }, diff --git a/tests/generated/size_defined_by_child.rs b/tests/generated/size_defined_by_child.rs index 05b5c6c45..5113f358a 100644 --- a/tests/generated/size_defined_by_child.rs +++ b/tests/generated/size_defined_by_child.rs @@ -6,8 +6,8 @@ fn size_defined_by_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/size_defined_by_child_with_border.rs b/tests/generated/size_defined_by_child_with_border.rs index 0078aeb2d..4f978bb9e 100644 --- a/tests/generated/size_defined_by_child_with_border.rs +++ b/tests/generated/size_defined_by_child_with_border.rs @@ -6,8 +6,8 @@ fn size_defined_by_child_with_border() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -16,10 +16,10 @@ fn size_defined_by_child_with_border() { .new_with_children( taffy::style::Style { border: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/size_defined_by_child_with_padding.rs b/tests/generated/size_defined_by_child_with_padding.rs index 48a594069..b1dbc55a0 100644 --- a/tests/generated/size_defined_by_child_with_padding.rs +++ b/tests/generated/size_defined_by_child_with_padding.rs @@ -6,8 +6,8 @@ fn size_defined_by_child_with_padding() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(10f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(10f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -16,10 +16,10 @@ fn size_defined_by_child_with_padding() { .new_with_children( taffy::style::Style { padding: taffy::geometry::Rect { - left: taffy::style::LengthPercentage::Points(10f32), - right: taffy::style::LengthPercentage::Points(10f32), - top: taffy::style::LengthPercentage::Points(10f32), - bottom: taffy::style::LengthPercentage::Points(10f32), + left: taffy::style::LengthPercentage::Length(10f32), + right: taffy::style::LengthPercentage::Length(10f32), + top: taffy::style::LengthPercentage::Length(10f32), + bottom: taffy::style::LengthPercentage::Length(10f32), }, ..Default::default() }, diff --git a/tests/generated/size_defined_by_grand_child.rs b/tests/generated/size_defined_by_grand_child.rs index 3a4f95bc3..7ef97dfbb 100644 --- a/tests/generated/size_defined_by_grand_child.rs +++ b/tests/generated/size_defined_by_grand_child.rs @@ -6,8 +6,8 @@ fn size_defined_by_grand_child() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/undefined_height_with_min_max.rs b/tests/generated/undefined_height_with_min_max.rs index 70a5ad5d2..bd535d40b 100644 --- a/tests/generated/undefined_height_with_min_max.rs +++ b/tests/generated/undefined_height_with_min_max.rs @@ -5,8 +5,8 @@ fn undefined_height_with_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(0f32) }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(100f32) }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(0f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(100f32) }, ..Default::default() }) .unwrap(); @@ -14,8 +14,8 @@ fn undefined_height_with_min_max() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(320f32), height: auto() }, - min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(0f32) }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(320f32), height: auto() }, + min_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(0f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/undefined_width_with_min_max.rs b/tests/generated/undefined_width_with_min_max.rs index 2a350d58d..d513e0918 100644 --- a/tests/generated/undefined_width_with_min_max.rs +++ b/tests/generated/undefined_width_with_min_max.rs @@ -5,8 +5,8 @@ fn undefined_width_with_min_max() { let mut taffy = taffy::Taffy::new(); let node0 = taffy .new_leaf(taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }) .unwrap(); @@ -14,7 +14,7 @@ fn undefined_width_with_min_max() { .new_with_children( taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node0], diff --git a/tests/generated/undefined_width_with_min_max_row.rs b/tests/generated/undefined_width_with_min_max_row.rs index 461f0cbb9..cef3d9d4b 100644 --- a/tests/generated/undefined_width_with_min_max_row.rs +++ b/tests/generated/undefined_width_with_min_max_row.rs @@ -6,8 +6,8 @@ fn undefined_width_with_min_max_row() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn undefined_width_with_min_max_row() { let node0 = taffy .new_with_children( taffy::style::Style { - min_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(60f32), height: auto() }, - max_size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), height: auto() }, + min_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(60f32), height: auto() }, + max_size: taffy::geometry::Size { width: taffy::style::Dimension::Length(300f32), height: auto() }, ..Default::default() }, &[node00], @@ -25,7 +25,7 @@ fn undefined_width_with_min_max_row() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(50f32) }, + size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(50f32) }, ..Default::default() }, &[node0], 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 ec959700e..c3004f96b 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 @@ -6,8 +6,8 @@ fn width_smaller_then_content_with_flex_grow_large_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn width_smaller_then_content_with_flex_grow_large_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn width_smaller_then_content_with_flex_grow_large_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_small_size.rs index 7a634115d..3960dcb80 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 @@ -6,8 +6,8 @@ fn width_smaller_then_content_with_flex_grow_small_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn width_smaller_then_content_with_flex_grow_small_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn width_smaller_then_content_with_flex_grow_small_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(10f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(10f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_unconstraint_size.rs index 6ecffb9d4..858f5edb9 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 @@ -6,8 +6,8 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn width_smaller_then_content_with_flex_grow_unconstraint_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node10], diff --git a/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs b/tests/generated/width_smaller_then_content_with_flex_grow_very_large_size.rs index 8265851a0..e1c276ded 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 @@ -6,8 +6,8 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(70f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(70f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -17,7 +17,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node00], @@ -26,8 +26,8 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { let node10 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(20f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(20f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -37,7 +37,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, flex_grow: 1f32, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(0f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(0f32), height: auto() }, ..Default::default() }, &[node10], @@ -46,7 +46,7 @@ fn width_smaller_then_content_with_flex_grow_very_large_size() { let node = taffy .new_with_children( taffy::style::Style { - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(200f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(200f32), height: auto() }, ..Default::default() }, &[node0, node1], diff --git a/tests/generated/wrap_child.rs b/tests/generated/wrap_child.rs index d1f37e32a..6e80abd1b 100644 --- a/tests/generated/wrap_child.rs +++ b/tests/generated/wrap_child.rs @@ -6,8 +6,8 @@ fn wrap_child() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/wrap_column.rs b/tests/generated/wrap_column.rs index 92a427a82..558d30351 100644 --- a/tests/generated/wrap_column.rs +++ b/tests/generated/wrap_column.rs @@ -6,8 +6,8 @@ fn wrap_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(31f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_column() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(32f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_column() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(33f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_column() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(34f32), }, ..Default::default() }) @@ -45,8 +45,8 @@ fn wrap_column() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::Wrap, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/wrap_grandchild.rs b/tests/generated/wrap_grandchild.rs index c7d347e91..34879eee9 100644 --- a/tests/generated/wrap_grandchild.rs +++ b/tests/generated/wrap_grandchild.rs @@ -6,8 +6,8 @@ fn wrap_grandchild() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) diff --git a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs index a11cb4c7a..e626b5b3d 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_margin_cross.rs @@ -6,8 +6,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { let node010 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -34,7 +34,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { margin: taffy::geometry::Rect { left: zero(), right: zero(), - top: taffy::style::LengthPercentageAuto::Points(10f32), + top: taffy::style::LengthPercentageAuto::Length(10f32), bottom: zero(), }, ..Default::default() @@ -46,7 +46,7 @@ fn wrap_nodes_with_content_sizing_margin_cross() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(70f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(70f32), height: auto() }, ..Default::default() }, &[node00, node01], @@ -57,8 +57,8 @@ fn wrap_nodes_with_content_sizing_margin_cross() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs index 7087190b9..41b59df93 100644 --- a/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs +++ b/tests/generated/wrap_nodes_with_content_sizing_overflowing_margin.rs @@ -6,8 +6,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { let node000 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -21,8 +21,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { let node010 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(40f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(40f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -33,7 +33,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { flex_direction: taffy::style::FlexDirection::Column, margin: taffy::geometry::Rect { left: zero(), - right: taffy::style::LengthPercentageAuto::Points(10f32), + right: taffy::style::LengthPercentageAuto::Length(10f32), top: zero(), bottom: zero(), }, @@ -46,7 +46,7 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(85f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(85f32), height: auto() }, ..Default::default() }, &[node00, node01], @@ -57,8 +57,8 @@ fn wrap_nodes_with_content_sizing_overflowing_margin() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(500f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(500f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/wrap_reverse_column.rs b/tests/generated/wrap_reverse_column.rs index 67838417b..73ef17489 100644 --- a/tests/generated/wrap_reverse_column.rs +++ b/tests/generated/wrap_reverse_column.rs @@ -6,8 +6,8 @@ fn wrap_reverse_column() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(31f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(31f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_column() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(32f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(32f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_column() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(33f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(33f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_column() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(34f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(34f32), }, ..Default::default() }) @@ -45,8 +45,8 @@ fn wrap_reverse_column() { flex_direction: taffy::style::FlexDirection::Column, flex_wrap: taffy::style::FlexWrap::WrapReverse, size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/wrap_reverse_column_fixed_size.rs b/tests/generated/wrap_reverse_column_fixed_size.rs index 1c3d12092..08a4ab276 100644 --- a/tests/generated/wrap_reverse_column_fixed_size.rs +++ b/tests/generated/wrap_reverse_column_fixed_size.rs @@ -6,8 +6,8 @@ fn wrap_reverse_column_fixed_size() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_column_fixed_size() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_column_fixed_size() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_column_fixed_size() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_column_fixed_size() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -55,8 +55,8 @@ fn wrap_reverse_column_fixed_size() { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }, diff --git a/tests/generated/wrap_reverse_row.rs b/tests/generated/wrap_reverse_row.rs index 9acf9a51e..6fedc5585 100644 --- a/tests/generated/wrap_reverse_row.rs +++ b/tests/generated/wrap_reverse_row.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(31f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(32f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(33f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(34f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -43,7 +43,7 @@ fn wrap_reverse_row() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_reverse_row_align_content_center.rs b/tests/generated/wrap_reverse_row_align_content_center.rs index 5b1eb5aaf..f95f598ec 100644 --- a/tests/generated/wrap_reverse_row_align_content_center.rs +++ b/tests/generated/wrap_reverse_row_align_content_center.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row_align_content_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row_align_content_center() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row_align_content_center() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row_align_content_center() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_row_align_content_center() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -53,7 +53,7 @@ fn wrap_reverse_row_align_content_center() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: Some(taffy::style::AlignContent::Center), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_flex_start.rs b/tests/generated/wrap_reverse_row_align_content_flex_start.rs index 535be6fd0..833ab4db7 100644 --- a/tests/generated/wrap_reverse_row_align_content_flex_start.rs +++ b/tests/generated/wrap_reverse_row_align_content_flex_start.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row_align_content_flex_start() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row_align_content_flex_start() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row_align_content_flex_start() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row_align_content_flex_start() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_row_align_content_flex_start() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -53,7 +53,7 @@ fn wrap_reverse_row_align_content_flex_start() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: Some(taffy::style::AlignContent::FlexStart), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_space_around.rs b/tests/generated/wrap_reverse_row_align_content_space_around.rs index 54e4c74dc..94f5d5799 100644 --- a/tests/generated/wrap_reverse_row_align_content_space_around.rs +++ b/tests/generated/wrap_reverse_row_align_content_space_around.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row_align_content_space_around() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row_align_content_space_around() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row_align_content_space_around() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row_align_content_space_around() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_row_align_content_space_around() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -53,7 +53,7 @@ fn wrap_reverse_row_align_content_space_around() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: Some(taffy::style::AlignContent::SpaceAround), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_align_content_stretch.rs b/tests/generated/wrap_reverse_row_align_content_stretch.rs index cac347b4b..e35d9869e 100644 --- a/tests/generated/wrap_reverse_row_align_content_stretch.rs +++ b/tests/generated/wrap_reverse_row_align_content_stretch.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row_align_content_stretch() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row_align_content_stretch() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row_align_content_stretch() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row_align_content_stretch() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_row_align_content_stretch() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -53,7 +53,7 @@ fn wrap_reverse_row_align_content_stretch() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: Some(taffy::style::AlignContent::Stretch), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_reverse_row_single_line_different_size.rs b/tests/generated/wrap_reverse_row_single_line_different_size.rs index 7f5f4cc35..0eb98c75c 100644 --- a/tests/generated/wrap_reverse_row_single_line_different_size.rs +++ b/tests/generated/wrap_reverse_row_single_line_different_size.rs @@ -6,8 +6,8 @@ fn wrap_reverse_row_single_line_different_size() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_reverse_row_single_line_different_size() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_reverse_row_single_line_different_size() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_reverse_row_single_line_different_size() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(40f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(40f32), }, ..Default::default() }) @@ -42,8 +42,8 @@ fn wrap_reverse_row_single_line_different_size() { let node4 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(50f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(50f32), }, ..Default::default() }) @@ -53,7 +53,7 @@ fn wrap_reverse_row_single_line_different_size() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::WrapReverse, align_content: Some(taffy::style::AlignContent::FlexStart), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(300f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(300f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3, node4], diff --git a/tests/generated/wrap_row.rs b/tests/generated/wrap_row.rs index 68531f9fc..a3c40ac1f 100644 --- a/tests/generated/wrap_row.rs +++ b/tests/generated/wrap_row.rs @@ -6,8 +6,8 @@ fn wrap_row() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(31f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(31f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_row() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(32f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(32f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_row() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(33f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(33f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_row() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(34f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(34f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -43,7 +43,7 @@ fn wrap_row() { .new_with_children( taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_row_align_items_center.rs b/tests/generated/wrap_row_align_items_center.rs index 60b83f820..4445ef224 100644 --- a/tests/generated/wrap_row_align_items_center.rs +++ b/tests/generated/wrap_row_align_items_center.rs @@ -6,8 +6,8 @@ fn wrap_row_align_items_center() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_row_align_items_center() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_row_align_items_center() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_row_align_items_center() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -44,7 +44,7 @@ fn wrap_row_align_items_center() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::Center), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrap_row_align_items_flex_end.rs b/tests/generated/wrap_row_align_items_flex_end.rs index a90557cfe..78f3a97d9 100644 --- a/tests/generated/wrap_row_align_items_flex_end.rs +++ b/tests/generated/wrap_row_align_items_flex_end.rs @@ -6,8 +6,8 @@ fn wrap_row_align_items_flex_end() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(10f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(10f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrap_row_align_items_flex_end() { let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(20f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(20f32), }, ..Default::default() }) @@ -24,8 +24,8 @@ fn wrap_row_align_items_flex_end() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrap_row_align_items_flex_end() { let node3 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(30f32), - height: taffy::style::Dimension::Points(30f32), + width: taffy::style::Dimension::Length(30f32), + height: taffy::style::Dimension::Length(30f32), }, ..Default::default() }) @@ -44,7 +44,7 @@ fn wrap_row_align_items_flex_end() { taffy::style::Style { flex_wrap: taffy::style::FlexWrap::Wrap, align_items: Some(taffy::style::AlignItems::FlexEnd), - size: taffy::geometry::Size { width: taffy::style::Dimension::Points(100f32), height: auto() }, + size: taffy::geometry::Size { width: taffy::style::Dimension::Length(100f32), height: auto() }, ..Default::default() }, &[node0, node1, node2, node3], diff --git a/tests/generated/wrapped_column_max_height.rs b/tests/generated/wrapped_column_max_height.rs index 25f6fa989..6453a8437 100644 --- a/tests/generated/wrapped_column_max_height.rs +++ b/tests/generated/wrapped_column_max_height.rs @@ -6,24 +6,24 @@ fn wrapped_column_max_height() { let node0 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(500f32), }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, ..Default::default() }) .unwrap(); let node1 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), - right: taffy::style::LengthPercentageAuto::Points(20f32), - top: taffy::style::LengthPercentageAuto::Points(20f32), - bottom: taffy::style::LengthPercentageAuto::Points(20f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), + right: taffy::style::LengthPercentageAuto::Length(20f32), + top: taffy::style::LengthPercentageAuto::Length(20f32), + bottom: taffy::style::LengthPercentageAuto::Length(20f32), }, ..Default::default() }) @@ -31,8 +31,8 @@ fn wrapped_column_max_height() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -46,8 +46,8 @@ fn wrapped_column_max_height() { align_content: Some(taffy::style::AlignContent::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(700f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/wrapped_column_max_height_flex.rs b/tests/generated/wrapped_column_max_height_flex.rs index eeb116b0b..64f33d17d 100644 --- a/tests/generated/wrapped_column_max_height_flex.rs +++ b/tests/generated/wrapped_column_max_height_flex.rs @@ -9,10 +9,10 @@ fn wrapped_column_max_height_flex() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(500f32), }, - max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Points(200f32) }, + max_size: taffy::geometry::Size { width: auto(), height: taffy::style::Dimension::Length(200f32) }, ..Default::default() }) .unwrap(); @@ -22,14 +22,14 @@ fn wrapped_column_max_height_flex() { flex_shrink: 1f32, flex_basis: taffy::style::Dimension::Percent(0f32), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, margin: taffy::geometry::Rect { - left: taffy::style::LengthPercentageAuto::Points(20f32), - right: taffy::style::LengthPercentageAuto::Points(20f32), - top: taffy::style::LengthPercentageAuto::Points(20f32), - bottom: taffy::style::LengthPercentageAuto::Points(20f32), + left: taffy::style::LengthPercentageAuto::Length(20f32), + right: taffy::style::LengthPercentageAuto::Length(20f32), + top: taffy::style::LengthPercentageAuto::Length(20f32), + bottom: taffy::style::LengthPercentageAuto::Length(20f32), }, ..Default::default() }) @@ -37,8 +37,8 @@ fn wrapped_column_max_height_flex() { let node2 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(100f32), - height: taffy::style::Dimension::Points(100f32), + width: taffy::style::Dimension::Length(100f32), + height: taffy::style::Dimension::Length(100f32), }, ..Default::default() }) @@ -52,8 +52,8 @@ fn wrapped_column_max_height_flex() { align_content: Some(taffy::style::AlignContent::Center), justify_content: Some(taffy::style::JustifyContent::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(700f32), - height: taffy::style::Dimension::Points(500f32), + width: taffy::style::Dimension::Length(700f32), + height: taffy::style::Dimension::Length(500f32), }, ..Default::default() }, diff --git a/tests/generated/wrapped_row_within_align_items_center.rs b/tests/generated/wrapped_row_within_align_items_center.rs index 7806a3dcd..f9254802b 100644 --- a/tests/generated/wrapped_row_within_align_items_center.rs +++ b/tests/generated/wrapped_row_within_align_items_center.rs @@ -6,8 +6,8 @@ fn wrapped_row_within_align_items_center() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrapped_row_within_align_items_center() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrapped_row_within_align_items_center() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::Center), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/wrapped_row_within_align_items_flex_end.rs b/tests/generated/wrapped_row_within_align_items_flex_end.rs index d96b1ab18..165166a40 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_end.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_end.rs @@ -6,8 +6,8 @@ fn wrapped_row_within_align_items_flex_end() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrapped_row_within_align_items_flex_end() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrapped_row_within_align_items_flex_end() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::FlexEnd), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/generated/wrapped_row_within_align_items_flex_start.rs b/tests/generated/wrapped_row_within_align_items_flex_start.rs index e32c69d43..ad30aedee 100644 --- a/tests/generated/wrapped_row_within_align_items_flex_start.rs +++ b/tests/generated/wrapped_row_within_align_items_flex_start.rs @@ -6,8 +6,8 @@ fn wrapped_row_within_align_items_flex_start() { let node00 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(150f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(150f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -15,8 +15,8 @@ fn wrapped_row_within_align_items_flex_start() { let node01 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(80f32), - height: taffy::style::Dimension::Points(80f32), + width: taffy::style::Dimension::Length(80f32), + height: taffy::style::Dimension::Length(80f32), }, ..Default::default() }) @@ -33,8 +33,8 @@ fn wrapped_row_within_align_items_flex_start() { flex_direction: taffy::style::FlexDirection::Column, align_items: Some(taffy::style::AlignItems::FlexStart), size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200f32), - height: taffy::style::Dimension::Points(200f32), + width: taffy::style::Dimension::Length(200f32), + height: taffy::style::Dimension::Length(200f32), }, ..Default::default() }, diff --git a/tests/measure.rs b/tests/measure.rs index 125e13517..68de44eba 100644 --- a/tests/measure.rs +++ b/tests/measure.rs @@ -61,7 +61,7 @@ mod measure { let node = taffy .new_with_children( - Style { size: Size { width: Dimension::Points(50.0), height: auto() }, ..Default::default() }, + Style { size: Size { width: Dimension::Length(50.0), height: auto() }, ..Default::default() }, &[child], ) .unwrap(); @@ -92,12 +92,12 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(50.0), height: auto() }, + size: Size { width: Dimension::Length(50.0), height: auto() }, padding: Rect { - left: LengthPercentage::Points(10.0), - right: LengthPercentage::Points(10.0), - top: LengthPercentage::Points(10.0), - bottom: LengthPercentage::Points(10.0), + left: LengthPercentage::Length(10.0), + right: LengthPercentage::Length(10.0), + top: LengthPercentage::Length(10.0), + bottom: LengthPercentage::Length(10.0), }, ..Default::default() }, @@ -122,7 +122,7 @@ mod measure { let mut taffy = Taffy::new(); let child0 = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, ..Default::default() }) .unwrap(); @@ -139,7 +139,7 @@ mod measure { let node = taffy .new_with_children( - Style { size: Size { width: Dimension::Points(100.0), height: auto() }, ..Default::default() }, + Style { size: Size { width: Dimension::Length(100.0), height: auto() }, ..Default::default() }, &[child0, child1], ) .unwrap(); @@ -155,7 +155,7 @@ mod measure { let mut taffy = Taffy::new(); let child0 = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, flex_shrink: 0.0, ..Default::default() }) @@ -173,7 +173,7 @@ mod measure { let node = taffy .new_with_children( - Style { size: Size { width: Dimension::Points(100.0), height: auto() }, ..Default::default() }, + Style { size: Size { width: Dimension::Length(100.0), height: auto() }, ..Default::default() }, &[child0, child1], ) .unwrap(); @@ -189,7 +189,7 @@ mod measure { let mut taffy = Taffy::new(); let child0 = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, ..Default::default() }) .unwrap(); @@ -208,7 +208,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: auto() }, + size: Size { width: Dimension::Length(100.0), height: auto() }, align_items: Some(AlignItems::Start), ..Default::default() }, @@ -228,7 +228,7 @@ mod measure { let child0 = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, flex_shrink: 0.0, ..Default::default() }) @@ -248,7 +248,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: auto() }, + size: Size { width: Dimension::Length(100.0), height: auto() }, align_items: Some(AlignItems::Start), ..Default::default() }, @@ -280,7 +280,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, ..Default::default() }, &[child], @@ -298,7 +298,7 @@ mod measure { let mut taffy = Taffy::new(); let child = taffy .new_leaf_with_measure( - Style { size: Size { width: Dimension::Points(50.0), height: auto() }, ..Default::default() }, + Style { size: Size { width: Dimension::Length(50.0), height: auto() }, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -318,7 +318,7 @@ mod measure { let mut taffy = Taffy::new(); let child = taffy .new_leaf_with_measure( - Style { size: Size { width: auto(), height: Dimension::Points(50.0) }, ..Default::default() }, + Style { size: Size { width: auto(), height: Dimension::Length(50.0) }, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -337,12 +337,12 @@ mod measure { fn flex_basis_overrides_measure() { let mut taffy = Taffy::new(); let child0 = taffy - .new_leaf(Style { flex_basis: Dimension::Points(50.0), flex_grow: 1.0, ..Default::default() }) + .new_leaf(Style { flex_basis: Dimension::Length(50.0), flex_grow: 1.0, ..Default::default() }) .unwrap(); let child1 = taffy .new_leaf_with_measure( - Style { flex_basis: Dimension::Points(50.0), flex_grow: 1.0, ..Default::default() }, + Style { flex_basis: Dimension::Length(50.0), flex_grow: 1.0, ..Default::default() }, MeasureFunc::Raw(|known_dimensions, _available_space| Size { width: known_dimensions.width.unwrap_or(100.0), height: known_dimensions.height.unwrap_or(100.0), @@ -353,7 +353,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(200.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(200.0), height: Dimension::Length(100.0) }, ..Default::default() }, &[child0, child1], @@ -384,7 +384,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, ..Default::default() }, &[child], @@ -413,7 +413,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, ..Default::default() }, &[child], @@ -434,7 +434,7 @@ mod measure { let node = taffy .new_with_children( Style { - size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, ..Default::default() }, &[child], diff --git a/tests/min_max_overrides.rs b/tests/min_max_overrides.rs index a3eccd757..df8bdbbaa 100644 --- a/tests/min_max_overrides.rs +++ b/tests/min_max_overrides.rs @@ -9,9 +9,9 @@ mod min_max_overrides { let child = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, - min_size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, - max_size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, + min_size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, + max_size: Size { width: Dimension::Length(10.0), height: Dimension::Length(10.0) }, ..Default::default() }) .unwrap(); @@ -32,8 +32,8 @@ mod min_max_overrides { let child = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, - max_size: Size { width: Dimension::Points(10.0), height: Dimension::Points(10.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, + max_size: Size { width: Dimension::Length(10.0), height: Dimension::Length(10.0) }, ..Default::default() }) .unwrap(); @@ -54,8 +54,8 @@ mod min_max_overrides { let child = taffy .new_leaf(Style { - size: Size { width: Dimension::Points(50.0), height: Dimension::Points(50.0) }, - min_size: Size { width: Dimension::Points(100.0), height: Dimension::Points(100.0) }, + size: Size { width: Dimension::Length(50.0), height: Dimension::Length(50.0) }, + min_size: Size { width: Dimension::Length(100.0), height: Dimension::Length(100.0) }, ..Default::default() }) .unwrap(); diff --git a/tests/relayout.rs b/tests/relayout.rs index 2575141ec..4e58245a2 100644 --- a/tests/relayout.rs +++ b/tests/relayout.rs @@ -5,7 +5,7 @@ fn relayout() { let mut taffy = taffy::Taffy::new(); let node1 = taffy .new_leaf(taffy::style::Style { - size: taffy::geometry::Size { width: points(8.0), height: points(80.0) }, + size: taffy::geometry::Size { width: length(8.0), height: length(80.0) }, ..Default::default() }) .unwrap(); @@ -60,13 +60,13 @@ fn relayout() { fn toggle_root_display_none() { let hidden_style = Style { display: Display::None, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; let flex_style = Style { display: Display::Flex, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; @@ -108,12 +108,12 @@ fn toggle_root_display_none_with_children() { let mut taffy = taffy::Taffy::new(); let child = taffy - .new_leaf(Style { size: Size { width: points(800.0), height: points(100.0) }, ..Default::default() }) + .new_leaf(Style { size: Size { width: length(800.0), height: length(100.0) }, ..Default::default() }) .unwrap(); let parent = taffy .new_with_children( - Style { size: Size { width: points(800.0), height: points(100.0) }, ..Default::default() }, + Style { size: Size { width: length(800.0), height: length(100.0) }, ..Default::default() }, &[child], ) .unwrap(); @@ -140,13 +140,13 @@ fn toggle_root_display_none_with_children() { fn toggle_flex_child_display_none() { let hidden_style = Style { display: Display::None, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; let flex_style = Style { display: Display::Flex, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; @@ -186,13 +186,13 @@ fn toggle_flex_child_display_none() { fn toggle_flex_container_display_none() { let hidden_style = Style { display: Display::None, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; let flex_style = Style { display: Display::Flex, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; @@ -232,13 +232,13 @@ fn toggle_flex_container_display_none() { fn toggle_grid_child_display_none() { let hidden_style = Style { display: Display::None, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; let grid_style = Style { display: Display::Grid, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; @@ -278,13 +278,13 @@ fn toggle_grid_child_display_none() { fn toggle_grid_container_display_none() { let hidden_style = Style { display: Display::None, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; let grid_style = Style { display: Display::Grid, - size: Size { width: points(100.0), height: points(100.0) }, + size: Size { width: length(100.0), height: length(100.0) }, ..Default::default() }; diff --git a/tests/root_constraints.rs b/tests/root_constraints.rs index e7d441e4d..67fdf7b4c 100644 --- a/tests/root_constraints.rs +++ b/tests/root_constraints.rs @@ -56,8 +56,8 @@ mod root_constraints { let node = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { - width: taffy::style::Dimension::Points(200.0), - height: taffy::style::Dimension::Points(200.0), + width: taffy::style::Dimension::Length(200.0), + height: taffy::style::Dimension::Length(200.0), }, ..Default::default() }) diff --git a/tests/rounding.rs b/tests/rounding.rs index 0a78be734..3e273afc0 100644 --- a/tests/rounding.rs +++ b/tests/rounding.rs @@ -5,14 +5,14 @@ fn rounding_doesnt_leave_gaps() { // First create an instance of Taffy let mut taffy = Taffy::new(); - let w_square = Size { width: points(100.3), height: points(100.3) }; + let w_square = Size { width: length(100.3), height: length(100.3) }; let child_a = taffy.new_leaf(Style { size: w_square, ..Default::default() }).unwrap(); let child_b = taffy.new_leaf(Style { size: w_square, ..Default::default() }).unwrap(); let root_node = taffy .new_with_children( Style { - size: Size { width: points(963.3333), height: points(1000.) }, + size: Size { width: length(963.3333), height: length(1000.) }, justify_content: Some(JustifyContent::Center), ..Default::default() }, diff --git a/tests/serde.rs b/tests/serde.rs index 8d4d913af..19b70de37 100644 --- a/tests/serde.rs +++ b/tests/serde.rs @@ -16,7 +16,7 @@ mod serde { use serde_json; let json = r###"{ "inset": { - "left": { "Points": 22 }, + "left": { "Length": 22 }, "right": "Auto" }, "size": @@ -25,7 +25,7 @@ mod serde { }, "min_size": { - "height": { "Points": 10 } + "height": { "Length": 10 } }, "max_size": { @@ -33,19 +33,19 @@ mod serde { }, "margin": { - "right": { "Points": 99.0 }, - "bottom": { "Points": 99.0 } + "right": { "Length": 99.0 }, + "bottom": { "Length": 99.0 } }, "padding": { - "left": { "Points": 99.0 } + "left": { "Length": 99.0 } }, "border": { - "bottom": { "Points": 99.0 } + "bottom": { "Length": 99.0 } }, "gap": { - "width": { "Points": 99.0 } + "width": { "Length": 99.0 } }, "grid_row": { "start": "Auto" }, "grid_column": { "end": "Auto" }