4 files changed, 28 insertions, 20 deletions
diff --git a/components/layout/display_list/builder.rs b/components/layout/display_list/builder.rs
index 54091f85389..00fc8495857 100644
--- a/components/layout/display_list/builder.rs
+++ b/components/layout/display_list/builder.rs
@@ -65,10 +65,10 @@ use style::values::specified::ui::CursorKind;
 use style::values::{Either, RGBA};
 use style_traits::ToCss;
 use webrender_api::units::{LayoutRect, LayoutSize, LayoutTransform, LayoutVector2D};
+use webrender_api::{self, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, ColorF};
 use webrender_api::{ColorU, ExternalScrollId, FilterOp, GlyphInstance, ImageRendering, LineStyle};
 use webrender_api::{NinePatchBorder, NinePatchBorderSource, NormalBorder};
 use webrender_api::{ScrollSensitivity, StickyOffsetBounds};
-use webrender_api::{self, BorderDetails, BorderRadius, BorderSide, BoxShadowClipMode, ColorF};
 
 static THREAD_TINT_COLORS: [ColorF; 8] = [
     ColorF {
diff --git a/components/layout/display_list/webrender_helpers.rs b/components/layout/display_list/webrender_helpers.rs
index c55beb7ec17..34b6d093d53 100644
--- a/components/layout/display_list/webrender_helpers.rs
+++ b/components/layout/display_list/webrender_helpers.rs
@@ -13,7 +13,9 @@ use msg::constellation_msg::PipelineId;
 use webrender_api::units::LayoutPoint;
 use webrender_api::{self, ClipId, CommonItemProperties, DisplayItem as WrDisplayItem};
 use webrender_api::{DisplayListBuilder, PropertyBinding, PushStackingContextDisplayItem};
-use webrender_api::{RasterSpace, ReferenceFrameKind, SpaceAndClipInfo, SpatialId, StackingContext};
+use webrender_api::{
+    RasterSpace, ReferenceFrameKind, SpaceAndClipInfo, SpatialId, StackingContext,
+};
 
 pub trait WebRenderDisplayListConverter {
     fn convert_to_webrender(&mut self, pipeline_id: PipelineId) -> DisplayListBuilder;
@@ -144,26 +146,30 @@ impl WebRenderDisplayItemConverter for DisplayItem {
             },
             DisplayItem::PushTextShadow(ref mut item) => {
                 let common = build_common_item_properties(&item.base, state);
-                builder.push_shadow(&SpaceAndClipInfo {
-                                        spatial_id: common.spatial_id,
-                                        clip_id: common.clip_id,
-                                    },
-                                    item.shadow,
-                                    true);
+                builder.push_shadow(
+                    &SpaceAndClipInfo {
+                        spatial_id: common.spatial_id,
+                        clip_id: common.clip_id,
+                    },
+                    item.shadow,
+                    true,
+                );
             },
             DisplayItem::PopAllTextShadows(_) => {
                 builder.push_item(&WrDisplayItem::PopAllShadows);
             },
             DisplayItem::Iframe(ref mut item) => {
                 let common = build_common_item_properties(&item.base, state);
-                builder.push_iframe(item.base.bounds,
-                                    common.clip_rect,
-                                    &SpaceAndClipInfo {
-                                        spatial_id: common.spatial_id,
-                                        clip_id: common.clip_id,
-                                    },
-                                    item.iframe.to_webrender(),
-                                    true);
+                builder.push_iframe(
+                    item.base.bounds,
+                    common.clip_rect,
+                    &SpaceAndClipInfo {
+                        spatial_id: common.spatial_id,
+                        clip_id: common.clip_id,
+                    },
+                    item.iframe.to_webrender(),
+                    true,
+                );
             },
             DisplayItem::PushStackingContext(ref mut item) => {
                 let stacking_context = &item.stacking_context;
@@ -296,8 +302,10 @@ impl WebRenderDisplayItemConverter for DisplayItem {
     }
 }
 
-fn build_common_item_properties(base: &BaseDisplayItem, state: &ClipScrollState)
-                                -> CommonItemProperties {
+fn build_common_item_properties(
+    base: &BaseDisplayItem,
+    state: &ClipScrollState,
+) -> CommonItemProperties {
     let tag = match base.metadata.pointing {
         Some(cursor) => Some((base.metadata.node.0 as u64, cursor)),
         None => None,
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs
index aa8a8605642..879e2af2f64 100644
--- a/components/layout/fragment.rs
+++ b/components/layout/fragment.rs
@@ -65,8 +65,8 @@ use style::values::computed::{LengthPercentage, LengthPercentageOrAuto, Size, Ve
 use style::values::generics::box_::{Perspective, VerticalAlignKeyword};
 use style::values::generics::transform;
 use style::Zero;
-use webrender_api::units::LayoutTransform;
 use webrender_api;
+use webrender_api::units::LayoutTransform;
 
 // From gfxFontConstants.h in Firefox.
 static FONT_SUBSCRIPT_OFFSET_RATIO: f32 = 0.20;
diff --git a/components/layout/sequential.rs b/components/layout/sequential.rs
index 6a0b99dab8c..113330f0162 100644
--- a/components/layout/sequential.rs
+++ b/components/layout/sequential.rs
@@ -5,8 +5,8 @@
 //! Implements sequential traversals over the DOM and flow trees.
 
 use crate::context::LayoutContext;
-use crate::display_list::{DisplayListBuildState, StackingContextCollectionState};
 use crate::display_list::items::{self, CommonDisplayItem, DisplayItem, DisplayListSection};
+use crate::display_list::{DisplayListBuildState, StackingContextCollectionState};
 use crate::floats::SpeculatedFloatPlacement;
 use crate::flow::{Flow, FlowFlags, GetBaseFlow, ImmutableFlowUtils};
 use crate::fragment::{CoordinateSystem, FragmentBorderBoxIterator};