diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs index 6d509cf6903..8fa2258eaaf 100644 --- a/components/style/gecko/media_queries.rs +++ b/components/style/gecko/media_queries.rs @@ -85,7 +85,9 @@ impl Device { assert!(!pres_context.is_null()); Device { pres_context, - default_values: ComputedValues::default_values(unsafe { &*(*pres_context).mDocument.mRawPtr }), + default_values: ComputedValues::default_values(unsafe { + &*(*pres_context).mDocument.mRawPtr + }), // FIXME(bz): Seems dubious? root_font_size: AtomicIsize::new(FontSize::medium().size().0 as isize), body_text_color: AtomicUsize::new(unsafe { &*pres_context }.mDefaultColor as usize), diff --git a/components/style/gecko_bindings/sugar/style_complex_color.rs b/components/style/gecko_bindings/sugar/style_complex_color.rs index 69565950b3e..aec334969d4 100644 --- a/components/style/gecko_bindings/sugar/style_complex_color.rs +++ b/components/style/gecko_bindings/sugar/style_complex_color.rs @@ -8,7 +8,9 @@ use crate::gecko::values::{convert_nscolor_to_rgba, convert_rgba_to_nscolor}; use crate::gecko_bindings::structs::StyleComplexColor; use crate::gecko_bindings::structs::StyleComplexColor_Tag as Tag; use crate::values::computed::{Color as ComputedColor, ColorOrAuto, RGBAColor as ComputedRGBA}; -use crate::values::generics::color::{Color as GenericColor, ColorOrAuto as GenericColorOrAuto, ComplexColorRatios}; +use crate::values::generics::color::{ + Color as GenericColor, ColorOrAuto as GenericColorOrAuto, ComplexColorRatios, +}; impl StyleComplexColor { /// Create a `StyleComplexColor` value that represents `currentColor`. diff --git a/components/style/values/computed/length.rs b/components/style/values/computed/length.rs index 45a0d941ff0..f578bbbd5ce 100644 --- a/components/style/values/computed/length.rs +++ b/components/style/values/computed/length.rs @@ -9,7 +9,9 @@ use crate::values::animated::ToAnimatedValue; use crate::values::computed::NonNegativeNumber; use crate::values::distance::{ComputeSquaredDistance, SquaredDistance}; use crate::values::generics::length as generics; -use crate::values::generics::length::{MaxSize as GenericMaxSize, Size as GenericSize, GenericLengthOrNumber}; +use crate::values::generics::length::{ + GenericLengthOrNumber, MaxSize as GenericMaxSize, Size as GenericSize, +}; use crate::values::generics::transform::IsZeroLength; use crate::values::generics::NonNegative; use crate::values::specified::length::ViewportPercentageLength; diff --git a/components/style/values/computed/transform.rs b/components/style/values/computed/transform.rs index a78cda03ec0..dd3fe20754c 100644 --- a/components/style/values/computed/transform.rs +++ b/components/style/values/computed/transform.rs @@ -21,7 +21,8 @@ pub type TransformOperation = pub type Transform = generic::Transform; /// The computed value of a CSS `` -pub type TransformOrigin = generic::GenericTransformOrigin; +pub type TransformOrigin = + generic::GenericTransformOrigin; /// A vector to represent the direction vector (rotate axis) for Rotate3D. pub type DirectionVector = Vector3D; diff --git a/components/style/values/generics/background.rs b/components/style/values/generics/background.rs index c133f0c8b85..14ac9744b14 100644 --- a/components/style/values/generics/background.rs +++ b/components/style/values/generics/background.rs @@ -4,7 +4,7 @@ //! Generic types for CSS values related to backgrounds. -use crate::values::generics::length::{LengthPercentageOrAuto, GenericLengthPercentageOrAuto}; +use crate::values::generics::length::{GenericLengthPercentageOrAuto, LengthPercentageOrAuto}; use std::fmt::{self, Write}; use style_traits::{CssWriter, ToCss}; diff --git a/components/style/values/generics/mod.rs b/components/style/values/generics/mod.rs index 5de31317935..737c88e7ba7 100644 --- a/components/style/values/generics/mod.rs +++ b/components/style/values/generics/mod.rs @@ -127,8 +127,8 @@ impl Parse for CounterStyleOrNone { let symbols = Symbols::parse(context, input)?; // There must be at least two symbols for alphabetic or // numeric system. - if (symbols_type == SymbolsType::Alphabetic || - symbols_type == SymbolsType::Numeric) && symbols.0.len() < 2 + if (symbols_type == SymbolsType::Alphabetic || symbols_type == SymbolsType::Numeric) && + symbols.0.len() < 2 { return Err(input.new_custom_error(StyleParseErrorKind::UnspecifiedError)); } @@ -177,7 +177,7 @@ impl SpecifiedValueInfo for CounterStyleOrNone { #[repr(transparent)] pub struct NonNegative(pub T); -impl > Add> for NonNegative { +impl> Add> for NonNegative { type Output = Self; fn add(self, other: Self) -> Self { @@ -185,7 +185,7 @@ impl > Add> for NonNegative { } } -impl Zero for NonNegative { +impl Zero for NonNegative { fn is_zero(&self) -> bool { self.0.is_zero() } diff --git a/components/style/values/generics/position.rs b/components/style/values/generics/position.rs index 3eae408164d..34034b7d5b7 100644 --- a/components/style/values/generics/position.rs +++ b/components/style/values/generics/position.rs @@ -32,7 +32,10 @@ pub use self::GenericPosition as Position; impl Position { /// Returns a new position. pub fn new(horizontal: H, vertical: V) -> Self { - Self { horizontal, vertical } + Self { + horizontal, + vertical, + } } } diff --git a/components/style/values/generics/transform.rs b/components/style/values/generics/transform.rs index 6c98a45dd6c..6c60e76cbf6 100644 --- a/components/style/values/generics/transform.rs +++ b/components/style/values/generics/transform.rs @@ -98,7 +98,11 @@ pub use self::GenericTransformOrigin as TransformOrigin; impl TransformOrigin { /// Returns a new transform origin. pub fn new(horizontal: H, vertical: V, depth: D) -> Self { - Self { horizontal, vertical, depth } + Self { + horizontal, + vertical, + depth, + } } } diff --git a/components/style/values/specified/box.rs b/components/style/values/specified/box.rs index 4b39c6e1a2e..02238bf13db 100644 --- a/components/style/values/specified/box.rs +++ b/components/style/values/specified/box.rs @@ -419,16 +419,7 @@ pub enum ScrollSnapAlignKeyword { /// https://drafts.csswg.org/css-scroll-snap-1/#scroll-snap-align #[allow(missing_docs)] #[cfg_attr(feature = "servo", derive(Deserialize, Serialize))] -#[derive( - Clone, - Copy, - Debug, - Eq, - MallocSizeOf, - PartialEq, - SpecifiedValueInfo, - ToComputedValue, -)] +#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq, SpecifiedValueInfo, ToComputedValue)] #[repr(C)] pub struct ScrollSnapAlign { block: ScrollSnapAlignKeyword, diff --git a/components/style/values/specified/font.rs b/components/style/values/specified/font.rs index 57725294808..0344af275ce 100644 --- a/components/style/values/specified/font.rs +++ b/components/style/values/specified/font.rs @@ -17,7 +17,7 @@ use crate::values::generics::font::{KeywordSize, VariationValue}; use crate::values::generics::NonNegative; use crate::values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX}; use crate::values::specified::{AllowQuirks, Angle, Integer, LengthPercentage}; -use crate::values::specified::{NoCalcLength, Number, NonNegativeNumber, Percentage}; +use crate::values::specified::{NoCalcLength, NonNegativeNumber, Number, Percentage}; use crate::values::CustomIdent; use crate::Atom; use app_units::Au; diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs index 78e699ac042..a8cae981993 100644 --- a/components/style/values/specified/length.rs +++ b/components/style/values/specified/length.rs @@ -11,11 +11,13 @@ use crate::font_metrics::FontMetricsQueryResult; use crate::parser::{Parse, ParserContext}; use crate::values::computed::{self, CSSPixelLength, Context}; use crate::values::generics::length as generics; -use crate::values::generics::length::{MaxSize as GenericMaxSize, Size as GenericSize, GenericLengthOrNumber}; +use crate::values::generics::length::{ + GenericLengthOrNumber, MaxSize as GenericMaxSize, Size as GenericSize, +}; use crate::values::generics::transform::IsZeroLength; use crate::values::generics::NonNegative; -use crate::values::specified::NonNegativeNumber; use crate::values::specified::calc::CalcNode; +use crate::values::specified::NonNegativeNumber; use crate::values::{Auto, CSSFloat, Either, Normal}; use app_units::Au; use cssparser::{Parser, Token}; diff --git a/components/style/values/specified/mod.rs b/components/style/values/specified/mod.rs index de898b35fba..4956d53f177 100644 --- a/components/style/values/specified/mod.rs +++ b/components/style/values/specified/mod.rs @@ -19,10 +19,10 @@ use crate::values::serialize_atom_identifier; use crate::values::specified::calc::CalcNode; use crate::{Atom, Namespace, Prefix}; use cssparser::{Parser, Token}; -use num_traits::{Zero, One}; +use num_traits::{One, Zero}; use std::f32; -use std::ops::Add; use std::fmt::{self, Write}; +use std::ops::Add; use style_traits::values::specified::AllowedNumericType; use style_traits::{CssWriter, ParseError, SpecifiedValueInfo, StyleParseErrorKind, ToCss}; diff --git a/components/style/values/specified/svg.rs b/components/style/values/specified/svg.rs index d2d8dd13798..98db273e61c 100644 --- a/components/style/values/specified/svg.rs +++ b/components/style/values/specified/svg.rs @@ -64,7 +64,7 @@ impl Parse for SVGStrokeDashArray { NonNegativeSvgLengthPercentageOrNumber::parse(context, i) }) }) { - return Ok(generic::SVGStrokeDashArray::Values(values)) + return Ok(generic::SVGStrokeDashArray::Values(values)); } try_match_ident_ignore_ascii_case! { input, diff --git a/components/style/values/specified/text.rs b/components/style/values/specified/text.rs index 60f70537878..1879dc4159a 100644 --- a/components/style/values/specified/text.rs +++ b/components/style/values/specified/text.rs @@ -14,9 +14,9 @@ use crate::values::computed::{Context, ToComputedValue}; use crate::values::generics::text::InitialLetter as GenericInitialLetter; use crate::values::generics::text::LineHeight as GenericLineHeight; use crate::values::generics::text::Spacing; +use crate::values::specified::length::NonNegativeLengthPercentage; use crate::values::specified::length::{FontRelativeLength, Length}; use crate::values::specified::length::{LengthPercentage, NoCalcLength}; -use crate::values::specified::length::{NonNegativeLengthPercentage}; use crate::values::specified::{AllowQuirks, Integer, NonNegativeNumber, Number}; use cssparser::{Parser, Token}; use selectors::parser::SelectorParseErrorKind; diff --git a/components/style_derive/parse.rs b/components/style_derive/parse.rs index 6dc7de21890..b9b7ae37e1c 100644 --- a/components/style_derive/parse.rs +++ b/components/style_derive/parse.rs @@ -70,12 +70,14 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { { let mut where_clause = input.generics.where_clause.take(); for param in input.generics.type_params() { - cg::add_predicate(&mut where_clause, parse_quote!(#param: crate::parser::Parse)); + cg::add_predicate( + &mut where_clause, + parse_quote!(#param: crate::parser::Parse), + ); } input.generics.where_clause = where_clause; } - let name = &input.ident; let s = Structure::new(&input); @@ -140,13 +142,8 @@ pub fn derive(mut input: DeriveInput) -> TokenStream { let mut parse_non_keywords = quote! {}; for (i, (variant, css_attrs, parse_attrs)) in non_keywords.iter().enumerate() { let skip_try = !has_keywords && i == non_keywords.len() - 1; - let parse_variant = parse_non_keyword_variant( - name, - variant, - css_attrs, - parse_attrs, - skip_try, - ); + let parse_variant = + parse_non_keyword_variant(name, variant, css_attrs, parse_attrs, skip_try); parse_non_keywords.extend(parse_variant); }