Bug 1506391 - cargo fix on the merged changes + formatting.

servo/components/style/gecko/pseudo_element.rs

@@ -33,9 +33,7 @@ impl ::selectors::parser::PseudoElement for PseudoElement {
     fn valid_after_slotted(&self) -> bool {
         matches!(
             *self,
-            PseudoElement::Before |
-            PseudoElement::After |
-            PseudoElement::Placeholder
+            PseudoElement::Before | PseudoElement::After | PseudoElement::Placeholder
         )
     }
 

servo/components/style/rule_collector.rs

@@ -4,18 +4,18 @@
 
 //! Collects a series of applicable rules for a given element.
 
-use applicable_declarations::{ApplicableDeclarationBlock, ApplicableDeclarationList};
-use dom::{TElement, TShadowRoot};
-use properties::{AnimationRules, PropertyDeclarationBlock};
-use rule_tree::{CascadeLevel, ShadowCascadeOrder};
-use selector_map::SelectorMap;
-use selector_parser::PseudoElement;
+use crate::applicable_declarations::{ApplicableDeclarationBlock, ApplicableDeclarationList};
+use crate::dom::{TElement, TShadowRoot};
+use crate::properties::{AnimationRules, PropertyDeclarationBlock};
+use crate::rule_tree::{CascadeLevel, ShadowCascadeOrder};
+use crate::selector_map::SelectorMap;
+use crate::selector_parser::PseudoElement;
+use crate::shared_lock::Locked;
+use crate::stylesheets::Origin;
+use crate::stylist::{AuthorStylesEnabled, Rule, RuleInclusion, Stylist};
 use selectors::matching::{ElementSelectorFlags, MatchingContext};
 use servo_arc::ArcBorrow;
-use shared_lock::Locked;
 use smallvec::SmallVec;
-use stylesheets::Origin;
-use stylist::{AuthorStylesEnabled, Rule, RuleInclusion, Stylist};
 
 /// An object that we use with all the intermediate state needed for the
 /// cascade.

servo/components/style/stylist.rs

@@ -1133,7 +1133,8 @@ impl Stylist {
             applicable_declarations,
             context,
             flags_setter,
-        ).collect_all();
+        )
+        .collect_all();
     }
 
     /// Given an id, returns whether there might be any rules for that id in any

servo/components/style/values/computed/mod.rs

@@ -77,8 +77,8 @@ pub use self::svg::{SVGLength, SVGOpacity, SVGPaint, SVGPaintKind};
 pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize};
+pub use self::text::{OverflowWrap, TextOverflow, WordSpacing};
 pub use self::text::{TextAlign, TextEmphasisPosition, TextEmphasisStyle};
-pub use self::text::{TextOverflow, WordSpacing, OverflowWrap};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, Transform, TransformOperation};
 pub use self::transform::{TransformOrigin, TransformStyle, Translate};

servo/components/style/values/computed/text.rs

@@ -19,9 +19,9 @@ use crate::values::{CSSFloat, CSSInteger};
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
 
+pub use crate::values::specified::OverflowWrap;
 pub use crate::values::specified::TextAlignKeyword as TextAlign;
 pub use crate::values::specified::TextEmphasisPosition;
-pub use crate::values::specified::OverflowWrap;
 
 /// A computed value for the `initial-letter` property.
 pub type InitialLetter = GenericInitialLetter<CSSFloat, CSSInteger>;

servo/components/style/values/generics/background.rs

@@ -4,9 +4,9 @@
 
 //! Generic types for CSS values related to backgrounds.
 
+use crate::values::IsAuto;
 use std::fmt::{self, Write};
 use style_traits::{CssWriter, ToCss};
-use values::IsAuto;
 
 /// A generic value for the `background-size` property.
 #[derive(

servo/components/style/values/specified/mod.rs

@@ -75,8 +75,8 @@ pub use self::svg::{SVGPaintOrder, SVGStrokeDashArray, SVGWidth};
 pub use self::svg_path::SVGPathData;
 pub use self::table::XSpan;
 pub use self::text::{InitialLetter, LetterSpacing, LineHeight, MozTabSize, TextAlign};
+pub use self::text::{OverflowWrap, TextEmphasisPosition, TextEmphasisStyle};
 pub use self::text::{TextAlignKeyword, TextDecorationLine, TextOverflow, WordSpacing};
-pub use self::text::{TextEmphasisPosition, TextEmphasisStyle, OverflowWrap};
 pub use self::time::Time;
 pub use self::transform::{Rotate, Scale, Transform};
 pub use self::transform::{TransformOrigin, TransformStyle, Translate};

servo/components/style/values/specified/transform.rs

@@ -395,7 +395,10 @@ impl Parse for Translate {
         }
 
         // 'translate: <length-percentage> '
-        Ok(generic::Translate::Translate(tx, specified::LengthOrPercentage::zero()))
+        Ok(generic::Translate::Translate(
+            tx,
+            specified::LengthOrPercentage::zero(),
+        ))
     }
 }