Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace .map_or(false with Option::is_some_and (#33468)

Browse source 
Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
Simon Wülker 2024-09-16 12:03:52 +02:00 • committed by GitHub
parent 236cae9ce5
commit 7df30f3788
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
51 changed files with 165 additions and 171 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/layout/display_list/builder.rs
View file

@ -505,9 +505,10 @@ impl<'a> DisplayListBuildState<'a> {
// Properly order display items that make up a stacking context. "Steps" here
// refer to the steps in CSS 2.1 Appendix E.
// Steps 1 and 2: Borders and background for the root.
while child_items.last().map_or(false, |child| {
child.section() == DisplayListSection::BackgroundAndBorders
}) {
while child_items
.last()
.is_some_and(|child| child.section() == DisplayListSection::BackgroundAndBorders)
{
list.push(child_items.pop().unwrap());
}
@ -515,31 +516,34 @@ impl<'a> DisplayListBuildState<'a> {
let mut child_stacking_contexts = child_stacking_contexts.into_iter().peekable();
while child_stacking_contexts
.peek()
.map_or(false, |child| child.z_index < 0)
.is_some_and(|child| child.z_index < 0)
{
let context = child_stacking_contexts.next().unwrap();
self.move_to_display_list_for_stacking_context(list, context);
}
// Step 4: Block backgrounds and borders.
while child_items.last().map_or(false, |child| {
child.section() == DisplayListSection::BlockBackgroundsAndBorders
}) {
while child_items
.last()
.is_some_and(|child| child.section() == DisplayListSection::BlockBackgroundsAndBorders)
{
list.push(child_items.pop().unwrap());
}
// Step 5: Floats.
while child_stacking_contexts.peek().map_or(false, |child| {
child.context_type == StackingContextType::PseudoFloat
}) {
while child_stacking_contexts
.peek()
.is_some_and(|child| child.context_type == StackingContextType::PseudoFloat)
{
let context = child_stacking_contexts.next().unwrap();
self.move_to_display_list_for_stacking_context(list, context);
}
// Step 6 & 7: Content and inlines that generate stacking contexts.
while child_items.last().map_or(false, |child| {
child.section() == DisplayListSection::Content
}) {
while child_items
.last()
.is_some_and(|child| child.section() == DisplayListSection::Content)
{
list.push(child_items.pop().unwrap());
}