From 3f9032c1a19211f94ea20ce06eb29098486d1796 Mon Sep 17 00:00:00 2001 From: Dan Fox Date: Tue, 3 Mar 2015 18:16:50 +0000 Subject: [PATCH] Re-alphabetise imports --- components/layout/construct.rs | 22 +++++++++++----------- components/layout/layout_task.rs | 6 +++--- components/layout/wrapper.rs | 3 +-- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/components/layout/construct.rs b/components/layout/construct.rs index af8d151e101..dc128e216fd 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -13,36 +13,36 @@ #![deny(unsafe_blocks)] -use css::node_style::StyledNode; use block::BlockFlow; use context::LayoutContext; +use css::node_style::StyledNode; use floats::FloatKind; -use flow::{Flow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use flow::{Descendants, AbsDescendants}; +use flow::{Flow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use flow::{IS_ABSOLUTELY_POSITIONED}; use flow; use flow_ref::FlowRef; -use fragment::{Fragment, IframeFragmentInfo}; -use fragment::ImageFragmentInfo; use fragment::CanvasFragmentInfo; +use fragment::ImageFragmentInfo; use fragment::InlineAbsoluteHypotheticalFragmentInfo; -use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo}; use fragment::TableColumnFragmentInfo; use fragment::UnscannedTextFragmentInfo; +use fragment::{Fragment, IframeFragmentInfo}; +use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo}; use incremental::{RECONSTRUCT_FLOW, RestyleDamage}; use inline::InlineFlow; +use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; use list_item::{self, ListItemFlow}; +use opaque_node::OpaqueNodeMethods; use parallel; -use table_wrapper::TableWrapperFlow; use table::TableFlow; use table_caption::TableCaptionFlow; -use table_colgroup::TableColGroupFlow; -use table_rowgroup::TableRowGroupFlow; -use table_row::TableRowFlow; use table_cell::TableCellFlow; +use table_colgroup::TableColGroupFlow; +use table_row::TableRowFlow; +use table_rowgroup::TableRowGroupFlow; +use table_wrapper::TableWrapperFlow; use text::TextRunScanner; -use layout_data::{HAS_NEWLY_CONSTRUCTED_FLOW, LayoutDataAccess, LayoutDataWrapper}; -use opaque_node::OpaqueNodeMethods; use wrapper::{PostorderNodeMutTraversal, PseudoElementType, TLayoutNode, ThreadSafeLayoutNode}; use gfx::display_list::OpaqueNode; diff --git a/components/layout/layout_task.rs b/components/layout/layout_task.rs index c36e5a455ef..d700028465c 100644 --- a/components/layout/layout_task.rs +++ b/components/layout/layout_task.rs @@ -7,19 +7,19 @@ #![allow(unsafe_blocks)] -use css::node_style::StyledNode; use construct::ConstructionResult; use context::{SharedLayoutContext, SharedLayoutContextWrapper}; +use css::node_style::StyledNode; use display_list_builder::ToGfxColor; 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_data::{LayoutDataAccess, LayoutDataWrapper}; use layout_debug; +use opaque_node::OpaqueNodeMethods; use parallel::{self, UnsafeFlow}; use sequential; -use layout_data::{LayoutDataAccess, LayoutDataWrapper}; -use opaque_node::OpaqueNodeMethods; use wrapper::{LayoutNode, TLayoutNode, ThreadSafeLayoutNode}; use encoding::EncodingRef; diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs index 2c3aba244f0..bfedc76e229 100644 --- a/components/layout/wrapper.rs +++ b/components/layout/wrapper.rs @@ -36,8 +36,7 @@ use canvas::canvas_paint_task::CanvasMsg; use context::SharedLayoutContext; use css::node_style::StyledNode; use incremental::RestyleDamage; -use layout_data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper}; -use layout_data::{PrivateLayoutData}; +use layout_data::{LayoutDataAccess, LayoutDataFlags, LayoutDataWrapper, PrivateLayoutData}; use opaque_node::OpaqueNodeMethods; use cssparser::RGBA;