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

Migrate to the 2024 edition (#35755)

Browse source 
* Migrate to 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Allow unsafe_op_in_unsafe_fn lint

This lint warns by default in the 2024
edition, but is *way* too noisy for servo.

We might enable it in the future, but not now.

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

* Compile using the 2024 edition

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>

---------

Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2025-03-13 11:28:11 +01:00 • committed by GitHub
parent eb2ca42824
commit bb0d08432e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 317 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ impl<Node> AnonymousTableContent<'_, Node> {
fn is_whitespace_only(&self) -> bool {
match self {
Self::Element { .. } => false,
Self::Text(_, ref text) => text.chars().all(char_is_whitespace),
Self::Text(_, text) => text.chars().all(char_is_whitespace),
}
}
@ -170,7 +170,7 @@ impl Table {
let slot = self.get_slot(coords);
match slot {
Some(TableSlot::Cell(cell)) => vec![ResolvedSlotAndLocation { cell, coords }],
Some(TableSlot::Spanned(ref offsets)) => offsets
Some(TableSlot::Spanned(offsets)) => offsets
.iter()
.flat_map(|offset| self.resolve_slot_at(coords - *offset))
.collect(),
@ -434,7 +434,7 @@ impl TableBuilder {
for row_index in 0..self.table.size.height {
let last_row_index_in_group = self.last_row_index_in_row_group_at_row_n(row_index);
for cell in self.table.slots[row_index].iter_mut() {
if let TableSlot::Cell(ref mut cell) = cell {
if let TableSlot::Cell(cell) = cell {
if cell.rowspan == 1 {
continue;
}

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

@ -1093,7 +1093,7 @@ impl<'a> TableLayout<'a> {
.par_iter()
.enumerate()
.map(|(column_index, slot)| {
let TableSlot::Cell(ref cell) = slot else {
let TableSlot::Cell(cell) = slot else {
return None;
};
@ -2303,19 +2303,18 @@ impl<'a> RowFragmentLayout<'a> {
relative_adjustement(&self.row.style, containing_block_for_children);
}
let (inline_size, block_size) =
if let Some(ref row_group_layout) = row_group_fragment_layout {
self.rect.start_corner -= row_group_layout.rect.start_corner;
(
row_group_layout.rect.size.inline,
SizeConstraint::Definite(row_group_layout.rect.size.block),
)
} else {
(
containing_block_for_logical_conversion.size.inline,
containing_block_for_logical_conversion.size.block,
)
};
let (inline_size, block_size) = if let Some(row_group_layout) = row_group_fragment_layout {
self.rect.start_corner -= row_group_layout.rect.start_corner;
(
row_group_layout.rect.size.inline,
SizeConstraint::Definite(row_group_layout.rect.size.block),
)
} else {
(
containing_block_for_logical_conversion.size.inline,
containing_block_for_logical_conversion.size.block,
)
};
let row_group_containing_block = ContainingBlock {
size: ContainingBlockSize {