aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2020-06-19 15:30:23 +0200
committerSimon Sapin <simon.sapin@exyr.org>2020-06-19 15:30:23 +0200
commit5fed956d65a92b1e36377b7ab96578f051ca090c (patch)
treeea5e7dbd4ee2af9690a4acab09e6d5c37d106c34 /components
parent51c388fe1cb3fd8259e8712cf0bc3b0c78c2f482 (diff)
downloadservo-5fed956d65a92b1e36377b7ab96578f051ca090c.tar.gz
servo-5fed956d65a92b1e36377b7ab96578f051ca090c.zip
Remove the now single-field `Accumulator` struct
Diffstat (limited to 'components')
-rw-r--r--components/layout_2020/flow/construct.rs22
1 files changed, 7 insertions, 15 deletions
diff --git a/components/layout_2020/flow/construct.rs b/components/layout_2020/flow/construct.rs
index 0f49fb85422..d4151e13c51 100644
--- a/components/layout_2020/flow/construct.rs
+++ b/components/layout_2020/flow/construct.rs
@@ -198,15 +198,10 @@ impl BlockContainer {
builder.end_ongoing_inline_formatting_context();
}
- struct Accumulator {
- contains_floats: ContainsFloats,
- }
- let mut acc = Accumulator {
- contains_floats: builder.contains_floats,
- };
- let mapfold = |acc: &mut Accumulator, creator: BlockLevelJob<'dom, _>| {
+ let mut contains_floats = builder.contains_floats;
+ let mapfold = |contains_floats: &mut ContainsFloats, creator: BlockLevelJob<'dom, _>| {
let (block_level_box, box_contains_floats) = creator.finish(context);
- acc.contains_floats |= box_contains_floats;
+ *contains_floats |= box_contains_floats;
block_level_box
};
let block_level_boxes = if context.use_rayon {
@@ -214,13 +209,11 @@ impl BlockContainer {
.block_level_boxes
.into_par_iter()
.mapfold_reduce_into(
- &mut acc,
+ &mut contains_floats,
mapfold,
- || Accumulator {
- contains_floats: ContainsFloats::No,
- },
+ || ContainsFloats::No,
|left, right| {
- left.contains_floats |= right.contains_floats;
+ *left |= right;
},
)
.collect()
@@ -228,12 +221,11 @@ impl BlockContainer {
builder
.block_level_boxes
.into_iter()
- .map(|x| mapfold(&mut acc, x))
+ .map(|x| mapfold(&mut contains_floats, x))
.collect()
};
let container = BlockContainer::BlockLevelBoxes(block_level_boxes);
- let Accumulator { contains_floats } = acc;
(container, contains_floats)
}
}