diff options
author | Cullen Rhodes <rhodes.cullen@gmail.com> | 2016-05-22 16:32:18 +0100 |
---|---|---|
committer | Cullen Rhodes <rhodes.cullen@gmail.com> | 2016-05-27 10:18:44 +0100 |
commit | 40acd24e8fef2a3c46ecdb21b4be1363d48e8ec4 (patch) | |
tree | a7786b1554ccc97240fdde367fe0ed5455c4c59f /components/layout | |
parent | 4dcb05ca4f521b2c5eb12000678be035465e092b (diff) | |
download | servo-40acd24e8fef2a3c46ecdb21b4be1363d48e8ec4.tar.gz servo-40acd24e8fef2a3c46ecdb21b4be1363d48e8ec4.zip |
Report use statements that use {} with only one entry
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/block.rs | 4 | ||||
-rw-r--r-- | components/layout/construct.rs | 4 | ||||
-rw-r--r-- | components/layout/display_list_builder.rs | 6 | ||||
-rw-r--r-- | components/layout/fragment.rs | 2 | ||||
-rw-r--r-- | components/layout/generated_content.rs | 2 | ||||
-rw-r--r-- | components/layout/inline.rs | 4 | ||||
-rw-r--r-- | components/layout/layout_thread.rs | 10 | ||||
-rw-r--r-- | components/layout/list_item.rs | 2 | ||||
-rw-r--r-- | components/layout/opaque_node.rs | 2 | ||||
-rw-r--r-- | components/layout/parallel.rs | 2 | ||||
-rw-r--r-- | components/layout/query.rs | 2 | ||||
-rw-r--r-- | components/layout/table.rs | 4 | ||||
-rw-r--r-- | components/layout/table_cell.rs | 2 | ||||
-rw-r--r-- | components/layout/text.rs | 2 |
14 files changed, 24 insertions, 24 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index 42cc4e6abd4..d5decf50c8d 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -33,16 +33,16 @@ use display_list_builder::BlockFlowDisplayListBuilding; use display_list_builder::{BorderPaintingMode, DisplayListBuildState, FragmentDisplayListBuilding}; use euclid::{Point2D, Rect, Size2D}; use floats::{ClearType, FloatKind, Floats, PlacementInfo}; +use flow::IS_ABSOLUTELY_POSITIONED; use flow::{BLOCK_POSITION_IS_STATIC, CLEARS_LEFT, CLEARS_RIGHT}; use flow::{CONTAINS_TEXT_OR_REPLACED_FRAGMENTS, INLINE_POSITION_IS_STATIC}; -use flow::{IS_ABSOLUTELY_POSITIONED}; use flow::{ImmutableFlowUtils, LateAbsolutePositionInfo, MutableFlowUtils, OpaqueFlow}; use flow::{NEEDS_LAYER, PreorderFlowTraversal, FragmentationContext}; use flow::{self, BaseFlow, EarlyAbsolutePositionInfo, Flow, FlowClass, ForceNonfloatedFlag}; use flow_list::FlowList; use flow_ref::FlowRef; +use fragment::SpecificFragmentInfo; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, HAS_LAYER, Overflow}; -use fragment::{SpecificFragmentInfo}; use gfx::display_list::{ClippingRegion, StackingContext, StackingContextId}; use gfx_traits::LayerId; use incremental::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT}; diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 77b388e8ade..d08e8ad374c 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -22,11 +22,11 @@ use floats::FloatKind; use flow::{MutableFlowUtils, MutableOwnedFlowUtils, CAN_BE_FRAGMENTED}; use flow::{self, AbsoluteDescendants, IS_ABSOLUTELY_POSITIONED, ImmutableFlowUtils}; use flow_ref::{self, FlowRef}; +use fragment::WhitespaceStrippingResult; use fragment::{CanvasFragmentInfo, ImageFragmentInfo, InlineAbsoluteFragmentInfo}; use fragment::{Fragment, GeneratedContentInfo, IframeFragmentInfo}; use fragment::{InlineAbsoluteHypotheticalFragmentInfo, TableColumnFragmentInfo}; use fragment::{InlineBlockFragmentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo}; -use fragment::{WhitespaceStrippingResult}; use gfx::display_list::OpaqueNode; use incremental::{BUBBLE_ISIZES, RECONSTRUCT_FLOW, RestyleDamage}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, InlineFragmentNodeFlags}; @@ -44,8 +44,8 @@ use std::mem; use std::sync::Arc; use std::sync::atomic::Ordering; use style::computed_values::content::ContentItem; +use style::computed_values::position; use style::computed_values::{caption_side, display, empty_cells, float, list_style_position}; -use style::computed_values::{position}; use style::properties::{self, ComputedValues, ServoComputedValues}; use style::servo::SharedStyleContext; use table::TableFlow; diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index c9314aa08f6..e9d7f02bad3 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -19,12 +19,12 @@ use euclid::{Matrix4D, Point2D, Point3D, Rect, SideOffsets2D, Size2D}; use flex::FlexFlow; use flow::{BaseFlow, Flow, IS_ABSOLUTELY_POSITIONED}; use flow_ref; +use fragment::SpecificFragmentInfo; use fragment::{CoordinateSystem, Fragment, HAS_LAYER, ImageFragmentInfo, ScannedTextFragmentInfo}; -use fragment::{SpecificFragmentInfo}; +use gfx::display_list::GradientDisplayItem; use gfx::display_list::{BLUR_INFLATION_FACTOR, BaseDisplayItem, BorderDisplayItem}; use gfx::display_list::{BorderRadii, BoxShadowClipMode, BoxShadowDisplayItem, ClippingRegion}; use gfx::display_list::{DisplayItem, DisplayItemMetadata, DisplayListSection}; -use gfx::display_list::{GradientDisplayItem}; use gfx::display_list::{GradientStop, IframeDisplayItem, ImageDisplayItem, WebGLDisplayItem, LayeredItem, LayerInfo}; use gfx::display_list::{LineDisplayItem, OpaqueNode, SolidColorDisplayItem}; use gfx::display_list::{StackingContext, StackingContextId, StackingContextType}; @@ -33,7 +33,7 @@ use gfx::paint_thread::THREAD_TINT_COLORS; use gfx::text::glyph::ByteIndex; use gfx_traits::{color, ScrollPolicy}; use inline::{FIRST_FRAGMENT_OF_ELEMENT, InlineFlow, LAST_FRAGMENT_OF_ELEMENT}; -use ipc_channel::ipc::{self}; +use ipc_channel::ipc; use list_item::ListItemFlow; use model::{self, MaybeAuto, ToGfxMatrix}; use net_traits::image::base::PixelFormat; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index f2da09b734c..3a5d90201bd 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -42,8 +42,8 @@ use style::computed_values::{vertical_align, white_space, word_break, z_index}; use style::dom::TRestyleDamage; use style::logical_geometry::{LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::{ComputedValues, ServoComputedValues}; +use style::values::computed::LengthOrPercentageOrNone; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto}; -use style::values::computed::{LengthOrPercentageOrNone}; use text; use text::TextRunScanner; use url::Url; diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index 7cde02a8781..a7e9c8f463a 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -9,7 +9,7 @@ //! as possible. use context::LayoutContext; -use flow::{InorderFlowTraversal}; +use flow::InorderFlowTraversal; use flow::{self, AFFECTS_COUNTERS, Flow, HAS_COUNTER_AFFECTING_CHILDREN, ImmutableFlowUtils}; use fragment::{Fragment, GeneratedContentInfo, SpecificFragmentInfo, UnscannedTextFragmentInfo}; use gfx::display_list::OpaqueNode; diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 6db570eb6eb..4615b728335 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -11,12 +11,12 @@ use display_list_builder::DisplayListBuildState; use display_list_builder::{FragmentDisplayListBuilding, InlineFlowDisplayListBuilding}; use euclid::{Point2D, Size2D}; use floats::{FloatKind, Floats, PlacementInfo}; +use flow::OpaqueFlow; use flow::{CONTAINS_TEXT_OR_REPLACED_FRAGMENTS, EarlyAbsolutePositionInfo, MutableFlowUtils}; -use flow::{OpaqueFlow}; use flow::{self, BaseFlow, Flow, FlowClass, ForceNonfloatedFlag, IS_ABSOLUTELY_POSITIONED}; use flow_ref; +use fragment::SpecificFragmentInfo; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, Overflow}; -use fragment::{SpecificFragmentInfo}; use gfx::display_list::{OpaqueNode, StackingContext, StackingContextId}; use gfx::font::FontMetrics; use gfx::font_context::FontContext; diff --git a/components/layout/layout_thread.rs b/components/layout/layout_thread.rs index c867079d601..6b56cb6e348 100644 --- a/components/layout/layout_thread.rs +++ b/components/layout/layout_thread.rs @@ -21,16 +21,16 @@ use euclid::size::Size2D; use flow::{self, Flow, ImmutableFlowUtils, MutableOwnedFlowUtils}; use flow_ref::{self, FlowRef}; use fnv::FnvHasher; +use gfx::display_list::WebRenderImageInfo; use gfx::display_list::{ClippingRegion, DisplayItemMetadata, DisplayList, LayerInfo}; use gfx::display_list::{OpaqueNode, StackingContext, StackingContextId, StackingContextType}; -use gfx::display_list::{WebRenderImageInfo}; use gfx::font; use gfx::font_cache_thread::FontCacheThread; use gfx::font_context; use gfx::paint_thread::LayoutToPaintMsg; use gfx_traits::{color, Epoch, LayerId, ScrollPolicy}; use heapsize::HeapSizeOf; -use incremental::{LayoutDamageComputation}; +use incremental::LayoutDamageComputation; use incremental::{REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW, REFLOW, REFLOW_ENTIRE_DOCUMENT}; use ipc_channel::ipc::{self, IpcReceiver, IpcSender}; use ipc_channel::router::ROUTER; @@ -38,16 +38,16 @@ use layout_debug; use layout_traits::{ConvertPipelineIdToWebRender, LayoutThreadFactory}; use log; use msg::constellation_msg::{PanicMsg, PipelineId}; +use net_traits::image_cache_thread::UsePlaceholder; use net_traits::image_cache_thread::{ImageCacheChan, ImageCacheResult, ImageCacheThread}; -use net_traits::image_cache_thread::{UsePlaceholder}; use parallel; use profile_traits::mem::{self, Report, ReportKind, ReportsChan}; use profile_traits::time::{TimerMetadataFrameType, TimerMetadataReflowType}; use profile_traits::time::{self, TimerMetadata, profile}; +use query::process_offset_parent_query; use query::{LayoutRPCImpl, process_content_box_request, process_content_boxes_request}; use query::{process_node_geometry_request, process_node_layer_id_request, process_node_scroll_area_request}; use query::{process_node_overflow_request, process_resolved_style_request, process_margin_style_query}; -use query::{process_offset_parent_query}; use script::dom::node::OpaqueStyleAndLayoutData; use script::layout_interface::{LayoutRPC, OffsetParentResponse, NodeOverflowResponse, MarginStyleResponse}; use script::layout_interface::{Msg, NewLayoutThreadInfo, Reflow, ReflowQueryType, ScriptReflow}; @@ -65,7 +65,7 @@ use std::sync::mpsc::{channel, Sender, Receiver}; use std::sync::{Arc, Mutex, MutexGuard, RwLock}; use style::animation::Animation; use style::computed_values::{filter, mix_blend_mode}; -use style::context::{ReflowGoal}; +use style::context::ReflowGoal; use style::dom::{TDocument, TElement, TNode}; use style::error_reporting::ParseErrorReporter; use style::logical_geometry::LogicalPoint; diff --git a/components/layout/list_item.rs b/components/layout/list_item.rs index d499d2a08b3..9b44ed78640 100644 --- a/components/layout/list_item.rs +++ b/components/layout/list_item.rs @@ -14,8 +14,8 @@ use display_list_builder::{DisplayListBuildState, ListItemFlowDisplayListBuildin use euclid::Point2D; use floats::FloatKind; use flow::{Flow, FlowClass, OpaqueFlow}; +use fragment::Overflow; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, GeneratedContentInfo}; -use fragment::{Overflow}; use generated_content; use gfx::display_list::{StackingContext, StackingContextId}; use incremental::RESOLVE_GENERATED_CONTENT; diff --git a/components/layout/opaque_node.rs b/components/layout/opaque_node.rs index 8bde9e6cc09..023b9cb34c0 100644 --- a/components/layout/opaque_node.rs +++ b/components/layout/opaque_node.rs @@ -8,7 +8,7 @@ use gfx::display_list::OpaqueNode; use libc::{c_void, uintptr_t}; use script::dom::bindings::js::LayoutJS; use script::dom::node::Node; -use script::layout_interface::{TrustedNodeAddress}; +use script::layout_interface::TrustedNodeAddress; use script_traits::UntrustedNodeAddress; pub trait OpaqueNodeMethods { diff --git a/components/layout/parallel.rs b/components/layout/parallel.rs index 2c622b99603..b0afae2eeed 100644 --- a/components/layout/parallel.rs +++ b/components/layout/parallel.rs @@ -15,8 +15,8 @@ use profile_traits::time::{self, TimerMetadata, profile}; use std::mem; use std::sync::atomic::{AtomicIsize, Ordering}; use style::dom::UnsafeNode; +use style::parallel::run_queue_with_custom_work_data_type; use style::parallel::{CHUNK_SIZE, WorkQueueData}; -use style::parallel::{run_queue_with_custom_work_data_type}; use traversal::AssignBSizes; use traversal::{AssignISizes, BubbleISizes}; use util::opts; diff --git a/components/layout/query.rs b/components/layout/query.rs index 162a7642724..2fae4974e25 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -13,7 +13,7 @@ use flow; use flow_ref::FlowRef; use fragment::{Fragment, FragmentBorderBoxIterator, SpecificFragmentInfo}; use gfx::display_list::OpaqueNode; -use gfx_traits::{LayerId}; +use gfx_traits::LayerId; use layout_thread::LayoutThreadData; use opaque_node::OpaqueNodeMethods; use script::layout_interface::{ContentBoxResponse, NodeOverflowResponse, ContentBoxesResponse, NodeGeometryResponse}; diff --git a/components/layout/table.rs b/components/layout/table.rs index 0585a509f09..9ed0dfd02d7 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -12,8 +12,8 @@ use block::{ISizeConstraintInput, ISizeConstraintSolution}; use context::LayoutContext; use display_list_builder::{BlockFlowDisplayListBuilding, BorderPaintingMode, DisplayListBuildState}; use euclid::Point2D; +use flow; use flow::{BaseFlow, EarlyAbsolutePositionInfo, Flow, FlowClass, ImmutableFlowUtils, OpaqueFlow}; -use flow::{self}; use flow_list::MutFlowListIterator; use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::{StackingContext, StackingContextId}; @@ -28,7 +28,7 @@ use style::logical_geometry::LogicalSize; use style::properties::{ComputedValues, ServoComputedValues}; use style::values::CSSFloat; use style::values::computed::LengthOrPercentageOrAuto; -use table_row::{TableRowFlow}; +use table_row::TableRowFlow; use table_row::{self, CellIntrinsicInlineSize, CollapsedBorder, CollapsedBorderProvenance}; use table_wrapper::TableLayout; use util::print_tree::PrintTree; diff --git a/components/layout/table_cell.rs b/components/layout/table_cell.rs index 37a916a920a..06cb1e31ecc 100644 --- a/components/layout/table_cell.rs +++ b/components/layout/table_cell.rs @@ -26,7 +26,7 @@ use style::properties::{ComputedValues, ServoComputedValues}; use table::InternalTable; use table_row::{CollapsedBorder, CollapsedBorderProvenance}; use util::print_tree::PrintTree; -use wrapper::{ThreadSafeLayoutNode}; +use wrapper::ThreadSafeLayoutNode; /// A table formatting context. #[derive(RustcEncodable)] diff --git a/components/layout/text.rs b/components/layout/text.rs index 3ba9be9f949..b2f08fff75b 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -21,8 +21,8 @@ use std::borrow::ToOwned; use std::collections::LinkedList; use std::mem; use std::sync::Arc; +use style::computed_values::white_space; use style::computed_values::{line_height, text_orientation, text_rendering, text_transform}; -use style::computed_values::{white_space}; use style::logical_geometry::{LogicalSize, WritingMode}; use style::properties::style_structs::ServoFont; use style::properties::{ComputedValues, ServoComputedValues}; |