aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/layout_task.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-28 02:27:50 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-28 02:27:50 -0700
commitd373f8dc26239310dec8d2fd66ed72385548cf6f (patch)
tree09b45bc1bee59999e61359ef9647f87fa0626579 /components/layout/layout_task.rs
parent1a2a08aa501dd0da8bcdf362b55acb31093f5c9c (diff)
parentb8fb725af27c1d7d913618e09c4a246b7039f25e (diff)
downloadservo-d373f8dc26239310dec8d2fd66ed72385548cf6f.tar.gz
servo-d373f8dc26239310dec8d2fd66ed72385548cf6f.zip
auto merge of #4739 : Manishearth/servo/warning-patrol, r=Ms2ger
Diffstat (limited to 'components/layout/layout_task.rs')
-rw-r--r--components/layout/layout_task.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs
index acfd53d4e15..53491dfdc5e 100644
--- a/components/layout/layout_task.rs
+++ b/components/layout/layout_task.rs
@@ -8,12 +8,12 @@
use css::node_style::StyledNode;
use construct::ConstructionResult;
use context::{SharedLayoutContext, SharedLayoutContextWrapper};
-use flow::{mod, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
+use flow::{self, Flow, ImmutableFlowUtils, MutableFlowUtils, MutableOwnedFlowUtils};
use flow_ref::FlowRef;
use fragment::{Fragment, FragmentBorderBoxIterator};
use incremental::{LayoutDamageComputation, REFLOW, REFLOW_ENTIRE_DOCUMENT, REPAINT};
use layout_debug;
-use parallel::{mod, UnsafeFlow};
+use parallel::{self, UnsafeFlow};
use sequential;
use util::{LayoutDataAccess, LayoutDataWrapper, OpaqueNodeMethods, ToGfxColor};
use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode};