Upgrade rayon_croissant to 0.2.0

components/layout_2020/Cargo.toml

@@ -25,7 +25,7 @@ msg = {path = "../msg"}
 net_traits = {path = "../net_traits"}
 range = {path = "../range"}
 rayon = "1"
-rayon_croissant = "0.1.1"
+rayon_croissant = "0.2.0"
 script_layout_interface = {path = "../script_layout_interface"}
 script_traits = {path = "../script_traits"}
 serde = "1.0"

components/layout_2020/flow/construct.rs

@@ -172,14 +172,6 @@ impl BlockContainer {
             contains_floats: ContainsFloats,
             outer_content_sizes_of_children: ContentSizes,
         }
-        impl Default for Accumulator {
-            fn default() -> Self {
-                Self {
-                    contains_floats: ContainsFloats::No,
-                    outer_content_sizes_of_children: ContentSizes::zero(),
-                }
-            }
-        }
         let mut acc = Accumulator {
             contains_floats: builder.contains_floats,
             outer_content_sizes_of_children: ContentSizes::zero(),
@@ -199,13 +191,21 @@ impl BlockContainer {
             builder
                 .block_level_boxes
                 .into_par_iter()
-                .mapfold_reduce_into(&mut acc, mapfold, |left, right| {
-                    left.contains_floats |= right.contains_floats;
-                    if content_sizes.requests_inline() {
-                        left.outer_content_sizes_of_children
-                            .max_assign(&right.outer_content_sizes_of_children)
-                    }
-                })
+                .mapfold_reduce_into(
+                    &mut acc,
+                    mapfold,
+                    || Accumulator {
+                        contains_floats: ContainsFloats::No,
+                        outer_content_sizes_of_children: ContentSizes::zero(),
+                    },
+                    |left, right| {
+                        left.contains_floats |= right.contains_floats;
+                        if content_sizes.requests_inline() {
+                            left.outer_content_sizes_of_children
+                                .max_assign(&right.outer_content_sizes_of_children)
+                        }
+                    },
+                )
                 .collect()
         } else {
             builder

components/layout_2020/flow/mod.rs

@@ -235,6 +235,7 @@ fn layout_block_level_children<'a>(
                             /* float_context = */ None,
                         )
                     },
+                    Default::default,
                     |left, right| left.append(right),
                 )
                 .collect();