Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

clippy: Fix warnings in components/layout_2020 (#31611)

Browse source 
* clippy: fix warnings in components/layout_2020

* fix: review comments
This commit is contained in:
eri 2024-03-11 15:24:33 +01:00 • committed by GitHub
parent 1d1f239ecc
commit b03411f567
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 59 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/layout_2020/table/construct.rs
View file

@ -704,8 +704,7 @@ where
});
let previous_text_decoration_line = self.current_text_decoration_line;
self.current_text_decoration_line =
self.current_text_decoration_line | info.style.clone_text_decoration_line();
self.current_text_decoration_line |= info.style.clone_text_decoration_line();
let new_row_group_index = self.builder.table.row_groups.len() - 1;
self.current_row_group_index = Some(new_row_group_index);
@ -953,6 +952,7 @@ where
contents: Contents,
box_slot: BoxSlot<'dom>,
) {
#[allow(clippy::collapsible_match)] //// TODO: Remove once the other cases are handled
match display {
DisplayGeneratingBox::LayoutInternal(internal) => match internal {
DisplayLayoutInternal::TableCell => {

13
components/layout_2020/table/layout.rs
View file

@ -374,8 +374,7 @@ impl<'a> TableLayout<'a> {
// > * 100% minus the sum of the intrinsic percentage width of all prior columns in
// > the table (further left when direction is "ltr" (right for "rtl"))
let mut total_intrinsic_percentage_width = 0.;
for column_index in 0..self.table.size.width {
let column_measure = &mut column_measures[column_index];
for column_measure in column_measures.iter_mut() {
let final_intrinsic_percentage_width = column_measure
.percentage
.0
@ -822,7 +821,7 @@ impl<'a> TableLayout<'a> {
/// This is an implementation of *Distributing excess width to columns* from
/// <https://drafts.csswg.org/css-tables/#distributing-width-to-columns>.
fn distribute_extra_width_to_columns(&self, column_sizes: &mut Vec<Au>, column_sizes_sum: Au) {
fn distribute_extra_width_to_columns(&self, column_sizes: &mut [Au], column_sizes_sum: Au) {
let all_columns = 0..self.table.size.width;
let extra_inline_size = self.assignable_width - column_sizes_sum;
@ -971,8 +970,8 @@ impl<'a> TableLayout<'a> {
for row_index in 0..self.table.slots.len() {
let row = &self.table.slots[row_index];
let mut cells_laid_out_row = Vec::new();
for column_index in 0..row.len() {
let cell = match &row[column_index] {
for (column_index, slot) in row.iter().enumerate() {
let cell = match slot {
TableSlot::Cell(cell) => cell,
_ => {
cells_laid_out_row.push(None);
@ -1088,6 +1087,7 @@ impl<'a> TableLayout<'a> {
row_sizes
}
#[allow(clippy::ptr_arg)] // Needs to be a vec because of the function above
/// After doing layout of table rows, calculate final row size and distribute space across
/// rowspanned cells. This follows the implementation of LayoutNG and the priority
/// agorithm described at <https://github.com/w3c/csswg-drafts/issues/4418>.
@ -1098,6 +1098,7 @@ impl<'a> TableLayout<'a> {
) {
let mut cells_to_distribute = Vec::new();
let mut total_percentage = 0.;
#[allow(clippy::needless_range_loop)] // It makes sense to use it here
for row_index in 0..self.table.size.height {
let row_measure = self
.table
@ -1186,7 +1187,7 @@ impl<'a> TableLayout<'a> {
&self,
mut excess_size: Au,
track_range: Range<usize>,
track_sizes: &mut Vec<Au>,
track_sizes: &mut [Au],
percentage_resolution_size: Option<Au>,
rowspan_distribution: bool,
) {