Rename Type name of SvgLengthOrPercentageOrNumber

components/style/properties/helpers/animated_properties.mako.rs

@@ -2292,8 +2292,12 @@ impl From<NonNegativeNumber> for NumberOrPercentage {
 impl From<LengthOrPercentage> for NumberOrPercentage {
     fn from(lop: LengthOrPercentage) -> NumberOrPercentage {
         match lop {
-            LengthOrPercentage::Length(len) => NumberOrPercentage::Number(len.to_f32_px()),
-            LengthOrPercentage::Percentage(p) => NumberOrPercentage::Percentage(p),
+            LengthOrPercentage::Length(len) => {
+                NumberOrPercentage::Number(len.to_f32_px())
+            },
+            LengthOrPercentage::Percentage(p) => {
+                NumberOrPercentage::Percentage(p)
+            },
             LengthOrPercentage::Calc(_) => {
                 panic!("We dont't expected calc interpolation for SvgLengthOrPercentageOrNumber");
             },
@@ -2307,31 +2311,33 @@ impl From<Number> for NumberOrPercentage {
     }
 }
 
-fn convert_to_number_or_percentage<LengthOrPercentageType, NumberType>(
-    from: SvgLengthOrPercentageOrNumber<LengthOrPercentageType, NumberType>)
+fn convert_to_number_or_percentage<L, N>(from: SvgLengthOrPercentageOrNumber<L, N>)
     -> NumberOrPercentage
-    where LengthOrPercentageType: Into<NumberOrPercentage>,
-          NumberType: Into<NumberOrPercentage>
+    where
+        L: Into<NumberOrPercentage>,
+        N: Into<NumberOrPercentage>
 {
     match from {
-        SvgLengthOrPercentageOrNumber::LengthOrPercentage(lop) => {
+        SvgLengthOrPercentageOrNumber::LengthOrPercentage(lop) =>
+        {
             lop.into()
         }
-        SvgLengthOrPercentageOrNumber::Number(num) => {
+        SvgLengthOrPercentageOrNumber::Number(num) =>
+        {
             num.into()
         }
     }
 }
 
-fn convert_from_number_or_percentage<LengthOrPercentageType, NumberType>(
-    from: NumberOrPercentage)
-    -> SvgLengthOrPercentageOrNumber<LengthOrPercentageType, NumberType>
-    where LengthOrPercentageType: From<LengthOrPercentage>,
-          NumberType: From<Number>
+fn convert_from_number_or_percentage<L, N>(from: NumberOrPercentage)
+    -> SvgLengthOrPercentageOrNumber<L, N>
+    where
+        L: From<LengthOrPercentage>,
+        N: From<Number>
 {
     match from {
         NumberOrPercentage::Number(num) =>
-            SvgLengthOrPercentageOrNumber::Number(num.into()),
+            SvgLengthOrPercentageOrNumber::Number(From::from(num)),
         NumberOrPercentage::Percentage(p) =>
             SvgLengthOrPercentageOrNumber::LengthOrPercentage(
                 (LengthOrPercentage::Percentage(p)).into())

components/style/values/generics/svg.rs

@@ -106,11 +106,11 @@ impl<ColorType: Parse, UrlPaintServer: Parse> Parse for SVGPaint<ColorType, UrlP
 #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
 #[derive(Clone, Copy, Debug, PartialEq, ToAnimatedValue)]
 #[derive(ToAnimatedZero, ToComputedValue, ToCss)]
-pub enum SvgLengthOrPercentageOrNumber<LengthOrPercentage, Number> {
+pub enum SvgLengthOrPercentageOrNumber<L, N> {
     /// <length> | <percentage>
-    LengthOrPercentage(LengthOrPercentage),
+    LengthOrPercentage(L),
     /// <number>
-    Number(Number),
+    Number(N),
 }
 
 impl<L, N> ComputeSquaredDistance for SvgLengthOrPercentageOrNumber<L, N>
@@ -149,15 +149,15 @@ impl<L, N> ComputeSquaredDistance for SvgLengthOrPercentageOrNumber<L, N>
     }
 }
 
-impl<LengthOrPercentageType, NumberType> SvgLengthOrPercentageOrNumber<LengthOrPercentageType, NumberType>
-    where LengthOrPercentage: From<LengthOrPercentageType>,
-          LengthOrPercentageType: Copy
+impl<L, N> SvgLengthOrPercentageOrNumber<L, N>
+    where
+        L: Into<LengthOrPercentage> + Copy
 {
     /// return true if this struct has calc value.
     pub fn has_calc(&self) -> bool {
         match self {
             &SvgLengthOrPercentageOrNumber::LengthOrPercentage(lop) => {
-                match LengthOrPercentage::from(lop) {
+                match lop.into() {
                     LengthOrPercentage::Calc(_) => true,
                     _ => false,
                 }
@@ -169,15 +169,14 @@ impl<LengthOrPercentageType, NumberType> SvgLengthOrPercentageOrNumber<LengthOrP
 
 /// Parsing the SvgLengthOrPercentageOrNumber. At first, we need to parse number
 /// since prevent converting to the length.
-impl <LengthOrPercentageType: Parse, NumberType: Parse> Parse for
-    SvgLengthOrPercentageOrNumber<LengthOrPercentageType, NumberType> {
+impl <L: Parse, N: Parse> Parse for SvgLengthOrPercentageOrNumber<L, N> {
     fn parse<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
                      -> Result<Self, ParseError<'i>> {
-        if let Ok(num) = input.try(|i| NumberType::parse(context, i)) {
+        if let Ok(num) = input.try(|i| N::parse(context, i)) {
             return Ok(SvgLengthOrPercentageOrNumber::Number(num));
         }
 
-        if let Ok(lop) = input.try(|i| LengthOrPercentageType::parse(context, i)) {
+        if let Ok(lop) = input.try(|i| L::parse(context, i)) {
             return Ok(SvgLengthOrPercentageOrNumber::LengthOrPercentage(lop));
         }
         Err(StyleParseError::UnspecifiedError.into())