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/construct.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/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index d13fd01bb02..28a7ec7c2e1 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -26,24 +26,13 @@ use fragment::{Fragment, GeneratedContentInfo, IframeFragmentInfo}; use fragment::{InlineAbsoluteHypotheticalFragmentInfo, TableColumnFragmentInfo}; use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo}; use fragment::{WhitespaceStrippingResult}; +use gfx::display_list::OpaqueNode; use incremental::{RECONSTRUCT_FLOW, RestyleDamage}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags}; use inline::{InlineFragmentNodeInfo, LAST_FRAGMENT_OF_ELEMENT}; use list_item::{ListItemFlow, ListStyleTypeContent}; use multicol::MulticolFlow; use parallel; -use table::TableFlow; -use table_caption::TableCaptionFlow; -use table_cell::TableCellFlow; -use table_colgroup::TableColGroupFlow; -use table_row::TableRowFlow; -use table_rowgroup::TableRowGroupFlow; -use table_wrapper::TableWrapperFlow; -use text::TextRunScanner; -use traversal::PostorderNodeMutTraversal; -use wrapper::{PseudoElementType, TextContent, ThreadSafeLayoutNode}; - -use gfx::display_list::OpaqueNode; use script::dom::characterdata::CharacterDataTypeId; use script::dom::element::ElementTypeId; use script::dom::htmlelement::HTMLElementTypeId; @@ -58,9 +47,19 @@ use style::computed_values::content::ContentItem; use style::computed_values::{caption_side, display, empty_cells, float, list_style_position}; use style::computed_values::{position}; use style::properties::{self, ComputedValues}; +use table::TableFlow; +use table_caption::TableCaptionFlow; +use table_cell::TableCellFlow; +use table_colgroup::TableColGroupFlow; +use table_row::TableRowFlow; +use table_rowgroup::TableRowGroupFlow; +use table_wrapper::TableWrapperFlow; +use text::TextRunScanner; +use traversal::PostorderNodeMutTraversal; use url::Url; use util::linked_list; use util::opts; +use wrapper::{PseudoElementType, TextContent, ThreadSafeLayoutNode}; /// The results of flow construction for a DOM node. #[derive(Clone)] |