diff --git a/servo/components/style/gecko/url.rs b/servo/components/style/gecko/url.rs index 4961a6e21c8c..d371f0a74e50 100644 --- a/servo/components/style/gecko/url.rs +++ b/servo/components/style/gecko/url.rs @@ -15,8 +15,8 @@ use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use nsstring::nsCString; use parser::{Parse, ParserContext}; use servo_arc::{Arc, RawOffsetArc}; -use std::mem; use std::fmt::{self, Write}; +use std::mem; use style_traits::{CssWriter, ParseError, ToCss}; use values::computed::{Context, ToComputedValue}; @@ -282,7 +282,7 @@ where /// /// The only difference between specified and computed URLs is the /// serialization. -#[derive(Clone, Debug, Eq, PartialEq, MallocSizeOf)] +#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq)] pub struct ComputedUrl(pub SpecifiedUrl); impl ToCss for ComputedUrl { @@ -304,7 +304,7 @@ impl ComputedUrl { } /// The computed value of a CSS `url()` for image. -#[derive(Clone, Debug, Eq, PartialEq, MallocSizeOf)] +#[derive(Clone, Debug, Eq, MallocSizeOf, PartialEq)] pub struct ComputedImageUrl(pub SpecifiedImageUrl); impl ToCss for ComputedImageUrl { diff --git a/servo/components/style/values/computed/resolution.rs b/servo/components/style/values/computed/resolution.rs index 314cdca3abc1..817ba0822361 100644 --- a/servo/components/style/values/computed/resolution.rs +++ b/servo/components/style/values/computed/resolution.rs @@ -8,9 +8,9 @@ use std::fmt::{self, Write}; use style_traits::{CssWriter, ToCss}; +use values::CSSFloat; use values::computed::{Context, ToComputedValue}; use values::specified; -use values::CSSFloat; /// A computed ``. pub struct Resolution(CSSFloat); diff --git a/servo/components/style/values/specified/counters.rs b/servo/components/style/values/specified/counters.rs index e67a2c352381..ea369f9dec75 100644 --- a/servo/components/style/values/specified/counters.rs +++ b/servo/components/style/values/specified/counters.rs @@ -17,10 +17,10 @@ use values::generics::counters as generics; use values::generics::counters::CounterIncrement as GenericCounterIncrement; use values::generics::counters::CounterPair; use values::generics::counters::CounterReset as GenericCounterReset; -use values::specified::Integer; -use values::specified::url::SpecifiedImageUrl; #[cfg(feature = "gecko")] use values::specified::Attr; +use values::specified::Integer; +use values::specified::url::SpecifiedImageUrl; /// A specified value for the `counter-increment` property. pub type CounterIncrement = GenericCounterIncrement;