Reorder imports

components/style/media_queries/media_condition.rs

@@ -6,12 +6,12 @@
 //!
 //! https://drafts.csswg.org/mediaqueries-4/#typedef-media-condition
 
+use super::{Device, MediaFeatureExpression};
 use context::QuirksMode;
 use cssparser::{Parser, Token};
 use parser::ParserContext;
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
-use super::{Device, MediaFeatureExpression};
 
 /// A binary `and` or `or` operator.
 #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)]

components/style/media_queries/media_feature.rs

@@ -4,14 +4,14 @@
 
 //! Media features.
 
-use Atom;
+use super::media_feature_expression::{AspectRatio, RangeOrOperator};
+use super::Device;
 use cssparser::Parser;
 use parser::ParserContext;
 use std::fmt;
 use style_traits::ParseError;
-use super::Device;
-use super::media_feature_expression::{AspectRatio, RangeOrOperator};
 use values::computed::{CSSPixelLength, Resolution};
+use Atom;
 
 /// A generic discriminant for an enum value.
 pub type KeywordDiscriminant = u8;

components/style/media_queries/media_feature_expression.rs

@@ -5,24 +5,24 @@
 //! Parsing for media feature expressions, like `(foo: bar)` or
 //! `(width >= 400px)`.
 
-use Atom;
+use super::media_feature::{Evaluator, MediaFeatureDescription};
+use super::media_feature::{KeywordDiscriminant, ParsingRequirements};
+use super::Device;
 use context::QuirksMode;
 use cssparser::{Parser, Token};
 #[cfg(feature = "gecko")]
 use gecko_bindings::structs;
 use num_traits::Zero;
 use parser::{Parse, ParserContext};
-use std::cmp::{PartialOrd, Ordering};
+use std::cmp::{Ordering, PartialOrd};
 use std::fmt::{self, Write};
 use str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
 use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
 use stylesheets::Origin;
-use super::Device;
-use super::media_feature::{Evaluator, MediaFeatureDescription};
-use super::media_feature::{ParsingRequirements, KeywordDiscriminant};
-use values::{serialize_atom_identifier, CSSFloat};
 use values::computed::{self, ToComputedValue};
 use values::specified::{Integer, Length, Number, Resolution};
+use values::{serialize_atom_identifier, CSSFloat};
+use Atom;
 
 /// An aspect ratio, with a numerator and denominator.
 #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq)]

components/style/media_queries/media_list.rs

@@ -6,12 +6,12 @@
 //!
 //! https://drafts.csswg.org/mediaqueries/#typedef-media-query-list
 
+use super::{Device, MediaQuery, Qualifier};
 use context::QuirksMode;
 use cssparser::{Delimiter, Parser};
 use cssparser::{ParserInput, Token};
 use error_reporting::ContextualParseError;
 use parser::ParserContext;
-use super::{Device, MediaQuery, Qualifier};
 
 /// A type that encapsulates a media query list.
 #[css(comma, derive_debug)]

components/style/media_queries/media_query.rs

@@ -6,14 +6,14 @@
 //!
 //! https://drafts.csswg.org/mediaqueries/#typedef-media-query
 
-use Atom;
+use super::media_condition::MediaCondition;
 use cssparser::Parser;
 use parser::ParserContext;
 use std::fmt::{self, Write};
 use str::string_as_ascii_lowercase;
 use style_traits::{CssWriter, ParseError, ToCss};
-use super::media_condition::MediaCondition;
 use values::CustomIdent;
+use Atom;
 
 /// <https://drafts.csswg.org/mediaqueries/#mq-prefix>
 #[derive(Clone, Copy, Debug, Eq, MallocSizeOf, Parse, PartialEq, ToCss)]

components/style/media_queries/mod.rs

@@ -14,11 +14,11 @@ pub mod media_feature;
 pub mod media_feature_expression;
 
 pub use self::media_condition::MediaCondition;
+pub use self::media_feature_expression::MediaFeatureExpression;
 pub use self::media_list::MediaList;
 pub use self::media_query::{MediaQuery, MediaQueryType, MediaType, Qualifier};
-pub use self::media_feature_expression::MediaFeatureExpression;
 
-#[cfg(feature = "servo")]
-pub use servo::media_queries::Device;
 #[cfg(feature = "gecko")]
 pub use gecko::media_queries::Device;
+#[cfg(feature = "servo")]
+pub use servo::media_queries::Device;