mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Update to rust 1.85 (#35628)
* Update to rust 1.85 This is needed for cargo-deny Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Upgrade crown Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Clippy fixes Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Re-upgrade cargo-deny to 0.18 Keeping it locked to 0.18 just in case they update their required rustc version again 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:
parent
d78f7b2d78
commit
be6765447d
36 changed files with 88 additions and 105 deletions
|
@ -98,7 +98,7 @@ impl DisplayList {
|
|||
/// but has to be unique to the entire scene.
|
||||
fn get_next_spatial_tree_item_key(&mut self) -> SpatialTreeItemKey {
|
||||
self.spatial_tree_count += 1;
|
||||
let pipeline_tag = (self.wr.pipeline_id.0 as u64) << 32 | self.wr.pipeline_id.1 as u64;
|
||||
let pipeline_tag = ((self.wr.pipeline_id.0 as u64) << 32) | self.wr.pipeline_id.1 as u64;
|
||||
SpatialTreeItemKey::new(pipeline_tag, self.spatial_tree_count)
|
||||
}
|
||||
|
||||
|
|
|
@ -2072,7 +2072,7 @@ impl FlexItem<'_> {
|
|||
(flex_axis == FlexAxis::Row && self.stretches());
|
||||
|
||||
let has_child_which_depends_on_block_constraints = fragments.iter().any(|fragment| {
|
||||
fragment.base().map_or(false,|base|
|
||||
fragment.base().is_some_and(|base|
|
||||
base.flags.contains(
|
||||
FragmentFlags::SIZE_DEPENDS_ON_BLOCK_CONSTRAINTS_AND_CAN_BE_CHILD_OF_FLEX_ITEM))
|
||||
});
|
||||
|
|
|
@ -302,7 +302,7 @@ impl PositioningContext {
|
|||
.is_empty() &&
|
||||
self.for_nearest_positioned_ancestor
|
||||
.as_ref()
|
||||
.map_or(true, |vector| vector.is_empty())
|
||||
.is_none_or(|vector| vector.is_empty())
|
||||
}
|
||||
|
||||
pub(crate) fn append(&mut self, other: Self) {
|
||||
|
|
|
@ -176,11 +176,7 @@ impl Table {
|
|||
}
|
||||
|
||||
fn resolve_first_cell(&self, coords: TableSlotCoordinates) -> Option<&TableSlotCell> {
|
||||
let resolved_coords = match self.resolve_first_cell_coords(coords) {
|
||||
Some(coords) => coords,
|
||||
None => return None,
|
||||
};
|
||||
|
||||
let resolved_coords = self.resolve_first_cell_coords(coords)?;
|
||||
let slot = self.get_slot(resolved_coords);
|
||||
match slot {
|
||||
Some(TableSlot::Cell(cell)) => Some(cell),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue