Fix reported test-tidy errors for unmerged import blocks

This merges import blocks that were reported by tidy as unmerged.
This commit is contained in:
Brandon Fairchild 2015-09-17 17:55:01 -04:00
parent e924393be8
commit de3547e401
213 changed files with 598 additions and 934 deletions

View file

@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{RGBA, Color};
use euclid::point::Point2D;
use properties::ComputedValues;
use properties::longhands::background_position::computed_value::T as BackgroundPosition;
use properties::longhands::border_spacing::computed_value::T as BorderSpacing;
@ -21,15 +22,13 @@ use properties::longhands::transition_timing_function::computed_value::{Transiti
use properties::longhands::vertical_align::computed_value::T as VerticalAlign;
use properties::longhands::visibility::computed_value::T as Visibility;
use properties::longhands::z_index::computed_value::T as ZIndex;
use values::CSSFloat;
use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
use values::computed::{LengthOrPercentage, Length, Time};
use euclid::point::Point2D;
use std::cmp::Ordering;
use std::iter::repeat;
use util::bezier::Bezier;
use util::geometry::Au;
use values::CSSFloat;
use values::computed::{Angle, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
use values::computed::{LengthOrPercentage, Length, Time};
#[derive(Clone, Debug)]
pub struct PropertyAnimation {

View file

@ -5,14 +5,13 @@
//! Legacy presentational attributes defined in the HTML5 specification: `<td width>`,
//! `<input size>`, and so forth.
use std::sync::Arc;
use node::TElementAttributes;
use properties::PropertyDeclaration;
use selector_matching::Stylist;
use selectors::Element;
use selectors::matching::DeclarationBlock;
use smallvec::VecLike;
use std::sync::Arc;
/// Legacy presentational attributes that take a nonnegative integer as defined in HTML5 § 2.4.4.2.

View file

@ -3,10 +3,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use cssparser::{Token, Parser, Delimiter};
use std::ascii::AsciiExt;
use euclid::size::{Size2D, TypedSize2D};
use properties::longhands;
use std::ascii::AsciiExt;
use util::geometry::{Au, ViewportPx};
use values::specified;

View file

@ -7,9 +7,8 @@
use legacy::UnsignedIntegerAttribute;
use properties::PropertyDeclaration;
use smallvec::VecLike;
use selectors::matching::DeclarationBlock;
use smallvec::VecLike;
use string_cache::{Atom, Namespace};
pub trait TElementAttributes {

View file

@ -6,9 +6,8 @@
use cssparser::{Parser, SourcePosition};
use log;
use selectors::parser::ParserContext as SelectorParserContext;
use url::{Url, UrlParser};
use stylesheets::Origin;
use url::{Url, UrlParser};
pub struct ParserContext<'a> {
pub stylesheet_origin: Origin,

View file

@ -2,8 +2,10 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use url::Url;
use legacy::PresentationalHintSynthesis;
use media_queries::Device;
use node::TElementAttributes;
use properties::{PropertyDeclaration, PropertyDeclarationBlock};
use selectors::Element;
use selectors::bloom::BloomFilter;
use selectors::matching::DeclarationBlock as GenericDeclarationBlock;
@ -11,15 +13,11 @@ use selectors::matching::{SelectorMap, Rule};
use selectors::parser::PseudoElement;
use smallvec::VecLike;
use std::process;
use util::opts;
use util::resource_files::read_resource_file;
use legacy::PresentationalHintSynthesis;
use media_queries::Device;
use node::TElementAttributes;
use properties::{PropertyDeclaration, PropertyDeclarationBlock};
use style_traits::viewport::ViewportConstraints;
use stylesheets::{Stylesheet, CSSRuleIteratorExt, Origin};
use url::Url;
use util::opts;
use util::resource_files::read_resource_file;
use viewport::{MaybeNew, ViewportRuleCascade};

View file

@ -2,23 +2,21 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use std::ascii::AsciiExt;
use std::cell::Cell;
use std::iter::Iterator;
use std::slice;
use url::Url;
use encoding::EncodingRef;
use cssparser::{Parser, decode_stylesheet_bytes, QualifiedRuleParser, AtRuleParser};
use cssparser::{RuleListParser, AtRuleType};
use encoding::EncodingRef;
use font_face::{FontFaceRule, parse_font_face_block};
use media_queries::{Device, MediaQueryList, parse_media_query_list};
use parser::{ParserContext, log_css_error};
use properties::{PropertyDeclarationBlock, parse_property_declaration_list};
use selectors::parser::{Selector, parse_selector_list};
use smallvec::SmallVec;
use std::ascii::AsciiExt;
use std::cell::Cell;
use std::iter::Iterator;
use std::slice;
use string_cache::{Atom, Namespace};
use url::Url;
use viewport::ViewportRule;

View file

@ -1218,12 +1218,12 @@ pub mod specified {
pub mod computed {
pub use super::specified::{Angle, BorderStyle, Time};
use super::specified::AngleOrCorner;
use super::{specified, CSSFloat};
pub use cssparser::Color as CSSColor;
use euclid::size::Size2D;
pub use cssparser::Color as CSSColor;
use properties::longhands;
use std::fmt;
use super::specified::AngleOrCorner;
use super::{specified, CSSFloat};
use url::Url;
use util::geometry::Au;

View file

@ -7,17 +7,15 @@ use euclid::scale_factor::ScaleFactor;
use euclid::size::{Size2D, TypedSize2D};
use parser::{ParserContext, log_css_error};
use properties::longhands;
use std::ascii::AsciiExt;
use std::collections::hash_map::{Entry, HashMap};
use std::intrinsics;
use style_traits::viewport::{UserZoom, Zoom, Orientation, ViewportConstraints};
use stylesheets::Origin;
use util::geometry::{Au, ViewportPx};
use values::computed::{Context, ToComputedValue};
use values::specified::LengthOrPercentageOrAuto;
use std::ascii::AsciiExt;
use std::collections::hash_map::{Entry, HashMap};
use std::intrinsics;
#[derive(Copy, Clone, Debug, PartialEq)]
pub enum ViewportDescriptor {
MinWidth(LengthOrPercentageOrAuto),