From 11b3e3b77581086ac23d2f229f9ff577293b9a67 Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Mon, 27 Apr 2015 17:38:37 +0200 Subject: [PATCH] Remove some usage of `.as_slice()`. --- components/layout/table.rs | 20 ++++++++------------ components/layout/table_row.rs | 2 +- components/layout/table_rowgroup.rs | 6 +++--- components/layout/table_wrapper.rs | 2 +- 4 files changed, 13 insertions(+), 17 deletions(-) diff --git a/components/layout/table.rs b/components/layout/table.rs index 3731f4c524d..1733706a95c 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -284,14 +284,12 @@ impl Flow for TableFlow { NextBlockCollapsedBorders::FromNextRow( &next_sibling.as_immutable_table_rowgroup() .preliminary_collapsed_borders - .block_start - .as_slice()) + .block_start) } else { NextBlockCollapsedBorders::FromNextRow( &next_sibling.as_immutable_table_row() .preliminary_collapsed_borders - .block_start - .as_slice()) + .block_start) } } None => { @@ -352,14 +350,12 @@ impl Flow for TableFlow { NextBlockCollapsedBorders::FromNextRow( &grandkid_next_sibling.as_immutable_table_rowgroup() .preliminary_collapsed_borders - .block_start - .as_slice()) + .block_start) } else { NextBlockCollapsedBorders::FromNextRow( &grandkid_next_sibling.as_immutable_table_row() .preliminary_collapsed_borders - .block_start - .as_slice()) + .block_start) } } None => { @@ -483,9 +479,9 @@ impl Flow for TableFlow { self.block_flow.base.flags.remove(IMPACTED_BY_LEFT_FLOATS); self.block_flow.base.flags.remove(IMPACTED_BY_RIGHT_FLOATS); - let column_computed_inline_sizes = self.column_computed_inline_sizes.as_slice(); + let column_computed_inline_sizes = &self.column_computed_inline_sizes; let collapsed_inline_direction_border_widths_for_table = - self.collapsed_inline_direction_border_widths_for_table.as_slice(); + &self.collapsed_inline_direction_border_widths_for_table; let mut collapsed_block_direction_border_widths_for_table = self.collapsed_block_direction_border_widths_for_table.iter().peekable(); self.block_flow.propagate_assigned_inline_size_to_children(layout_context, @@ -509,12 +505,12 @@ impl Flow for TableFlow { if child_flow.is_table_row() { let child_table_row = child_flow.as_table_row(); child_table_row.populate_collapsed_border_spacing( - collapsed_inline_direction_border_widths_for_table.as_slice(), + collapsed_inline_direction_border_widths_for_table, &mut collapsed_block_direction_border_widths_for_table); } else if child_flow.is_table_rowgroup() { let child_table_rowgroup = child_flow.as_table_rowgroup(); child_table_rowgroup.populate_collapsed_border_spacing( - collapsed_inline_direction_border_widths_for_table.as_slice(), + collapsed_inline_direction_border_widths_for_table, &mut collapsed_block_direction_border_widths_for_table); } }) diff --git a/components/layout/table_row.rs b/components/layout/table_row.rs index bcc0bda925e..9170fe8fb9e 100644 --- a/components/layout/table_row.rs +++ b/components/layout/table_row.rs @@ -380,7 +380,7 @@ impl Flow for TableRowFlow { child_index, content_inline_size, writing_mode, - computed_inline_size_for_cells.as_slice(), + &computed_inline_size_for_cells, &spacing, &border_collapse_info, inline_start_margin_edge) diff --git a/components/layout/table_rowgroup.rs b/components/layout/table_rowgroup.rs index 1a2ea96d0d3..03e138200ae 100644 --- a/components/layout/table_rowgroup.rs +++ b/components/layout/table_rowgroup.rs @@ -158,10 +158,10 @@ impl Flow for TableRowGroupFlow { containing_block_inline_size, border_collapse); - let column_computed_inline_sizes = self.column_computed_inline_sizes.as_slice(); + let column_computed_inline_sizes = &self.column_computed_inline_sizes; let border_spacing = self.spacing; let collapsed_inline_direction_border_widths_for_table = - self.collapsed_inline_direction_border_widths_for_table.as_slice(); + &self.collapsed_inline_direction_border_widths_for_table; let mut collapsed_block_direction_border_widths_for_table = self.collapsed_block_direction_border_widths_for_table.iter().peekable(); self.block_flow.propagate_assigned_inline_size_to_children(layout_context, @@ -186,7 +186,7 @@ impl Flow for TableRowGroupFlow { if border_collapse == border_collapse::T::collapse { let child_table_row = child_flow.as_table_row(); child_table_row.populate_collapsed_border_spacing( - collapsed_inline_direction_border_widths_for_table.as_slice(), + collapsed_inline_direction_border_widths_for_table, &mut collapsed_block_direction_border_widths_for_table); } }); diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index 6eb0839925e..8e85604bb2c 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -351,7 +351,7 @@ impl Flow for TableWrapperFlow { child_index, content_inline_size, writing_mode, - assigned_column_inline_sizes.as_slice(), + assigned_column_inline_sizes, &border_spacing, &None, inline_start_margin_edge)