diff options
Diffstat (limited to 'components/layout/parallel.rs')
| -rw-r--r-- | components/layout/parallel.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index f510851ce92..3a5a956e28c 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -29,7 +29,7 @@ pub type FlowList = SmallVec<[UnsafeFlow; CHUNK_SIZE]>; /// Vtable + pointer representation of a Flow trait object. #[derive(Clone, Copy, Eq, PartialEq)] -pub struct UnsafeFlow(*const Flow); +pub struct UnsafeFlow(*const dyn Flow); unsafe impl Sync for UnsafeFlow {} unsafe impl Send for UnsafeFlow {} @@ -73,7 +73,7 @@ impl FlowParallelInfo { fn bottom_up_flow(mut unsafe_flow: UnsafeFlow, assign_bsize_traversal: &AssignBSizes) { loop { // Get a real flow. - let flow: &mut Flow = unsafe { mem::transmute(unsafe_flow) }; + let flow: &mut dyn Flow = unsafe { mem::transmute(unsafe_flow) }; // Perform the appropriate traversal. if assign_bsize_traversal.should_process(flow) { @@ -97,7 +97,7 @@ fn bottom_up_flow(mut unsafe_flow: UnsafeFlow, assign_bsize_traversal: &AssignBS // No, we're not at the root yet. Then are we the last child // of our parent to finish processing? If so, we can continue // on with our parent; otherwise, we've gotta wait. - let parent: &mut Flow = unsafe { &mut *(unsafe_parent.0 as *mut Flow) }; + let parent: &mut dyn Flow = unsafe { &mut *(unsafe_parent.0 as *mut dyn Flow) }; let parent_base = parent.mut_base(); if parent_base .parallel @@ -127,7 +127,7 @@ fn top_down_flow<'scope>( let mut had_children = false; unsafe { // Get a real flow. - let flow: &mut Flow = mem::transmute(*unsafe_flow); + let flow: &mut dyn Flow = mem::transmute(*unsafe_flow); flow.mut_base().thread_id = pool.current_thread_index().unwrap() as u8; if assign_isize_traversal.should_process(flow) { @@ -191,7 +191,7 @@ fn top_down_flow<'scope>( /// Run the main layout passes in parallel. pub fn reflow( - root: &mut Flow, + root: &mut dyn Flow, profiler_metadata: Option<TimerMetadata>, time_profiler_chan: time::ProfilerChan, context: &LayoutContext, |