Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rayon to dedupe crossbeam-epoch

Browse source 
As a bonus this also removes one version of crossbeam-utils
This commit is contained in:
Bastien Orivel 2019-06-24 23:04:13 +02:00
parent df73c71fb1
commit 28fa0f8009
7 changed files with 39 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/layout/parallel.rs
View file

@ -116,7 +116,7 @@ fn bottom_up_flow(mut unsafe_flow: UnsafeFlow, assign_bsize_traversal: &AssignBS
fn top_down_flow<'scope>(
unsafe_flows: &[UnsafeFlow],
pool: &'scope rayon::ThreadPool,
scope: &rayon::Scope<'scope>,
scope: &rayon::ScopeFifo<'scope>,
assign_isize_traversal: &'scope AssignISizes,
assign_bsize_traversal: &'scope AssignBSizes,
) {
@ -166,7 +166,7 @@ fn top_down_flow<'scope>(
let first_chunk = chunks.next();
for chunk in chunks {
let nodes = chunk.iter().cloned().collect::<FlowList>();
scope.spawn(move |scope| {
scope.spawn_fifo(move |scope| {
top_down_flow(
&nodes,
pool,
@ -212,7 +212,7 @@ pub fn reflow(
let nodes = [UnsafeFlow(root)];
queue.install(move || {
rayon::scope(move |scope| {
rayon::scope_fifo(move |scope| {
profile(
time::ProfilerCategory::LayoutParallelWarmup,
profiler_metadata,