diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-09-08 22:19:19 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-08 22:19:19 -0500 |
commit | 3117787fd2a8b7748cfde1e9b8c5be3c00f2c599 (patch) | |
tree | a8855004b4309212182505b0cf72f116d846c4cb /components/layout/traversal.rs | |
parent | 5a5a76cc5db830d2e622d4e0924837383b64dfa2 (diff) | |
parent | 93a103ba7306b578841b73a0ecfbccaad8fc78c1 (diff) | |
download | servo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.tar.gz servo-3117787fd2a8b7748cfde1e9b8c5be3c00f2c599.zip |
Auto merge of #13205 - UK992:tidy-sort, r=Wafflespeanut
Tidy: Fix ordering use statements with braces
This hack fixes https://github.com/servo/servo/issues/7412 and matches behavior with rustfmt.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13205)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/traversal.rs')
-rw-r--r-- | components/layout/traversal.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index ca35419bc46..f41eeb22011 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -7,8 +7,8 @@ use construct::FlowConstructor; use context::{LayoutContext, SharedLayoutContext}; use display_list_builder::DisplayListBuildState; +use flow::{self, PreorderFlowTraversal}; use flow::{CAN_BE_FRAGMENTED, Flow, ImmutableFlowUtils, PostorderFlowTraversal}; -use flow::{PreorderFlowTraversal, self}; use gfx::display_list::OpaqueNode; use script_layout_interface::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, RestyleDamage}; use script_layout_interface::wrapper_traits::{LayoutNode, ThreadSafeLayoutNode}; @@ -16,8 +16,8 @@ use std::mem; use style::context::{LocalStyleContext, SharedStyleContext, StyleContext}; use style::dom::TNode; use style::selector_impl::ServoSelectorImpl; +use style::traversal::{DomTraversalContext, recalc_style_at, remove_from_bloom_filter}; use style::traversal::RestyleResult; -use style::traversal::{DomTraversalContext, remove_from_bloom_filter, recalc_style_at}; use util::opts; use wrapper::{LayoutNodeLayoutData, ThreadSafeLayoutNodeHelpers}; |