diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-17 23:14:37 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-17 23:14:37 +0530 |
commit | 2ad562042ba1d80e619286e0d03e8d1fb408779a (patch) | |
tree | 366d5952b8de29541e058962e0d408e175056a19 | |
parent | 41a3961ba57b720f1df9637090b78d40df7bc778 (diff) | |
parent | 4c5eeb1f58201f032f096268885bbb216815eacb (diff) | |
download | servo-2ad562042ba1d80e619286e0d03e8d1fb408779a.tar.gz servo-2ad562042ba1d80e619286e0d03e8d1fb408779a.zip |
Auto merge of #9349 - therealkbhat:layout-cleanup, r=SimonSapin
Remove unused imports in layout
Fixes #9346.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9349)
<!-- Reviewable:end -->
-rw-r--r-- | components/layout/block.rs | 2 | ||||
-rw-r--r-- | components/layout/context.rs | 2 | ||||
-rw-r--r-- | components/layout/display_list_builder.rs | 1 | ||||
-rw-r--r-- | components/layout/flex.rs | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/components/layout/block.rs b/components/layout/block.rs index 74f5df76e27..2633205b8b4 100644 --- a/components/layout/block.rs +++ b/components/layout/block.rs @@ -39,7 +39,7 @@ use flow::{HAS_LEFT_FLOATED_DESCENDANTS, HAS_RIGHT_FLOATED_DESCENDANTS}; use flow::{IMPACTED_BY_LEFT_FLOATS, IMPACTED_BY_RIGHT_FLOATS, INLINE_POSITION_IS_STATIC}; use flow::{IS_ABSOLUTELY_POSITIONED}; use flow::{ImmutableFlowUtils, LateAbsolutePositionInfo, MutableFlowUtils, OpaqueFlow}; -use flow::{NEEDS_LAYER, PostorderFlowTraversal, PreorderFlowTraversal, mut_base}; +use flow::{NEEDS_LAYER, PostorderFlowTraversal, PreorderFlowTraversal}; use flow::{self, BaseFlow, EarlyAbsolutePositionInfo, Flow, FlowClass, ForceNonfloatedFlag}; use fragment::{CoordinateSystem, Fragment, FragmentBorderBoxIterator, HAS_LAYER}; use fragment::{SpecificFragmentInfo}; diff --git a/components/layout/context.rs b/components/layout/context.rs index 766e56d5dce..83f2df1412a 100644 --- a/components/layout/context.rs +++ b/components/layout/context.rs @@ -22,7 +22,7 @@ use std::cell::{RefCell, RefMut}; use std::collections::HashMap; use std::collections::hash_state::DefaultState; use std::rc::Rc; -use std::sync::mpsc::{Sender, channel}; +use std::sync::mpsc::Sender; use std::sync::{Arc, Mutex}; use style::context::{LocalStyleContext, SharedStyleContext, StyleContext}; use style::matching::{ApplicableDeclarationsCache, StyleSharingCandidateCache}; diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs index 0c9a767b0ad..7c60f837201 100644 --- a/components/layout/display_list_builder.rs +++ b/components/layout/display_list_builder.rs @@ -40,7 +40,6 @@ use net_traits::image::base::{Image, PixelFormat}; use net_traits::image_cache_thread::UsePlaceholder; use std::default::Default; use std::sync::Arc; -use std::sync::mpsc::channel; use std::{cmp, f32}; use style::computed_values::filter::Filter; use style::computed_values::{background_attachment, background_clip, background_origin}; diff --git a/components/layout/flex.rs b/components/layout/flex.rs index fdccc9b1728..8a3172b99f5 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -16,7 +16,6 @@ use flow; use flow::INLINE_POSITION_IS_STATIC; use flow::IS_ABSOLUTELY_POSITIONED; use flow::ImmutableFlowUtils; -use flow::mut_base; use flow::{Flow, FlowClass, OpaqueFlow}; use flow::{HAS_LEFT_FLOATED_DESCENDANTS, HAS_RIGHT_FLOATED_DESCENDANTS}; use fragment::{Fragment, FragmentBorderBoxIterator}; |