From 014ade67ef3a96e5fffb328a8ed60474e620e038 Mon Sep 17 00:00:00 2001 From: Nico Burns Date: Tue, 22 Aug 2023 21:00:20 +0100 Subject: [PATCH] Move test measure function to the tests directory --- scripts/gentest/src/main.rs | 85 +------------------ tests/fixtures.rs | 64 ++++++++++++++ ...k_absolute_aspect_ratio_fill_max_height.rs | 2 +- ...ck_absolute_aspect_ratio_fill_max_width.rs | 2 +- .../block_aspect_ratio_fill_max_height.rs | 2 +- .../block_aspect_ratio_fill_max_width.rs | 4 +- .../block_aspect_ratio_fill_min_width.rs | 4 +- ..._y_collapse_through_blocked_by_line_box.rs | 4 +- ...gh_blocked_by_line_box_with_height_zero.rs | 4 +- ...locked_by_line_box_with_max_height_zero.rs | 4 +- ..._y_collapse_through_with_absolute_child.rs | 4 +- .../blockflex/blockflex_overflow_hidden.rs | 8 +- .../blockgrid/blockgrid_block_in_grid_auto.rs | 4 +- ..._block_in_grid_fixed_fit_content_larger.rs | 4 +- ..._block_in_grid_fixed_fit_content_middle.rs | 4 +- ...block_in_grid_fixed_fit_content_smaller.rs | 4 +- .../blockgrid_block_in_grid_fixed_larger.rs | 4 +- .../blockgrid_block_in_grid_fixed_middle.rs | 4 +- .../blockgrid_block_in_grid_fixed_smaller.rs | 4 +- .../blockgrid/blockgrid_block_in_grid_fr.rs | 4 +- .../blockgrid_block_in_grid_max_content.rs | 4 +- .../blockgrid_block_in_grid_min_content.rs | 4 +- .../absolute_aspect_ratio_fill_max_height.rs | 2 +- .../absolute_aspect_ratio_fill_max_width.rs | 2 +- .../flex/absolute_child_with_cross_margin.rs | 4 +- ...ign_items_center_justify_content_center.rs | 4 +- ...spect_ratio_flex_column_fill_max_height.rs | 2 +- ...aspect_ratio_flex_column_fill_max_width.rs | 4 +- ...aspect_ratio_flex_column_fill_min_width.rs | 4 +- ...tio_flex_column_stretch_fill_max_height.rs | 2 +- ...atio_flex_column_stretch_fill_max_width.rs | 4 +- .../aspect_ratio_flex_row_fill_max_height.rs | 2 +- .../aspect_ratio_flex_row_fill_max_width.rs | 4 +- .../aspect_ratio_flex_row_fill_min_width.rs | 4 +- ..._ratio_flex_row_stretch_fill_max_height.rs | 2 +- ...t_ratio_flex_row_stretch_fill_max_width.rs | 4 +- tests/generated/flex/bevy_issue_9530.rs | 2 +- .../generated/flex/bevy_issue_9530_reduced.rs | 4 +- .../flex/bevy_issue_9530_reduced2.rs | 4 +- .../flex/bevy_issue_9530_reduced3.rs | 4 +- .../flex/bevy_issue_9530_reduced4.rs | 4 +- .../intrinsic_sizing_cross_size_column.rs | 4 +- .../flex/intrinsic_sizing_main_size_column.rs | 4 +- ...ntrinsic_sizing_main_size_column_nested.rs | 4 +- .../intrinsic_sizing_main_size_column_wrap.rs | 8 +- .../flex/intrinsic_sizing_main_size_row.rs | 4 +- .../intrinsic_sizing_main_size_row_nested.rs | 4 +- .../intrinsic_sizing_main_size_row_wrap.rs | 8 +- tests/generated/flex/measure_child.rs | 4 +- .../generated/flex/measure_child_absolute.rs | 4 +- .../flex/measure_child_constraint.rs | 2 +- ...measure_child_constraint_padding_parent.rs | 2 +- .../flex/measure_child_with_flex_grow.rs | 4 +- .../flex/measure_child_with_flex_shrink.rs | 4 +- .../measure_child_with_flex_shrink_hidden.rs | 4 +- ...h_min_size_greater_than_available_space.rs | 4 +- .../measure_flex_basis_overrides_measure.rs | 4 +- .../flex/measure_height_overrides_measure.rs | 4 +- .../measure_remeasure_child_after_growing.rs | 4 +- ...measure_remeasure_child_after_shrinking.rs | 4 +- ...easure_remeasure_child_after_stretching.rs | 4 +- tests/generated/flex/measure_root.rs | 4 +- .../flex/measure_stretch_overrides_measure.rs | 4 +- .../flex/measure_width_overrides_measure.rs | 4 +- .../min_max_percent_different_width_height.rs | 4 +- .../flex/overflow_main_axis_shrink_hidden.rs | 4 +- .../flex/overflow_main_axis_shrink_scroll.rs | 4 +- .../flex/overflow_main_axis_shrink_visible.rs | 4 +- ..._aspect_ratio_child_fill_content_height.rs | 4 +- ...d_aspect_ratio_child_fill_content_width.rs | 4 +- ...grid_aspect_ratio_fill_child_max_height.rs | 4 +- .../grid_aspect_ratio_fill_child_max_width.rs | 4 +- .../grid_aspect_ratio_fill_child_min_width.rs | 4 +- ...vailable_space_greater_than_max_content.rs | 8 +- ...vailable_space_smaller_than_max_content.rs | 8 +- ...vailable_space_smaller_than_min_content.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 | 4 +- ..._content_percent_indefinite_max_content.rs | 4 +- ...t_percent_indefinite_max_content_hidden.rs | 4 +- ..._content_percent_indefinite_min_content.rs | 4 +- ...t_percent_indefinite_min_content_hidden.rs | 4 +- .../grid/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 +- ...d_margins_auto_margins_override_stretch.rs | 4 +- .../grid_max_content_maximum_single_item.rs | 4 +- .../grid/grid_max_content_single_item.rs | 4 +- ...rid_max_content_single_item_margin_auto.rs | 4 +- ...id_max_content_single_item_margin_fixed.rs | 4 +- ..._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 | 4 +- ...single_item_span_2_gap_percent_definite.rs | 4 +- ...ngle_item_span_2_gap_percent_indefinite.rs | 4 +- ...grid_max_width_greater_than_max_content.rs | 8 +- ..._less_than_max_content_with_min_content.rs | 8 +- ...grid_max_width_smaller_than_max_content.rs | 8 +- ...grid_max_width_smaller_than_min_content.rs | 8 +- .../grid/grid_min_content_flex_column.rs | 12 +-- .../grid/grid_min_content_flex_row.rs | 12 +-- .../grid/grid_min_content_flex_single_item.rs | 4 +- ...in_content_flex_single_item_margin_auto.rs | 4 +- ...n_content_flex_single_item_margin_fixed.rs | 4 +- ...content_flex_single_item_margin_percent.rs | 4 +- .../grid_min_content_maximum_single_item.rs | 4 +- .../grid/grid_min_content_single_item.rs | 4 +- .../grid/grid_minmax_auto_fixed_10px.rs | 4 +- .../grid/grid_minmax_auto_max_content.rs | 4 +- .../grid/grid_minmax_auto_min_content.rs | 4 +- .../grid/grid_minmax_auto_percent_definite.rs | 4 +- .../grid_minmax_auto_percent_indefinite.rs | 4 +- .../grid/grid_minmax_max_content_1fr.rs | 4 +- .../grid/grid_minmax_max_content_auto.rs | 4 +- .../grid_minmax_max_content_fixed_10px.rs | 4 +- .../grid_minmax_max_content_min_content.rs | 4 +- ...rid_minmax_max_content_percent_definite.rs | 4 +- ...d_minmax_max_content_percent_indefinite.rs | 4 +- .../grid/grid_minmax_min_content_1fr.rs | 4 +- .../grid/grid_minmax_min_content_auto.rs | 4 +- .../grid_minmax_min_content_fixed_10px.rs | 4 +- .../grid_minmax_min_content_max_content.rs | 4 +- ...rid_minmax_min_content_percent_definite.rs | 4 +- ...d_minmax_min_content_percent_indefinite.rs | 4 +- .../grid/grid_overflow_inline_axis_hidden.rs | 4 +- .../grid/grid_overflow_inline_axis_scroll.rs | 4 +- .../grid/grid_overflow_inline_axis_visible.rs | 4 +- tests/generated/grid/grid_overflow_rows.rs | 4 +- .../grid/grid_relayout_vertical_text.rs | 8 +- .../grid/grid_size_child_fixed_tracks.rs | 20 ++--- ...13_most_non_flex_with_minmax_indefinite.rs | 4 +- ..._non_flex_with_minmax_indefinite_hidden.rs | 4 +- ...grid_span_2_max_content_auto_indefinite.rs | 4 +- ...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 | 4 +- ...grid_span_2_min_content_auto_indefinite.rs | 4 +- ...an_2_min_content_auto_indefinite_hidden.rs | 4 +- ...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 | 4 +- ...an_2_min_content_min_content_indefinite.rs | 4 +- .../grid_span_6_all_non_flex_indefinite.rs | 4 +- ...d_span_6_all_non_flex_indefinite_hidden.rs | 4 +- .../grid_span_8_all_track_types_indefinite.rs | 4 +- .../gridflex/gridflex_column_integration.rs | 16 ++-- .../gridflex/gridflex_kitchen_sink.rs | 12 +-- .../gridflex/gridflex_row_integration.rs | 16 ++-- ...crollbars_affect_available_space_x_axis.rs | 4 +- ...crollbars_affect_available_space_y_axis.rs | 4 +- ...flow_scrollbars_take_up_space_both_axis.rs | 4 +- ...verflow_scrollbars_take_up_space_x_axis.rs | 4 +- ...verflow_scrollbars_take_up_space_y_axis.rs | 4 +- .../leaf/leaf_with_content_and_border.rs | 4 +- .../leaf/leaf_with_content_and_padding.rs | 4 +- .../leaf_with_content_and_padding_border.rs | 4 +- tests/generated/mod.rs | 62 -------------- 166 files changed, 435 insertions(+), 512 deletions(-) diff --git a/scripts/gentest/src/main.rs b/scripts/gentest/src/main.rs index 2d5f66c68..da57c339d 100644 --- a/scripts/gentest/src/main.rs +++ b/scripts/gentest/src/main.rs @@ -148,10 +148,6 @@ async fn main() { fs::write(test_filename, test_body.to_string()).unwrap(); } - let generic_measure_function = generate_generic_measure_function(); - let generic_measure_token = quote!(#generic_measure_function); - writeln!(&mut base_mod_file, "{}", generic_measure_token).unwrap(); - info!("formatting the source directory"); Command::new("cargo").arg("fmt").current_dir(repo_root).status().unwrap(); } @@ -871,85 +867,10 @@ fn generate_scalar_definition(track_definition: &serde_json::Map) } } -fn generate_generic_measure_function() -> TokenStream { - quote!( - // WARNING: This enum is generated by the gentest script. Do not edit directly - #[allow(dead_code)] - #[derive(Debug, Clone, Copy, PartialEq, Eq)] - enum WritingMode { - Horizontal, - Vertical, - } - - // WARNING: This function is generated by the gentest script. Do not edit directly - #[allow(dead_code)] - fn measure_standard_text( - known_dimensions: taffy::geometry::Size>, - available_space: taffy::geometry::Size, - text_content: &str, - writing_mode: WritingMode, - _aspect_ratio: Option, - ) -> taffy::geometry::Size { - use taffy::geometry::AbsoluteAxis; - use taffy::prelude::*; - const ZWS: char = '\u{200B}'; - const H_WIDTH: f32 = 10.0; - const H_HEIGHT: f32 = 10.0; - - if let Size { width: Some(width), height: Some(height) } = known_dimensions { - return Size { width, height }; - } - - let inline_axis = match writing_mode { - WritingMode::Horizontal => AbsoluteAxis::Horizontal, - WritingMode::Vertical => AbsoluteAxis::Vertical, - }; - let block_axis = inline_axis.other_axis(); - - let lines: Vec<&str> = text_content.split(ZWS).collect(); - if lines.is_empty() { - return Size::ZERO; - } - - let min_line_length: usize = lines.iter().map(|line| line.len()).max().unwrap_or(0); - let max_line_length: usize = lines.iter().map(|line| line.len()).sum(); - let inline_size = - known_dimensions.get_abs(inline_axis).unwrap_or_else(|| match available_space.get_abs(inline_axis) { - AvailableSpace::MinContent => min_line_length as f32 * H_WIDTH, - AvailableSpace::MaxContent => max_line_length as f32 * H_WIDTH, - AvailableSpace::Definite(inline_size) => { - inline_size.min(max_line_length as f32 * H_WIDTH).max(min_line_length as f32 * H_WIDTH) - } - }); - let block_size = known_dimensions.get_abs(block_axis).unwrap_or_else(|| { - let inline_line_length = (inline_size / H_WIDTH).floor() as usize; - let mut line_count = 1; - let mut current_line_length = 0; - for line in &lines { - if current_line_length + line.len() > inline_line_length { - if current_line_length > 0 { - line_count += 1 - }; - current_line_length = line.len(); - } else { - current_line_length += line.len(); - }; - } - (line_count as f32) * H_HEIGHT - }); - - match writing_mode { - WritingMode::Horizontal => Size { width: inline_size, height: block_size }, - WritingMode::Vertical => Size { width: block_size, height: inline_size }, - } - } - ) -} - fn generate_measure_function(text_content: &str, writing_mode: Option<&str>, aspect_ratio: Option) -> TokenStream { let writing_mode_token = match writing_mode { - Some("vertical-rl" | "vertical-lr") => quote!(crate::generated::WritingMode::Vertical), - _ => quote!(crate::generated::WritingMode::Horizontal), + Some("vertical-rl" | "vertical-lr") => quote!(crate::WritingMode::Vertical), + _ => quote!(crate::WritingMode::Horizontal), }; let aspect_ratio_token = match aspect_ratio { @@ -960,7 +881,7 @@ fn generate_measure_function(text_content: &str, writing_mode: Option<&str>, asp quote!( taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT : &str = #text_content; - crate::generated::measure_standard_text(known_dimensions, available_space, TEXT, #writing_mode_token, #aspect_ratio_token) + crate::measure_standard_text(known_dimensions, available_space, TEXT, #writing_mode_token, #aspect_ratio_token) }) ) } diff --git a/tests/fixtures.rs b/tests/fixtures.rs index 904388cb7..577b3d435 100644 --- a/tests/fixtures.rs +++ b/tests/fixtures.rs @@ -2,3 +2,67 @@ // this allows us to both keep code generation scoped to a singe directory for fs events // and to keep each test in a separate file mod generated; + +#[allow(dead_code)] +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +enum WritingMode { + Horizontal, + Vertical, +} + +#[allow(dead_code)] +fn measure_standard_text( + known_dimensions: taffy::geometry::Size>, + available_space: taffy::geometry::Size, + text_content: &str, + writing_mode: WritingMode, + _aspect_ratio: Option, +) -> taffy::geometry::Size { + use taffy::geometry::AbsoluteAxis; + use taffy::prelude::*; + const ZWS: char = '\u{200B}'; + const H_WIDTH: f32 = 10.0; + const H_HEIGHT: f32 = 10.0; + if let Size { width: Some(width), height: Some(height) } = known_dimensions { + return Size { width, height }; + } + let inline_axis = match writing_mode { + WritingMode::Horizontal => AbsoluteAxis::Horizontal, + WritingMode::Vertical => AbsoluteAxis::Vertical, + }; + let block_axis = inline_axis.other_axis(); + let lines: Vec<&str> = text_content.split(ZWS).collect(); + if lines.is_empty() { + return Size::ZERO; + } + let min_line_length: usize = lines.iter().map(|line| line.len()).max().unwrap_or(0); + let max_line_length: usize = lines.iter().map(|line| line.len()).sum(); + let inline_size = + known_dimensions.get_abs(inline_axis).unwrap_or_else(|| match available_space.get_abs(inline_axis) { + AvailableSpace::MinContent => min_line_length as f32 * H_WIDTH, + AvailableSpace::MaxContent => max_line_length as f32 * H_WIDTH, + AvailableSpace::Definite(inline_size) => { + inline_size.min(max_line_length as f32 * H_WIDTH).max(min_line_length as f32 * H_WIDTH) + } + }); + let block_size = known_dimensions.get_abs(block_axis).unwrap_or_else(|| { + let inline_line_length = (inline_size / H_WIDTH).floor() as usize; + let mut line_count = 1; + let mut current_line_length = 0; + for line in &lines { + if current_line_length + line.len() > inline_line_length { + if current_line_length > 0 { + line_count += 1 + }; + current_line_length = line.len(); + } else { + current_line_length += line.len(); + }; + } + (line_count as f32) * H_HEIGHT + }); + match writing_mode { + WritingMode::Horizontal => Size { width: inline_size, height: block_size }, + WritingMode::Vertical => Size { width: block_size, height: inline_size }, + } +} diff --git a/tests/generated/block/block_absolute_aspect_ratio_fill_max_height.rs b/tests/generated/block/block_absolute_aspect_ratio_fill_max_height.rs index 22f4bdd52..d90c06685 100644 --- a/tests/generated/block/block_absolute_aspect_ratio_fill_max_height.rs +++ b/tests/generated/block/block_absolute_aspect_ratio_fill_max_height.rs @@ -3,7 +3,7 @@ fn block_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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (3f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/block/block_absolute_aspect_ratio_fill_max_width.rs b/tests/generated/block/block_absolute_aspect_ratio_fill_max_width.rs index ebbc890c9..a279ae243 100644 --- a/tests/generated/block/block_absolute_aspect_ratio_fill_max_width.rs +++ b/tests/generated/block/block_absolute_aspect_ratio_fill_max_width.rs @@ -3,7 +3,7 @@ fn block_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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (0.5f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/block/block_aspect_ratio_fill_max_height.rs b/tests/generated/block/block_aspect_ratio_fill_max_height.rs index 340499c3e..83cdd48f3 100644 --- a/tests/generated/block/block_aspect_ratio_fill_max_height.rs +++ b/tests/generated/block/block_aspect_ratio_fill_max_height.rs @@ -3,7 +3,7 @@ fn block_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 { display : taffy :: style :: Display :: Block , 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { display : taffy :: style :: Display :: Block , 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/block/block_aspect_ratio_fill_max_width.rs b/tests/generated/block/block_aspect_ratio_fill_max_width.rs index 57174b09b..6b706b5fe 100644 --- a/tests/generated/block/block_aspect_ratio_fill_max_width.rs +++ b/tests/generated/block/block_aspect_ratio_fill_max_width.rs @@ -13,11 +13,11 @@ fn block_aspect_ratio_fill_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/block/block_aspect_ratio_fill_min_width.rs b/tests/generated/block/block_aspect_ratio_fill_min_width.rs index 27cbb49fc..b88d75c50 100644 --- a/tests/generated/block/block_aspect_ratio_fill_min_width.rs +++ b/tests/generated/block/block_aspect_ratio_fill_min_width.rs @@ -13,11 +13,11 @@ fn block_aspect_ratio_fill_min_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n \n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box.rs b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box.rs index ca42835f9..244046036 100644 --- a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box.rs +++ b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box.rs @@ -30,11 +30,11 @@ fn block_margin_y_collapse_through_blocked_by_line_box() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_height_zero.rs b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_height_zero.rs index 0cbf6c9de..b278f0d35 100644 --- a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_height_zero.rs +++ b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_height_zero.rs @@ -31,11 +31,11 @@ fn block_margin_y_collapse_through_blocked_by_line_box_with_height_zero() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_max_height_zero.rs b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_max_height_zero.rs index 4aca6c72e..467319339 100644 --- a/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_max_height_zero.rs +++ b/tests/generated/block/block_margin_y_collapse_through_blocked_by_line_box_with_max_height_zero.rs @@ -31,11 +31,11 @@ fn block_margin_y_collapse_through_blocked_by_line_box_with_max_height_zero() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/block/block_margin_y_collapse_through_with_absolute_child.rs b/tests/generated/block/block_margin_y_collapse_through_with_absolute_child.rs index 02db9aec8..d107ea7a3 100644 --- a/tests/generated/block/block_margin_y_collapse_through_with_absolute_child.rs +++ b/tests/generated/block/block_margin_y_collapse_through_with_absolute_child.rs @@ -21,11 +21,11 @@ fn block_margin_y_collapse_through_with_absolute_child() { taffy::style::Style { position: taffy::style::Position::Absolute, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockflex/blockflex_overflow_hidden.rs b/tests/generated/blockflex/blockflex_overflow_hidden.rs index 2584102e8..7c88ca2b8 100644 --- a/tests/generated/blockflex/blockflex_overflow_hidden.rs +++ b/tests/generated/blockflex/blockflex_overflow_hidden.rs @@ -17,11 +17,11 @@ fn blockflex_overflow_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -32,11 +32,11 @@ fn blockflex_overflow_hidden() { taffy::style::Style { display: taffy::style::Display::Block, flex_grow: 1f32, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_auto.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_auto.rs index 522f91f8e..10ba54818 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_auto.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_auto.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_auto() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_larger.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_larger.rs index dccd65761..c8e184d7c 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_larger.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_larger.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_fit_content_larger() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_middle.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_middle.rs index 7d4401405..bb7a38a98 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_middle.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_middle.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_fit_content_middle() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_smaller.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_smaller.rs index a1972a3ba..a174fed05 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_smaller.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_fit_content_smaller.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_fit_content_smaller() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_larger.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_larger.rs index 6be0619e9..b98a24866 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_larger.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_larger.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_larger() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_middle.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_middle.rs index a12902ddc..714ac6ad3 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_middle.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_middle.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_middle() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_smaller.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_smaller.rs index d7c36386e..242ea5366 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_smaller.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fixed_smaller.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fixed_smaller() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_fr.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_fr.rs index b3a1b973a..5c60cec24 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_fr.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_fr.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_fr() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_max_content.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_max_content.rs index 57f8619fb..9e035bc3f 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_max_content.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_max_content.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_max_content() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/blockgrid/blockgrid_block_in_grid_min_content.rs b/tests/generated/blockgrid/blockgrid_block_in_grid_min_content.rs index 6ff829b2b..3bba9053d 100644 --- a/tests/generated/blockgrid/blockgrid_block_in_grid_min_content.rs +++ b/tests/generated/blockgrid/blockgrid_block_in_grid_min_content.rs @@ -8,11 +8,11 @@ fn blockgrid_block_in_grid_min_content() { taffy::style::Style { display: taffy::style::Display::Block, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/absolute_aspect_ratio_fill_max_height.rs b/tests/generated/flex/absolute_aspect_ratio_fill_max_height.rs index e15545d3f..93f3f3521 100644 --- a/tests/generated/flex/absolute_aspect_ratio_fill_max_height.rs +++ b/tests/generated/flex/absolute_aspect_ratio_fill_max_height.rs @@ -3,7 +3,7 @@ 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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (3f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/absolute_aspect_ratio_fill_max_width.rs b/tests/generated/flex/absolute_aspect_ratio_fill_max_width.rs index 0253062c5..f49c5813d 100644 --- a/tests/generated/flex/absolute_aspect_ratio_fill_max_width.rs +++ b/tests/generated/flex/absolute_aspect_ratio_fill_max_width.rs @@ -3,7 +3,7 @@ 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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (0.5f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/absolute_child_with_cross_margin.rs b/tests/generated/flex/absolute_child_with_cross_margin.rs index 4887d6252..1d98b2cfa 100644 --- a/tests/generated/flex/absolute_child_with_cross_margin.rs +++ b/tests/generated/flex/absolute_child_with_cross_margin.rs @@ -34,11 +34,11 @@ fn absolute_child_with_cross_margin() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/align_items_center_justify_content_center.rs b/tests/generated/flex/align_items_center_justify_content_center.rs index 72940bb7b..228b5b3eb 100644 --- a/tests/generated/flex/align_items_center_justify_content_center.rs +++ b/tests/generated/flex/align_items_center_justify_content_center.rs @@ -14,11 +14,11 @@ fn align_items_center_justify_content_center() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_column_fill_max_height.rs b/tests/generated/flex/aspect_ratio_flex_column_fill_max_height.rs index 9e2bc0ac3..ef19f3ceb 100644 --- a/tests/generated/flex/aspect_ratio_flex_column_fill_max_height.rs +++ b/tests/generated/flex/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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/aspect_ratio_flex_column_fill_max_width.rs b/tests/generated/flex/aspect_ratio_flex_column_fill_max_width.rs index 31aed825b..275b15e0d 100644 --- a/tests/generated/flex/aspect_ratio_flex_column_fill_max_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_column_fill_max_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_column_fill_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_column_fill_min_width.rs b/tests/generated/flex/aspect_ratio_flex_column_fill_min_width.rs index d06edc076..562262a7e 100644 --- a/tests/generated/flex/aspect_ratio_flex_column_fill_min_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_column_fill_min_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_column_fill_min_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n \n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_height.rs b/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_height.rs index feeafa46a..ca61ef0e5 100644 --- a/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_height.rs +++ b/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_height.rs @@ -3,7 +3,7 @@ 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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_width.rs b/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_width.rs index c37e8a2e2..306601183 100644 --- a/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_column_stretch_fill_max_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_column_stretch_fill_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_row_fill_max_height.rs b/tests/generated/flex/aspect_ratio_flex_row_fill_max_height.rs index e179b51de..2f4674a44 100644 --- a/tests/generated/flex/aspect_ratio_flex_row_fill_max_height.rs +++ b/tests/generated/flex/aspect_ratio_flex_row_fill_max_height.rs @@ -3,7 +3,7 @@ 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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/aspect_ratio_flex_row_fill_max_width.rs b/tests/generated/flex/aspect_ratio_flex_row_fill_max_width.rs index ba80951db..d41cb38b8 100644 --- a/tests/generated/flex/aspect_ratio_flex_row_fill_max_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_row_fill_max_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_row_fill_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_row_fill_min_width.rs b/tests/generated/flex/aspect_ratio_flex_row_fill_min_width.rs index e95bb4cf3..e67f0e0af 100644 --- a/tests/generated/flex/aspect_ratio_flex_row_fill_min_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_row_fill_min_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_row_fill_min_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n \n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_height.rs b/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_height.rs index e45ee0754..d6c528ecf 100644 --- a/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_height.rs +++ b/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_height.rs @@ -3,7 +3,7 @@ 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 :: 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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: 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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , Some (2f32)) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_width.rs b/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_width.rs index c5598ca92..f2ace8b03 100644 --- a/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_width.rs +++ b/tests/generated/flex/aspect_ratio_flex_row_stretch_fill_max_width.rs @@ -12,11 +12,11 @@ fn aspect_ratio_flex_row_stretch_fill_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/flex/bevy_issue_9530.rs b/tests/generated/flex/bevy_issue_9530.rs index f1a3b8f54..6aef9590a 100644 --- a/tests/generated/flex/bevy_issue_9530.rs +++ b/tests/generated/flex/bevy_issue_9530.rs @@ -22,7 +22,7 @@ fn bevy_issue_9530() { ..Default::default() }) .unwrap(); - let node11 = taffy . new_leaf_with_measure (taffy :: style :: Style { align_items : Some (taffy :: style :: AlignItems :: Center) , align_content : Some (taffy :: style :: AlignContent :: Center) , justify_content : Some (taffy :: style :: JustifyContent :: Center) , flex_grow : 1f32 , margin : taffy :: geometry :: Rect { 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 () } , 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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; + let node11 = taffy . new_leaf_with_measure (taffy :: style :: Style { align_items : Some (taffy :: style :: AlignItems :: Center) , align_content : Some (taffy :: style :: AlignContent :: Center) , justify_content : Some (taffy :: style :: JustifyContent :: Center) , flex_grow : 1f32 , margin : taffy :: geometry :: Rect { 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 () } , 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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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\u{200b}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" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; let node12 = taffy .new_leaf(taffy::style::Style { size: taffy::geometry::Size { diff --git a/tests/generated/flex/bevy_issue_9530_reduced.rs b/tests/generated/flex/bevy_issue_9530_reduced.rs index 23fa866fc..205b6fa8f 100644 --- a/tests/generated/flex/bevy_issue_9530_reduced.rs +++ b/tests/generated/flex/bevy_issue_9530_reduced.rs @@ -8,11 +8,11 @@ fn bevy_issue_9530_reduced() { taffy::style::Style { flex_grow: 1f32, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/bevy_issue_9530_reduced2.rs b/tests/generated/flex/bevy_issue_9530_reduced2.rs index 61a4dee2b..4b7e40744 100644 --- a/tests/generated/flex/bevy_issue_9530_reduced2.rs +++ b/tests/generated/flex/bevy_issue_9530_reduced2.rs @@ -8,11 +8,11 @@ fn bevy_issue_9530_reduced2() { taffy::style::Style { flex_grow: 1f32, ..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"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/bevy_issue_9530_reduced3.rs b/tests/generated/flex/bevy_issue_9530_reduced3.rs index 1413c4e33..30d0652ee 100644 --- a/tests/generated/flex/bevy_issue_9530_reduced3.rs +++ b/tests/generated/flex/bevy_issue_9530_reduced3.rs @@ -17,11 +17,11 @@ fn bevy_issue_9530_reduced3() { }, 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"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/bevy_issue_9530_reduced4.rs b/tests/generated/flex/bevy_issue_9530_reduced4.rs index d3dc46384..c2a056eeb 100644 --- a/tests/generated/flex/bevy_issue_9530_reduced4.rs +++ b/tests/generated/flex/bevy_issue_9530_reduced4.rs @@ -16,11 +16,11 @@ fn bevy_issue_9530_reduced4() { }, 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"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_cross_size_column.rs b/tests/generated/flex/intrinsic_sizing_cross_size_column.rs index 7a4551d0e..501fa24c1 100644 --- a/tests/generated/flex/intrinsic_sizing_cross_size_column.rs +++ b/tests/generated/flex/intrinsic_sizing_cross_size_column.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_cross_size_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_column.rs b/tests/generated/flex/intrinsic_sizing_main_size_column.rs index 113f7360c..ddc65712d 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_column.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_column.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_column() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_column_nested.rs b/tests/generated/flex/intrinsic_sizing_main_size_column_nested.rs index 17872ace7..b1f1b1058 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_column_nested.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_column_nested.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_column_nested() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_column_wrap.rs b/tests/generated/flex/intrinsic_sizing_main_size_column_wrap.rs index dc7f26855..1ee6050eb 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_column_wrap.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_column_wrap.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_column_wrap() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, None, ) }), @@ -23,11 +23,11 @@ fn intrinsic_sizing_main_size_column_wrap() { taffy::style::Style { flex_direction: taffy::style::FlexDirection::Column, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_row.rs b/tests/generated/flex/intrinsic_sizing_main_size_row.rs index 0a94d513f..918f2097d 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_row.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_row.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_row() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_row_nested.rs b/tests/generated/flex/intrinsic_sizing_main_size_row_nested.rs index ec8343eab..1e112d83e 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_row_nested.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_row_nested.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_row_nested() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/intrinsic_sizing_main_size_row_wrap.rs b/tests/generated/flex/intrinsic_sizing_main_size_row_wrap.rs index a14f8df06..a0c80c245 100644 --- a/tests/generated/flex/intrinsic_sizing_main_size_row_wrap.rs +++ b/tests/generated/flex/intrinsic_sizing_main_size_row_wrap.rs @@ -8,11 +8,11 @@ fn intrinsic_sizing_main_size_row_wrap() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn intrinsic_sizing_main_size_row_wrap() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child.rs b/tests/generated/flex/measure_child.rs index e8e0ccef9..8dc7d83ca 100644 --- a/tests/generated/flex/measure_child.rs +++ b/tests/generated/flex/measure_child.rs @@ -8,11 +8,11 @@ fn measure_child() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child_absolute.rs b/tests/generated/flex/measure_child_absolute.rs index cd5bd5295..ea8d4e448 100644 --- a/tests/generated/flex/measure_child_absolute.rs +++ b/tests/generated/flex/measure_child_absolute.rs @@ -8,11 +8,11 @@ fn measure_child_absolute() { taffy::style::Style { position: taffy::style::Position::Absolute, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child_constraint.rs b/tests/generated/flex/measure_child_constraint.rs index 716227f14..e95515b01 100644 --- a/tests/generated/flex/measure_child_constraint.rs +++ b/tests/generated/flex/measure_child_constraint.rs @@ -3,7 +3,7 @@ fn measure_child_constraint() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/measure_child_constraint_padding_parent.rs b/tests/generated/flex/measure_child_constraint_padding_parent.rs index 3c1bf280f..521d4ca11 100644 --- a/tests/generated/flex/measure_child_constraint_padding_parent.rs +++ b/tests/generated/flex/measure_child_constraint_padding_parent.rs @@ -3,7 +3,7 @@ fn measure_child_constraint_padding_parent() { #[allow(unused_imports)] use taffy::{prelude::*, tree::Layout}; let mut taffy = taffy::Taffy::new(); - let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH" ; crate :: generated :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: generated :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; + let node0 = taffy . new_leaf_with_measure (taffy :: style :: Style { .. Default :: default () } , taffy :: tree :: MeasureFunc :: Raw (| known_dimensions , available_space | { const TEXT : & str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH" ; crate :: measure_standard_text (known_dimensions , available_space , TEXT , crate :: WritingMode :: Horizontal , None) }) ,) . unwrap () ; let node = taffy .new_with_children( taffy::style::Style { diff --git a/tests/generated/flex/measure_child_with_flex_grow.rs b/tests/generated/flex/measure_child_with_flex_grow.rs index fedcb0fc7..e232d0cf6 100644 --- a/tests/generated/flex/measure_child_with_flex_grow.rs +++ b/tests/generated/flex/measure_child_with_flex_grow.rs @@ -17,11 +17,11 @@ fn measure_child_with_flex_grow() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H\u{200b}H\u{200b}H\u{200b}H\u{200b}H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child_with_flex_shrink.rs b/tests/generated/flex/measure_child_with_flex_shrink.rs index 01e3675ec..828413576 100644 --- a/tests/generated/flex/measure_child_with_flex_shrink.rs +++ b/tests/generated/flex/measure_child_with_flex_shrink.rs @@ -17,11 +17,11 @@ fn measure_child_with_flex_shrink() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child_with_flex_shrink_hidden.rs b/tests/generated/flex/measure_child_with_flex_shrink_hidden.rs index 4bf832566..6c4cb1afd 100644 --- a/tests/generated/flex/measure_child_with_flex_shrink_hidden.rs +++ b/tests/generated/flex/measure_child_with_flex_shrink_hidden.rs @@ -24,11 +24,11 @@ fn measure_child_with_flex_shrink_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH\u{200b}HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_child_with_min_size_greater_than_available_space.rs b/tests/generated/flex/measure_child_with_min_size_greater_than_available_space.rs index 05905cf6a..9fc518bc4 100644 --- a/tests/generated/flex/measure_child_with_min_size_greater_than_available_space.rs +++ b/tests/generated/flex/measure_child_with_min_size_greater_than_available_space.rs @@ -11,11 +11,11 @@ fn measure_child_with_min_size_greater_than_available_space() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHH\u{200b}HHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_flex_basis_overrides_measure.rs b/tests/generated/flex/measure_flex_basis_overrides_measure.rs index 9eda7f2b1..b59b43488 100644 --- a/tests/generated/flex/measure_flex_basis_overrides_measure.rs +++ b/tests/generated/flex/measure_flex_basis_overrides_measure.rs @@ -8,11 +8,11 @@ fn measure_flex_basis_overrides_measure() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_height_overrides_measure.rs b/tests/generated/flex/measure_height_overrides_measure.rs index b127fb8ca..5c3008c9f 100644 --- a/tests/generated/flex/measure_height_overrides_measure.rs +++ b/tests/generated/flex/measure_height_overrides_measure.rs @@ -11,11 +11,11 @@ fn measure_height_overrides_measure() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_remeasure_child_after_growing.rs b/tests/generated/flex/measure_remeasure_child_after_growing.rs index d2653bc90..208b15dff 100644 --- a/tests/generated/flex/measure_remeasure_child_after_growing.rs +++ b/tests/generated/flex/measure_remeasure_child_after_growing.rs @@ -17,11 +17,11 @@ fn measure_remeasure_child_after_growing() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_remeasure_child_after_shrinking.rs b/tests/generated/flex/measure_remeasure_child_after_shrinking.rs index d99fa1aa6..87770bbe3 100644 --- a/tests/generated/flex/measure_remeasure_child_after_shrinking.rs +++ b/tests/generated/flex/measure_remeasure_child_after_shrinking.rs @@ -18,11 +18,11 @@ fn measure_remeasure_child_after_shrinking() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_remeasure_child_after_stretching.rs b/tests/generated/flex/measure_remeasure_child_after_stretching.rs index ee40a1bef..094ef0805 100644 --- a/tests/generated/flex/measure_remeasure_child_after_stretching.rs +++ b/tests/generated/flex/measure_remeasure_child_after_stretching.rs @@ -8,11 +8,11 @@ fn measure_remeasure_child_after_stretching() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_root.rs b/tests/generated/flex/measure_root.rs index 5195add4d..ac257d3c7 100644 --- a/tests/generated/flex/measure_root.rs +++ b/tests/generated/flex/measure_root.rs @@ -8,11 +8,11 @@ fn measure_root() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_stretch_overrides_measure.rs b/tests/generated/flex/measure_stretch_overrides_measure.rs index ac4817beb..3d0a3c0f7 100644 --- a/tests/generated/flex/measure_stretch_overrides_measure.rs +++ b/tests/generated/flex/measure_stretch_overrides_measure.rs @@ -19,11 +19,11 @@ fn measure_stretch_overrides_measure() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/measure_width_overrides_measure.rs b/tests/generated/flex/measure_width_overrides_measure.rs index 123e36828..9d185c32c 100644 --- a/tests/generated/flex/measure_width_overrides_measure.rs +++ b/tests/generated/flex/measure_width_overrides_measure.rs @@ -11,11 +11,11 @@ fn measure_width_overrides_measure() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/min_max_percent_different_width_height.rs b/tests/generated/flex/min_max_percent_different_width_height.rs index 29e069672..e783e9c01 100644 --- a/tests/generated/flex/min_max_percent_different_width_height.rs +++ b/tests/generated/flex/min_max_percent_different_width_height.rs @@ -18,11 +18,11 @@ fn min_max_percent_different_width_height() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/overflow_main_axis_shrink_hidden.rs b/tests/generated/flex/overflow_main_axis_shrink_hidden.rs index 40c495cb8..5507df526 100644 --- a/tests/generated/flex/overflow_main_axis_shrink_hidden.rs +++ b/tests/generated/flex/overflow_main_axis_shrink_hidden.rs @@ -16,11 +16,11 @@ fn overflow_main_axis_shrink_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/overflow_main_axis_shrink_scroll.rs b/tests/generated/flex/overflow_main_axis_shrink_scroll.rs index ffb41c428..a520b433b 100644 --- a/tests/generated/flex/overflow_main_axis_shrink_scroll.rs +++ b/tests/generated/flex/overflow_main_axis_shrink_scroll.rs @@ -16,11 +16,11 @@ fn overflow_main_axis_shrink_scroll() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/flex/overflow_main_axis_shrink_visible.rs b/tests/generated/flex/overflow_main_axis_shrink_visible.rs index bb7163c69..ad3db7ed5 100644 --- a/tests/generated/flex/overflow_main_axis_shrink_visible.rs +++ b/tests/generated/flex/overflow_main_axis_shrink_visible.rs @@ -8,11 +8,11 @@ fn overflow_main_axis_shrink_visible() { taffy::style::Style { flex_shrink: 1f32, ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_aspect_ratio_child_fill_content_height.rs b/tests/generated/grid/grid_aspect_ratio_child_fill_content_height.rs index fb083a550..864be64ce 100644 --- a/tests/generated/grid/grid_aspect_ratio_child_fill_content_height.rs +++ b/tests/generated/grid/grid_aspect_ratio_child_fill_content_height.rs @@ -8,11 +8,11 @@ fn grid_aspect_ratio_child_fill_content_height() { taffy::style::Style { aspect_ratio: Some(0.5f32), ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(0.5f32), ) }), diff --git a/tests/generated/grid/grid_aspect_ratio_child_fill_content_width.rs b/tests/generated/grid/grid_aspect_ratio_child_fill_content_width.rs index 8ed5ac429..c8c55d1bc 100644 --- a/tests/generated/grid/grid_aspect_ratio_child_fill_content_width.rs +++ b/tests/generated/grid/grid_aspect_ratio_child_fill_content_width.rs @@ -8,11 +8,11 @@ fn grid_aspect_ratio_child_fill_content_width() { taffy::style::Style { aspect_ratio: Some(2f32), ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/grid/grid_aspect_ratio_fill_child_max_height.rs b/tests/generated/grid/grid_aspect_ratio_fill_child_max_height.rs index 0e1a42941..6da6ece1d 100644 --- a/tests/generated/grid/grid_aspect_ratio_fill_child_max_height.rs +++ b/tests/generated/grid/grid_aspect_ratio_fill_child_max_height.rs @@ -12,11 +12,11 @@ fn grid_aspect_ratio_fill_child_max_height() { }, 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"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, Some(2f32), ) }), diff --git a/tests/generated/grid/grid_aspect_ratio_fill_child_max_width.rs b/tests/generated/grid/grid_aspect_ratio_fill_child_max_width.rs index 802bcdd30..022c5eece 100644 --- a/tests/generated/grid/grid_aspect_ratio_fill_child_max_width.rs +++ b/tests/generated/grid/grid_aspect_ratio_fill_child_max_width.rs @@ -12,11 +12,11 @@ fn grid_aspect_ratio_fill_child_max_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/grid/grid_aspect_ratio_fill_child_min_width.rs b/tests/generated/grid/grid_aspect_ratio_fill_child_min_width.rs index 59c8e0d75..e3d67287e 100644 --- a/tests/generated/grid/grid_aspect_ratio_fill_child_min_width.rs +++ b/tests/generated/grid/grid_aspect_ratio_fill_child_min_width.rs @@ -12,11 +12,11 @@ fn grid_aspect_ratio_fill_child_min_width() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "\n \n "; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, Some(2f32), ) }), diff --git a/tests/generated/grid/grid_available_space_greater_than_max_content.rs b/tests/generated/grid/grid_available_space_greater_than_max_content.rs index d935e1d8e..aa4076ef6 100644 --- a/tests/generated/grid/grid_available_space_greater_than_max_content.rs +++ b/tests/generated/grid/grid_available_space_greater_than_max_content.rs @@ -8,11 +8,11 @@ fn grid_available_space_greater_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_available_space_greater_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_available_space_smaller_than_max_content.rs b/tests/generated/grid/grid_available_space_smaller_than_max_content.rs index b72a9224b..437d4fa52 100644 --- a/tests/generated/grid/grid_available_space_smaller_than_max_content.rs +++ b/tests/generated/grid/grid_available_space_smaller_than_max_content.rs @@ -8,11 +8,11 @@ fn grid_available_space_smaller_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_available_space_smaller_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_available_space_smaller_than_min_content.rs b/tests/generated/grid/grid_available_space_smaller_than_min_content.rs index c5bc43d1f..a69cc56c8 100644 --- a/tests/generated/grid/grid_available_space_smaller_than_min_content.rs +++ b/tests/generated/grid/grid_available_space_smaller_than_min_content.rs @@ -8,11 +8,11 @@ fn grid_available_space_smaller_than_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_available_space_smaller_than_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_definite_argument.rs b/tests/generated/grid/grid_fit_content_percent_definite_argument.rs index be2a51e4b..ff20cb410 100644 --- a/tests/generated/grid/grid_fit_content_percent_definite_argument.rs +++ b/tests/generated/grid/grid_fit_content_percent_definite_argument.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_definite_argument() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_definite_max_content.rs b/tests/generated/grid/grid_fit_content_percent_definite_max_content.rs index 73a172ac5..d01c7649e 100644 --- a/tests/generated/grid/grid_fit_content_percent_definite_max_content.rs +++ b/tests/generated/grid/grid_fit_content_percent_definite_max_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_definite_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_definite_min_content.rs b/tests/generated/grid/grid_fit_content_percent_definite_min_content.rs index a20ba0ad2..8ad390570 100644 --- a/tests/generated/grid/grid_fit_content_percent_definite_min_content.rs +++ b/tests/generated/grid/grid_fit_content_percent_definite_min_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_definite_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_indefinite_argument.rs b/tests/generated/grid/grid_fit_content_percent_indefinite_argument.rs index 47c789535..9c134e099 100644 --- a/tests/generated/grid/grid_fit_content_percent_indefinite_argument.rs +++ b/tests/generated/grid/grid_fit_content_percent_indefinite_argument.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_indefinite_argument() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_indefinite_max_content.rs b/tests/generated/grid/grid_fit_content_percent_indefinite_max_content.rs index c43de3c9d..39cb4a43d 100644 --- a/tests/generated/grid/grid_fit_content_percent_indefinite_max_content.rs +++ b/tests/generated/grid/grid_fit_content_percent_indefinite_max_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_indefinite_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_indefinite_max_content_hidden.rs b/tests/generated/grid/grid_fit_content_percent_indefinite_max_content_hidden.rs index bb0568849..3f5abfb25 100644 --- a/tests/generated/grid/grid_fit_content_percent_indefinite_max_content_hidden.rs +++ b/tests/generated/grid/grid_fit_content_percent_indefinite_max_content_hidden.rs @@ -15,11 +15,11 @@ fn grid_fit_content_percent_indefinite_max_content_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_indefinite_min_content.rs b/tests/generated/grid/grid_fit_content_percent_indefinite_min_content.rs index 5a61bae07..02b55c94b 100644 --- a/tests/generated/grid/grid_fit_content_percent_indefinite_min_content.rs +++ b/tests/generated/grid/grid_fit_content_percent_indefinite_min_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_percent_indefinite_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_percent_indefinite_min_content_hidden.rs b/tests/generated/grid/grid_fit_content_percent_indefinite_min_content_hidden.rs index 523f9dcf2..40c311282 100644 --- a/tests/generated/grid/grid_fit_content_percent_indefinite_min_content_hidden.rs +++ b/tests/generated/grid/grid_fit_content_percent_indefinite_min_content_hidden.rs @@ -15,11 +15,11 @@ fn grid_fit_content_percent_indefinite_min_content_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_points_argument.rs b/tests/generated/grid/grid_fit_content_points_argument.rs index 4200d7cfd..5b0eed81c 100644 --- a/tests/generated/grid/grid_fit_content_points_argument.rs +++ b/tests/generated/grid/grid_fit_content_points_argument.rs @@ -8,11 +8,11 @@ fn grid_fit_content_points_argument() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_points_max_content.rs b/tests/generated/grid/grid_fit_content_points_max_content.rs index 4db8c4a87..8c165dc08 100644 --- a/tests/generated/grid/grid_fit_content_points_max_content.rs +++ b/tests/generated/grid/grid_fit_content_points_max_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_points_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_points_min_content.rs b/tests/generated/grid/grid_fit_content_points_min_content.rs index a45ca80ca..f972a6e76 100644 --- a/tests/generated/grid/grid_fit_content_points_min_content.rs +++ b/tests/generated/grid/grid_fit_content_points_min_content.rs @@ -8,11 +8,11 @@ fn grid_fit_content_points_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_fit_content_points_min_content_hidden.rs b/tests/generated/grid/grid_fit_content_points_min_content_hidden.rs index 99429c848..42af6c6b8 100644 --- a/tests/generated/grid/grid_fit_content_points_min_content_hidden.rs +++ b/tests/generated/grid/grid_fit_content_points_min_content_hidden.rs @@ -15,11 +15,11 @@ fn grid_fit_content_points_min_content_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_margins_auto_margins_override_stretch.rs b/tests/generated/grid/grid_margins_auto_margins_override_stretch.rs index 9fcde484f..4ee1cab31 100644 --- a/tests/generated/grid/grid_margins_auto_margins_override_stretch.rs +++ b/tests/generated/grid/grid_margins_auto_margins_override_stretch.rs @@ -24,11 +24,11 @@ fn grid_margins_auto_margins_override_stretch() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_maximum_single_item.rs b/tests/generated/grid/grid_max_content_maximum_single_item.rs index 3724e63a1..dee4c94ea 100644 --- a/tests/generated/grid/grid_max_content_maximum_single_item.rs +++ b/tests/generated/grid/grid_max_content_maximum_single_item.rs @@ -9,11 +9,11 @@ fn grid_max_content_maximum_single_item() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item.rs b/tests/generated/grid/grid_max_content_single_item.rs index 656718a8e..955aad3c7 100644 --- a/tests/generated/grid/grid_max_content_single_item.rs +++ b/tests/generated/grid/grid_max_content_single_item.rs @@ -9,11 +9,11 @@ fn grid_max_content_single_item() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_margin_auto.rs b/tests/generated/grid/grid_max_content_single_item_margin_auto.rs index de9fa152c..31efee2d7 100644 --- a/tests/generated/grid/grid_max_content_single_item_margin_auto.rs +++ b/tests/generated/grid/grid_max_content_single_item_margin_auto.rs @@ -17,11 +17,11 @@ fn grid_max_content_single_item_margin_auto() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_margin_fixed.rs b/tests/generated/grid/grid_max_content_single_item_margin_fixed.rs index 25957a693..c4ef5daad 100644 --- a/tests/generated/grid/grid_max_content_single_item_margin_fixed.rs +++ b/tests/generated/grid/grid_max_content_single_item_margin_fixed.rs @@ -17,11 +17,11 @@ fn grid_max_content_single_item_margin_fixed() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_margin_percent.rs b/tests/generated/grid/grid_max_content_single_item_margin_percent.rs index ac7deb0e8..b3f7974ff 100644 --- a/tests/generated/grid/grid_max_content_single_item_margin_percent.rs +++ b/tests/generated/grid/grid_max_content_single_item_margin_percent.rs @@ -17,11 +17,11 @@ fn grid_max_content_single_item_margin_percent() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_span_2.rs b/tests/generated/grid/grid_max_content_single_item_span_2.rs index 565387a45..567167c29 100644 --- a/tests/generated/grid/grid_max_content_single_item_span_2.rs +++ b/tests/generated/grid/grid_max_content_single_item_span_2.rs @@ -15,11 +15,11 @@ fn grid_max_content_single_item_span_2() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_span_2_gap_fixed.rs b/tests/generated/grid/grid_max_content_single_item_span_2_gap_fixed.rs index 71c515460..10935c63a 100644 --- a/tests/generated/grid/grid_max_content_single_item_span_2_gap_fixed.rs +++ b/tests/generated/grid/grid_max_content_single_item_span_2_gap_fixed.rs @@ -15,11 +15,11 @@ fn grid_max_content_single_item_span_2_gap_fixed() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_definite.rs b/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_definite.rs index f0f0dea7c..9603e1450 100644 --- a/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_definite.rs +++ b/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_definite.rs @@ -15,11 +15,11 @@ fn grid_max_content_single_item_span_2_gap_percent_definite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_indefinite.rs b/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_indefinite.rs index 483a2e695..e7befd584 100644 --- a/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_indefinite.rs +++ b/tests/generated/grid/grid_max_content_single_item_span_2_gap_percent_indefinite.rs @@ -15,11 +15,11 @@ fn grid_max_content_single_item_span_2_gap_percent_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_width_greater_than_max_content.rs b/tests/generated/grid/grid_max_width_greater_than_max_content.rs index bb10a199c..766e50ce6 100644 --- a/tests/generated/grid/grid_max_width_greater_than_max_content.rs +++ b/tests/generated/grid/grid_max_width_greater_than_max_content.rs @@ -8,11 +8,11 @@ fn grid_max_width_greater_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_max_width_greater_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_width_less_than_max_content_with_min_content.rs b/tests/generated/grid/grid_max_width_less_than_max_content_with_min_content.rs index d7c31484b..ff5388ae7 100644 --- a/tests/generated/grid/grid_max_width_less_than_max_content_with_min_content.rs +++ b/tests/generated/grid/grid_max_width_less_than_max_content_with_min_content.rs @@ -8,11 +8,11 @@ fn grid_max_width_less_than_max_content_with_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_max_width_less_than_max_content_with_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_width_smaller_than_max_content.rs b/tests/generated/grid/grid_max_width_smaller_than_max_content.rs index 34379d6e3..469298897 100644 --- a/tests/generated/grid/grid_max_width_smaller_than_max_content.rs +++ b/tests/generated/grid/grid_max_width_smaller_than_max_content.rs @@ -8,11 +8,11 @@ fn grid_max_width_smaller_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_max_width_smaller_than_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_max_width_smaller_than_min_content.rs b/tests/generated/grid/grid_max_width_smaller_than_min_content.rs index 25680f976..ad1f4e10f 100644 --- a/tests/generated/grid/grid_max_width_smaller_than_min_content.rs +++ b/tests/generated/grid/grid_max_width_smaller_than_min_content.rs @@ -8,11 +8,11 @@ fn grid_max_width_smaller_than_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_max_width_smaller_than_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_column.rs b/tests/generated/grid/grid_min_content_flex_column.rs index bbc494654..fd5fc2a9f 100644 --- a/tests/generated/grid/grid_min_content_flex_column.rs +++ b/tests/generated/grid/grid_min_content_flex_column.rs @@ -8,11 +8,11 @@ fn grid_min_content_flex_column() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_min_content_flex_column() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -38,11 +38,11 @@ fn grid_min_content_flex_column() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_row.rs b/tests/generated/grid/grid_min_content_flex_row.rs index bef43aa9e..0e6b59db2 100644 --- a/tests/generated/grid/grid_min_content_flex_row.rs +++ b/tests/generated/grid/grid_min_content_flex_row.rs @@ -8,11 +8,11 @@ fn grid_min_content_flex_row() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn grid_min_content_flex_row() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -38,11 +38,11 @@ fn grid_min_content_flex_row() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_single_item.rs b/tests/generated/grid/grid_min_content_flex_single_item.rs index fda18a643..d0c5c30ad 100644 --- a/tests/generated/grid/grid_min_content_flex_single_item.rs +++ b/tests/generated/grid/grid_min_content_flex_single_item.rs @@ -23,11 +23,11 @@ fn grid_min_content_flex_single_item() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_single_item_margin_auto.rs b/tests/generated/grid/grid_min_content_flex_single_item_margin_auto.rs index 6277beb46..d0693d6da 100644 --- a/tests/generated/grid/grid_min_content_flex_single_item_margin_auto.rs +++ b/tests/generated/grid/grid_min_content_flex_single_item_margin_auto.rs @@ -35,11 +35,11 @@ fn grid_min_content_flex_single_item_margin_auto() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_single_item_margin_fixed.rs b/tests/generated/grid/grid_min_content_flex_single_item_margin_fixed.rs index 134b5f108..adf6fe572 100644 --- a/tests/generated/grid/grid_min_content_flex_single_item_margin_fixed.rs +++ b/tests/generated/grid/grid_min_content_flex_single_item_margin_fixed.rs @@ -35,11 +35,11 @@ fn grid_min_content_flex_single_item_margin_fixed() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_flex_single_item_margin_percent.rs b/tests/generated/grid/grid_min_content_flex_single_item_margin_percent.rs index cce04d6e7..1bae40e46 100644 --- a/tests/generated/grid/grid_min_content_flex_single_item_margin_percent.rs +++ b/tests/generated/grid/grid_min_content_flex_single_item_margin_percent.rs @@ -35,11 +35,11 @@ fn grid_min_content_flex_single_item_margin_percent() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_maximum_single_item.rs b/tests/generated/grid/grid_min_content_maximum_single_item.rs index 45c9750d3..eae8a286c 100644 --- a/tests/generated/grid/grid_min_content_maximum_single_item.rs +++ b/tests/generated/grid/grid_min_content_maximum_single_item.rs @@ -9,11 +9,11 @@ fn grid_min_content_maximum_single_item() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_min_content_single_item.rs b/tests/generated/grid/grid_min_content_single_item.rs index f1d243d61..a2f1a0bec 100644 --- a/tests/generated/grid/grid_min_content_single_item.rs +++ b/tests/generated/grid/grid_min_content_single_item.rs @@ -9,11 +9,11 @@ fn grid_min_content_single_item() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_auto_fixed_10px.rs b/tests/generated/grid/grid_minmax_auto_fixed_10px.rs index 64ce798c9..122f17e6b 100644 --- a/tests/generated/grid/grid_minmax_auto_fixed_10px.rs +++ b/tests/generated/grid/grid_minmax_auto_fixed_10px.rs @@ -8,11 +8,11 @@ fn grid_minmax_auto_fixed_10px() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_auto_max_content.rs b/tests/generated/grid/grid_minmax_auto_max_content.rs index 982fd3fe3..bcc4b3c6f 100644 --- a/tests/generated/grid/grid_minmax_auto_max_content.rs +++ b/tests/generated/grid/grid_minmax_auto_max_content.rs @@ -8,11 +8,11 @@ fn grid_minmax_auto_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_auto_min_content.rs b/tests/generated/grid/grid_minmax_auto_min_content.rs index d3627efd4..600df4110 100644 --- a/tests/generated/grid/grid_minmax_auto_min_content.rs +++ b/tests/generated/grid/grid_minmax_auto_min_content.rs @@ -8,11 +8,11 @@ fn grid_minmax_auto_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_auto_percent_definite.rs b/tests/generated/grid/grid_minmax_auto_percent_definite.rs index 5cea766f6..e47d22e09 100644 --- a/tests/generated/grid/grid_minmax_auto_percent_definite.rs +++ b/tests/generated/grid/grid_minmax_auto_percent_definite.rs @@ -8,11 +8,11 @@ fn grid_minmax_auto_percent_definite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_auto_percent_indefinite.rs b/tests/generated/grid/grid_minmax_auto_percent_indefinite.rs index a130ced17..d4d5a31f4 100644 --- a/tests/generated/grid/grid_minmax_auto_percent_indefinite.rs +++ b/tests/generated/grid/grid_minmax_auto_percent_indefinite.rs @@ -8,11 +8,11 @@ fn grid_minmax_auto_percent_indefinite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_1fr.rs b/tests/generated/grid/grid_minmax_max_content_1fr.rs index 5a3c3bd15..24c4e6dc8 100644 --- a/tests/generated/grid/grid_minmax_max_content_1fr.rs +++ b/tests/generated/grid/grid_minmax_max_content_1fr.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_1fr() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_auto.rs b/tests/generated/grid/grid_minmax_max_content_auto.rs index 5741d3ef5..f2c02bbf8 100644 --- a/tests/generated/grid/grid_minmax_max_content_auto.rs +++ b/tests/generated/grid/grid_minmax_max_content_auto.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_auto() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_fixed_10px.rs b/tests/generated/grid/grid_minmax_max_content_fixed_10px.rs index 3c6a76868..bff060443 100644 --- a/tests/generated/grid/grid_minmax_max_content_fixed_10px.rs +++ b/tests/generated/grid/grid_minmax_max_content_fixed_10px.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_fixed_10px() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_min_content.rs b/tests/generated/grid/grid_minmax_max_content_min_content.rs index a103a7fae..b05825fd6 100644 --- a/tests/generated/grid/grid_minmax_max_content_min_content.rs +++ b/tests/generated/grid/grid_minmax_max_content_min_content.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_min_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_percent_definite.rs b/tests/generated/grid/grid_minmax_max_content_percent_definite.rs index 52ebf4c1b..c71b4eb07 100644 --- a/tests/generated/grid/grid_minmax_max_content_percent_definite.rs +++ b/tests/generated/grid/grid_minmax_max_content_percent_definite.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_percent_definite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_max_content_percent_indefinite.rs b/tests/generated/grid/grid_minmax_max_content_percent_indefinite.rs index 0a45cd33b..161601c9d 100644 --- a/tests/generated/grid/grid_minmax_max_content_percent_indefinite.rs +++ b/tests/generated/grid/grid_minmax_max_content_percent_indefinite.rs @@ -8,11 +8,11 @@ fn grid_minmax_max_content_percent_indefinite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_1fr.rs b/tests/generated/grid/grid_minmax_min_content_1fr.rs index d083bb31f..21b94eba6 100644 --- a/tests/generated/grid/grid_minmax_min_content_1fr.rs +++ b/tests/generated/grid/grid_minmax_min_content_1fr.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_1fr() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_auto.rs b/tests/generated/grid/grid_minmax_min_content_auto.rs index 492a6feea..989109a91 100644 --- a/tests/generated/grid/grid_minmax_min_content_auto.rs +++ b/tests/generated/grid/grid_minmax_min_content_auto.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_auto() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_fixed_10px.rs b/tests/generated/grid/grid_minmax_min_content_fixed_10px.rs index ff1423396..41c37ac0d 100644 --- a/tests/generated/grid/grid_minmax_min_content_fixed_10px.rs +++ b/tests/generated/grid/grid_minmax_min_content_fixed_10px.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_fixed_10px() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_max_content.rs b/tests/generated/grid/grid_minmax_min_content_max_content.rs index 0b5f8a57f..4e8be75d4 100644 --- a/tests/generated/grid/grid_minmax_min_content_max_content.rs +++ b/tests/generated/grid/grid_minmax_min_content_max_content.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_max_content() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_percent_definite.rs b/tests/generated/grid/grid_minmax_min_content_percent_definite.rs index 759096e84..be71cb279 100644 --- a/tests/generated/grid/grid_minmax_min_content_percent_definite.rs +++ b/tests/generated/grid/grid_minmax_min_content_percent_definite.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_percent_definite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_minmax_min_content_percent_indefinite.rs b/tests/generated/grid/grid_minmax_min_content_percent_indefinite.rs index d76d2b9bd..bd6fa1d89 100644 --- a/tests/generated/grid/grid_minmax_min_content_percent_indefinite.rs +++ b/tests/generated/grid/grid_minmax_min_content_percent_indefinite.rs @@ -8,11 +8,11 @@ fn grid_minmax_min_content_percent_indefinite() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_overflow_inline_axis_hidden.rs b/tests/generated/grid/grid_overflow_inline_axis_hidden.rs index 071ea6896..03ae544e8 100644 --- a/tests/generated/grid/grid_overflow_inline_axis_hidden.rs +++ b/tests/generated/grid/grid_overflow_inline_axis_hidden.rs @@ -15,11 +15,11 @@ fn grid_overflow_inline_axis_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_overflow_inline_axis_scroll.rs b/tests/generated/grid/grid_overflow_inline_axis_scroll.rs index 7fac02426..d62578613 100644 --- a/tests/generated/grid/grid_overflow_inline_axis_scroll.rs +++ b/tests/generated/grid/grid_overflow_inline_axis_scroll.rs @@ -15,11 +15,11 @@ fn grid_overflow_inline_axis_scroll() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_overflow_inline_axis_visible.rs b/tests/generated/grid/grid_overflow_inline_axis_visible.rs index 39328e75f..af556dfc0 100644 --- a/tests/generated/grid/grid_overflow_inline_axis_visible.rs +++ b/tests/generated/grid/grid_overflow_inline_axis_visible.rs @@ -8,11 +8,11 @@ fn grid_overflow_inline_axis_visible() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_overflow_rows.rs b/tests/generated/grid/grid_overflow_rows.rs index f58cf5a53..d77be3aff 100644 --- a/tests/generated/grid/grid_overflow_rows.rs +++ b/tests/generated/grid/grid_overflow_rows.rs @@ -11,11 +11,11 @@ fn grid_overflow_rows() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHHHHHHHH\u{200b}HHHHHHHHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_relayout_vertical_text.rs b/tests/generated/grid/grid_relayout_vertical_text.rs index 626397f80..ce398c9d8 100644 --- a/tests/generated/grid/grid_relayout_vertical_text.rs +++ b/tests/generated/grid/grid_relayout_vertical_text.rs @@ -8,11 +8,11 @@ fn grid_relayout_vertical_text() { taffy::style::Style { ..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"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Vertical, + crate::WritingMode::Vertical, None, ) }), @@ -23,11 +23,11 @@ fn grid_relayout_vertical_text() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_size_child_fixed_tracks.rs b/tests/generated/grid/grid_size_child_fixed_tracks.rs index 0da7821cd..5c8103c58 100644 --- a/tests/generated/grid/grid_size_child_fixed_tracks.rs +++ b/tests/generated/grid/grid_size_child_fixed_tracks.rs @@ -12,11 +12,11 @@ fn grid_size_child_fixed_tracks() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -31,11 +31,11 @@ fn grid_size_child_fixed_tracks() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHH\u{200b}HHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -50,11 +50,11 @@ fn grid_size_child_fixed_tracks() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -70,11 +70,11 @@ fn grid_size_child_fixed_tracks() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -90,11 +90,11 @@ fn grid_size_child_fixed_tracks() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH\u{200b}HH\u{200b}HH\u{200b}HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite.rs b/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite.rs index cc9df8651..433a19d8b 100644 --- a/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite.rs +++ b/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite.rs @@ -11,11 +11,11 @@ fn grid_span_13_most_non_flex_with_minmax_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHHHHHHHH\u{200b}HHHHHHHHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs b/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs index 1100241a8..0dc03ab34 100644 --- a/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_13_most_non_flex_with_minmax_indefinite_hidden.rs @@ -16,11 +16,11 @@ fn grid_span_13_most_non_flex_with_minmax_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHHHHHHHHHH\u{200b}HHHHHHHHHHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_auto_indefinite.rs b/tests/generated/grid/grid_span_2_max_content_auto_indefinite.rs index 3c796234f..d37918ad2 100644 --- a/tests/generated/grid/grid_span_2_max_content_auto_indefinite.rs +++ b/tests/generated/grid/grid_span_2_max_content_auto_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_max_content_auto_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite.rs b/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite.rs index 5aa392272..221de6295 100644 --- a/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite.rs +++ b/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_max_content_fit_content_10px_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs index 5564c2c42..4c739478a 100644 --- a/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_max_content_fit_content_10px_indefinite_hidden.rs @@ -31,11 +31,11 @@ fn grid_span_2_max_content_fit_content_10px_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite.rs b/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite.rs index be7c3f5b9..158f9db91 100644 --- a/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite.rs +++ b/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_max_content_fit_content_80px_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs index b95a7f766..45a5656c8 100644 --- a/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_max_content_fit_content_80px_indefinite_hidden.rs @@ -31,11 +31,11 @@ fn grid_span_2_max_content_fit_content_80px_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_max_content_max_content_indefinite.rs b/tests/generated/grid/grid_span_2_max_content_max_content_indefinite.rs index a509d265a..77bbbdf6e 100644 --- a/tests/generated/grid/grid_span_2_max_content_max_content_indefinite.rs +++ b/tests/generated/grid/grid_span_2_max_content_max_content_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_max_content_max_content_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_auto_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_auto_indefinite.rs index ef9405107..3e12bd2f2 100644 --- a/tests/generated/grid/grid_span_2_min_content_auto_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_auto_indefinite.rs @@ -13,11 +13,11 @@ fn grid_span_2_min_content_auto_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_auto_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_min_content_auto_indefinite_hidden.rs index eb72e0a16..c04d1d0ae 100644 --- a/tests/generated/grid/grid_span_2_min_content_auto_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_min_content_auto_indefinite_hidden.rs @@ -18,11 +18,11 @@ fn grid_span_2_min_content_auto_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite.rs index 358f3ad28..0513b9487 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_min_content_fit_content_10px_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs index 920c600d9..c83692f56 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_10px_indefinite_hidden.rs @@ -31,11 +31,11 @@ fn grid_span_2_min_content_fit_content_10px_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite.rs index ea2da939a..5a98bc509 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_min_content_fit_content_30px_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs index 5d5ffd58c..cbc67914b 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_30px_indefinite_hidden.rs @@ -31,11 +31,11 @@ fn grid_span_2_min_content_fit_content_30px_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite.rs index 6eb056233..f30f26071 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_min_content_fit_content_80px_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs b/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs index 4f0123925..ac574eebc 100644 --- a/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_2_min_content_fit_content_80px_indefinite_hidden.rs @@ -31,11 +31,11 @@ fn grid_span_2_min_content_fit_content_80px_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_max_content_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_max_content_indefinite.rs index c451e2002..137c49795 100644 --- a/tests/generated/grid/grid_span_2_min_content_max_content_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_max_content_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_min_content_max_content_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_2_min_content_min_content_indefinite.rs b/tests/generated/grid/grid_span_2_min_content_min_content_indefinite.rs index 9349e7e4e..45ec76c86 100644 --- a/tests/generated/grid/grid_span_2_min_content_min_content_indefinite.rs +++ b/tests/generated/grid/grid_span_2_min_content_min_content_indefinite.rs @@ -26,11 +26,11 @@ fn grid_span_2_min_content_min_content_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH\u{200b}HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_6_all_non_flex_indefinite.rs b/tests/generated/grid/grid_span_6_all_non_flex_indefinite.rs index c87311a43..6040b4d3f 100644 --- a/tests/generated/grid/grid_span_6_all_non_flex_indefinite.rs +++ b/tests/generated/grid/grid_span_6_all_non_flex_indefinite.rs @@ -11,11 +11,11 @@ fn grid_span_6_all_non_flex_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHH\u{200b}HHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_6_all_non_flex_indefinite_hidden.rs b/tests/generated/grid/grid_span_6_all_non_flex_indefinite_hidden.rs index d107cc7b3..ae8a298d3 100644 --- a/tests/generated/grid/grid_span_6_all_non_flex_indefinite_hidden.rs +++ b/tests/generated/grid/grid_span_6_all_non_flex_indefinite_hidden.rs @@ -16,11 +16,11 @@ fn grid_span_6_all_non_flex_indefinite_hidden() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHH\u{200b}HHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/grid/grid_span_8_all_track_types_indefinite.rs b/tests/generated/grid/grid_span_8_all_track_types_indefinite.rs index ea033c9de..1097ff3f8 100644 --- a/tests/generated/grid/grid_span_8_all_track_types_indefinite.rs +++ b/tests/generated/grid/grid_span_8_all_track_types_indefinite.rs @@ -11,11 +11,11 @@ fn grid_span_8_all_track_types_indefinite() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHHHHHH\u{200b}HHHHHHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/gridflex/gridflex_column_integration.rs b/tests/generated/gridflex/gridflex_column_integration.rs index d0ff449b1..0f2672a60 100644 --- a/tests/generated/gridflex/gridflex_column_integration.rs +++ b/tests/generated/gridflex/gridflex_column_integration.rs @@ -8,11 +8,11 @@ fn gridflex_column_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn gridflex_column_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -38,11 +38,11 @@ fn gridflex_column_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -53,11 +53,11 @@ fn gridflex_column_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/gridflex/gridflex_kitchen_sink.rs b/tests/generated/gridflex/gridflex_kitchen_sink.rs index ec4bfc347..16da7ab8e 100644 --- a/tests/generated/gridflex/gridflex_kitchen_sink.rs +++ b/tests/generated/gridflex/gridflex_kitchen_sink.rs @@ -45,11 +45,11 @@ fn gridflex_kitchen_sink() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -60,11 +60,11 @@ fn gridflex_kitchen_sink() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -75,11 +75,11 @@ fn gridflex_kitchen_sink() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/gridflex/gridflex_row_integration.rs b/tests/generated/gridflex/gridflex_row_integration.rs index 9b2a2141d..61576b4b5 100644 --- a/tests/generated/gridflex/gridflex_row_integration.rs +++ b/tests/generated/gridflex/gridflex_row_integration.rs @@ -8,11 +8,11 @@ fn gridflex_row_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -23,11 +23,11 @@ fn gridflex_row_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -38,11 +38,11 @@ fn gridflex_row_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), @@ -53,11 +53,11 @@ fn gridflex_row_integration() { taffy::style::Style { ..Default::default() }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_x_axis.rs b/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_x_axis.rs index b53a8b89d..e17296c10 100644 --- a/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_x_axis.rs +++ b/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_x_axis.rs @@ -19,11 +19,11 @@ fn leaf_overflow_scrollbars_affect_available_space_x_axis() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_y_axis.rs b/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_y_axis.rs index d54ce85da..e41a36448 100644 --- a/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_y_axis.rs +++ b/tests/generated/leaf/leaf_overflow_scrollbars_affect_available_space_y_axis.rs @@ -19,11 +19,11 @@ fn leaf_overflow_scrollbars_affect_available_space_y_axis() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H\u{a0}H"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_both_axis.rs b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_both_axis.rs index d4ad904a5..b24d97364 100644 --- a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_both_axis.rs +++ b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_both_axis.rs @@ -15,11 +15,11 @@ fn leaf_overflow_scrollbars_take_up_space_both_axis() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_x_axis.rs b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_x_axis.rs index cc980ff83..b97aade4e 100644 --- a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_x_axis.rs +++ b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_x_axis.rs @@ -15,11 +15,11 @@ fn leaf_overflow_scrollbars_take_up_space_x_axis() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_y_axis.rs b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_y_axis.rs index 9000d74a4..f7adf543f 100644 --- a/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_y_axis.rs +++ b/tests/generated/leaf/leaf_overflow_scrollbars_take_up_space_y_axis.rs @@ -15,11 +15,11 @@ fn leaf_overflow_scrollbars_take_up_space_y_axis() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_with_content_and_border.rs b/tests/generated/leaf/leaf_with_content_and_border.rs index e1bb76c5c..af47c13a0 100644 --- a/tests/generated/leaf/leaf_with_content_and_border.rs +++ b/tests/generated/leaf/leaf_with_content_and_border.rs @@ -16,11 +16,11 @@ fn leaf_with_content_and_border() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_with_content_and_padding.rs b/tests/generated/leaf/leaf_with_content_and_padding.rs index addc54cc9..8cae6c5cd 100644 --- a/tests/generated/leaf/leaf_with_content_and_padding.rs +++ b/tests/generated/leaf/leaf_with_content_and_padding.rs @@ -16,11 +16,11 @@ fn leaf_with_content_and_padding() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/leaf/leaf_with_content_and_padding_border.rs b/tests/generated/leaf/leaf_with_content_and_padding_border.rs index f248b7ba2..17a2cf52c 100644 --- a/tests/generated/leaf/leaf_with_content_and_padding_border.rs +++ b/tests/generated/leaf/leaf_with_content_and_padding_border.rs @@ -22,11 +22,11 @@ fn leaf_with_content_and_padding_border() { }, taffy::tree::MeasureFunc::Raw(|known_dimensions, available_space| { const TEXT: &str = "HHHH"; - crate::generated::measure_standard_text( + crate::measure_standard_text( known_dimensions, available_space, TEXT, - crate::generated::WritingMode::Horizontal, + crate::WritingMode::Horizontal, None, ) }), diff --git a/tests/generated/mod.rs b/tests/generated/mod.rs index a746b2f03..e02bffaf5 100644 --- a/tests/generated/mod.rs +++ b/tests/generated/mod.rs @@ -5,65 +5,3 @@ mod flex; mod grid; mod gridflex; mod leaf; -#[allow(dead_code)] -#[derive(Debug, Clone, Copy, PartialEq, Eq)] -enum WritingMode { - Horizontal, - Vertical, -} -#[allow(dead_code)] -fn measure_standard_text( - known_dimensions: taffy::geometry::Size>, - available_space: taffy::geometry::Size, - text_content: &str, - writing_mode: WritingMode, - _aspect_ratio: Option, -) -> taffy::geometry::Size { - use taffy::geometry::AbsoluteAxis; - use taffy::prelude::*; - const ZWS: char = '\u{200B}'; - const H_WIDTH: f32 = 10.0; - const H_HEIGHT: f32 = 10.0; - if let Size { width: Some(width), height: Some(height) } = known_dimensions { - return Size { width, height }; - } - let inline_axis = match writing_mode { - WritingMode::Horizontal => AbsoluteAxis::Horizontal, - WritingMode::Vertical => AbsoluteAxis::Vertical, - }; - let block_axis = inline_axis.other_axis(); - let lines: Vec<&str> = text_content.split(ZWS).collect(); - if lines.is_empty() { - return Size::ZERO; - } - let min_line_length: usize = lines.iter().map(|line| line.len()).max().unwrap_or(0); - let max_line_length: usize = lines.iter().map(|line| line.len()).sum(); - let inline_size = - known_dimensions.get_abs(inline_axis).unwrap_or_else(|| match available_space.get_abs(inline_axis) { - AvailableSpace::MinContent => min_line_length as f32 * H_WIDTH, - AvailableSpace::MaxContent => max_line_length as f32 * H_WIDTH, - AvailableSpace::Definite(inline_size) => { - inline_size.min(max_line_length as f32 * H_WIDTH).max(min_line_length as f32 * H_WIDTH) - } - }); - let block_size = known_dimensions.get_abs(block_axis).unwrap_or_else(|| { - let inline_line_length = (inline_size / H_WIDTH).floor() as usize; - let mut line_count = 1; - let mut current_line_length = 0; - for line in &lines { - if current_line_length + line.len() > inline_line_length { - if current_line_length > 0 { - line_count += 1 - }; - current_line_length = line.len(); - } else { - current_line_length += line.len(); - }; - } - (line_count as f32) * H_HEIGHT - }); - match writing_mode { - WritingMode::Horizontal => Size { width: inline_size, height: block_size }, - WritingMode::Vertical => Size { width: block_size, height: inline_size }, - } -}