diff options
author | Brandon Fairchild <csbit32@gmail.com> | 2015-09-17 17:55:01 -0400 |
---|---|---|
committer | Brandon Fairchild <csbit32@gmail.com> | 2015-09-19 12:50:14 -0400 |
commit | de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (patch) | |
tree | 1dd3e40e5a554466dfb4575758ad15967927d44d /components/layout/parallel.rs | |
parent | e924393be8cce6cb16d3af5a13ed9f634670f843 (diff) | |
download | servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.tar.gz servo-de3547e401a0ace8b6bfb4b488ed0be9d5b3d79c.zip |
Fix reported test-tidy errors for unmerged import blocks
This merges import blocks that were reported by tidy as unmerged.
Diffstat (limited to 'components/layout/parallel.rs')
-rw-r--r-- | components/layout/parallel.rs | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 576e9ae9f21..8b63159bec8 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -12,19 +12,18 @@ use context::{LayoutContext, SharedLayoutContext}; use flow; use flow::{Flow, MutableFlowUtils, PreorderFlowTraversal, PostorderFlowTraversal}; use flow_ref::{self, FlowRef}; +use profile_traits::time::{self, ProfilerMetadata, profile}; +use std::mem; +use std::sync::atomic::{AtomicIsize, Ordering}; use traversal::PostorderNodeMutTraversal; use traversal::{BubbleISizes, AssignISizes, AssignBSizesAndStoreOverflow}; use traversal::{ComputeAbsolutePositions, BuildDisplayList}; use traversal::{PreorderDomTraversal, PostorderDomTraversal}; use traversal::{RecalcStyleForNode, ConstructFlows}; -use wrapper::UnsafeLayoutNode; -use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_node, LayoutNode}; - -use profile_traits::time::{self, ProfilerMetadata, profile}; -use std::mem; -use std::sync::atomic::{AtomicIsize, Ordering}; use util::opts; use util::workqueue::{WorkQueue, WorkUnit, WorkerProxy}; +use wrapper::UnsafeLayoutNode; +use wrapper::{layout_node_to_unsafe_layout_node, layout_node_from_unsafe_layout_node, LayoutNode}; const CHUNK_SIZE: usize = 64; |