Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-21 13:25:34 +01: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

20
components/layout_2020/display_list/stacking_context.rs
View file

@ -678,7 +678,7 @@ impl StackingContext {
// Steps 1 and 2: Borders and background for the root
let mut contents = self.contents.iter().enumerate().peekable();
while contents.peek().map_or(false, |(_, child)| {
while contents.peek().is_some_and(|(_, child)| {
child.section() == StackingContextSection::OwnBackgroundsAndBorders
}) {
let (i, child) = contents.next().unwrap();
@ -694,7 +694,7 @@ impl StackingContext {
.peekable();
while real_stacking_contexts_and_positioned_stacking_containers
.peek()
.map_or(false, |(_, child)| child.z_index() < 0)
.is_some_and(|(_, child)| child.z_index() < 0)
{
let (i, child) = real_stacking_contexts_and_positioned_stacking_containers
.next()
@ -707,7 +707,7 @@ impl StackingContext {
}
// Step 4: Block backgrounds and borders
while contents.peek().map_or(false, |(_, child)| {
while contents.peek().is_some_and(|(_, child)| {
child.section() == StackingContextSection::DescendantBackgroundsAndBorders
}) {
let (i, child) = contents.next().unwrap();
@ -722,9 +722,10 @@ impl StackingContext {
}
// Steps 6 and 7: Fragments and inline stacking containers
while contents.peek().map_or(false, |(_, child)| {
child.section() == StackingContextSection::Foreground
}) {
while contents
.peek()
.is_some_and(|(_, child)| child.section() == StackingContextSection::Foreground)
{
let (i, child) = contents.next().unwrap();
self.debug_push_print_item(DebugPrintField::Contents, i);
child.build_display_list(builder, &self.atomic_inline_stacking_containers);
@ -741,9 +742,10 @@ impl StackingContext {
}
// Step 10: Outline
while contents.peek().map_or(false, |(_, child)| {
child.section() == StackingContextSection::Outline
}) {
while contents
.peek()
.is_some_and(|(_, child)| child.section() == StackingContextSection::Outline)
{
let (i, child) = contents.next().unwrap();
self.debug_push_print_item(DebugPrintField::Contents, i);
child.build_display_list(builder, &self.atomic_inline_stacking_containers);