From 3fbeb398d4439a83e1c4566908adfec7b42f09a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Jim=C3=A9nez=20Moreno?= Date: Tue, 4 Sep 2018 09:23:26 +0200 Subject: [PATCH] Revert import style format --- components/layout/construct.rs | 10 ++++------ components/layout_thread/dom_wrapper.rs | 6 ++---- components/script/dom/node.rs | 6 ++---- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/components/layout/construct.rs b/components/layout/construct.rs index bb3c534830f..ba86416f935 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -23,12 +23,10 @@ use floats::FloatKind; use flow::{AbsoluteDescendants, Flow, FlowClass, GetBaseFlow, ImmutableFlowUtils}; use flow::{FlowFlags, MutableFlowUtils, MutableOwnedFlowUtils}; use flow_ref::FlowRef; -use fragment::{ - CanvasFragmentInfo, Fragment, FragmentFlags, GeneratedContentInfo, IframeFragmentInfo, - ImageFragmentInfo, InlineAbsoluteFragmentInfo, InlineAbsoluteHypotheticalFragmentInfo, - InlineBlockFragmentInfo, MediaFragmentInfo, SpecificFragmentInfo, SvgFragmentInfo, - TableColumnFragmentInfo, UnscannedTextFragmentInfo, WhitespaceStrippingResult, -}; +use fragment::{CanvasFragmentInfo, Fragment, FragmentFlags, GeneratedContentInfo, IframeFragmentInfo}; +use fragment::{ImageFragmentInfo, InlineAbsoluteFragmentInfo, InlineAbsoluteHypotheticalFragmentInfo}; +use fragment::{InlineBlockFragmentInfo, MediaFragmentInfo, SpecificFragmentInfo, SvgFragmentInfo}; +use fragment::{TableColumnFragmentInfo, UnscannedTextFragmentInfo, WhitespaceStrippingResult}; use inline::{InlineFlow, InlineFragmentNodeInfo, InlineFragmentNodeFlags}; use linked_list::prepend_from; use list_item::{ListItemFlow, ListStyleTypeContent}; diff --git a/components/layout_thread/dom_wrapper.rs b/components/layout_thread/dom_wrapper.rs index 6a6bed73555..3c3495ee6fe 100644 --- a/components/layout_thread/dom_wrapper.rs +++ b/components/layout_thread/dom_wrapper.rs @@ -43,10 +43,8 @@ use script::layout_exports::{LayoutCharacterDataHelpers, LayoutDocumentHelpers}; use script::layout_exports::{LayoutElementHelpers, LayoutNodeHelpers, LayoutDom, RawLayoutElementHelpers}; use script::layout_exports::NodeFlags; use script::layout_exports::PendingRestyle; -use script_layout_interface::{ - HTMLCanvasData, HTMLMediaData, LayoutNodeType, OpaqueStyleAndLayoutData, SVGSVGData, StyleData, - TrustedNodeAddress, -}; +use script_layout_interface::{HTMLCanvasData, HTMLMediaData, LayoutNodeType, OpaqueStyleAndLayoutData}; +use script_layout_interface::{SVGSVGData, StyleData, TrustedNodeAddress}; use script_layout_interface::wrapper_traits::{DangerousThreadSafeLayoutNode, GetLayoutData, LayoutNode}; use script_layout_interface::wrapper_traits::{PseudoElementType, ThreadSafeLayoutElement, ThreadSafeLayoutNode}; use selectors::attr::{AttrSelectorOperation, NamespaceConstraint, CaseSensitivity}; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 0c48d3d2df3..43fe454bc7f 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -64,10 +64,8 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use msg::constellation_msg::{BrowsingContextId, PipelineId}; use ref_slice::ref_slice; use script_layout_interface::message::Msg; -use script_layout_interface::{ - HTMLCanvasData, HTMLMediaData, LayoutElementType, LayoutNodeType, OpaqueStyleAndLayoutData, - SVGSVGData, TrustedNodeAddress, -}; +use script_layout_interface::{HTMLCanvasData, HTMLMediaData, LayoutElementType, LayoutNodeType}; +use script_layout_interface::{OpaqueStyleAndLayoutData, SVGSVGData, TrustedNodeAddress}; use script_thread::ScriptThread; use script_traits::DocumentActivity; use script_traits::UntrustedNodeAddress;