aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/parallel.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-19 13:34:51 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-19 13:34:51 -0600
commita0d3c9223f09757124b1520c4f17e94fa8bbe249 (patch)
tree1dd3e40e5a554466dfb4575758ad15967927d44d /components/layout/parallel.rs
parent7f2d81933a6158926ff6d03acbc05f191cd5adb3 (diff)
parentde3547e401a0ace8b6bfb4b488ed0be9d5b3d79c (diff)
downloadservo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.tar.gz
servo-a0d3c9223f09757124b1520c4f17e94fa8bbe249.zip
Auto merge of #7662 - nerith:import, r=frewsxcv
Check for multiple import blocks separated by whitespace Fixes #7381. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7662) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/parallel.rs')
-rw-r--r--components/layout/parallel.rs11
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;