style: Simplify some code in NoCalcLength::parse_dimension.

Differential Revision: https://phabricator.services.mozilla.com/D3473
servo · Aug 18, 2018 · f1fe159 · f1fe159
1 parent dc0f937
commit f1fe159
Showing 1 changed file with 26 additions and 38 deletions.
diff --git a/components/style/values/specified/length.rs b/components/style/values/specified/length.rs
@@ -421,46 +421,34 @@ impl NoCalcLength {
         value: CSSFloat,
         unit: &str,
     ) -> Result<Self, ()> {
-        match_ignore_ascii_case! { unit,
+        Ok(match_ignore_ascii_case! { unit,
-            "px" => Ok(NoCalcLength::Absolute(AbsoluteLength::Px(value))),
+            "px" => NoCalcLength::Absolute(AbsoluteLength::Px(value)),
-            "in" => Ok(NoCalcLength::Absolute(AbsoluteLength::In(value))),
+            "in" => NoCalcLength::Absolute(AbsoluteLength::In(value)),
-            "cm" => Ok(NoCalcLength::Absolute(AbsoluteLength::Cm(value))),
+            "cm" => NoCalcLength::Absolute(AbsoluteLength::Cm(value)),
-            "mm" => Ok(NoCalcLength::Absolute(AbsoluteLength::Mm(value))),
+            "mm" => NoCalcLength::Absolute(AbsoluteLength::Mm(value)),
-            "q" => Ok(NoCalcLength::Absolute(AbsoluteLength::Q(value))),
+            "q" => NoCalcLength::Absolute(AbsoluteLength::Q(value)),
-            "pt" => Ok(NoCalcLength::Absolute(AbsoluteLength::Pt(value))),
+            "pt" => NoCalcLength::Absolute(AbsoluteLength::Pt(value)),
-            "pc" => Ok(NoCalcLength::Absolute(AbsoluteLength::Pc(value))),
+            "pc" => NoCalcLength::Absolute(AbsoluteLength::Pc(value)),
             // font-relative
-            "em" => Ok(NoCalcLength::FontRelative(FontRelativeLength::Em(value))),
+            "em" => NoCalcLength::FontRelative(FontRelativeLength::Em(value)),
-            "ex" => Ok(NoCalcLength::FontRelative(FontRelativeLength::Ex(value))),
+            "ex" => NoCalcLength::FontRelative(FontRelativeLength::Ex(value)),
-            "ch" => Ok(NoCalcLength::FontRelative(FontRelativeLength::Ch(value))),
+            "ch" => NoCalcLength::FontRelative(FontRelativeLength::Ch(value)),
-            "rem" => Ok(NoCalcLength::FontRelative(FontRelativeLength::Rem(value))),
+            "rem" => NoCalcLength::FontRelative(FontRelativeLength::Rem(value)),
             // viewport percentages
-            "vw" => {
+            "vw" if !context.in_page_rule() => {
-                if context.in_page_rule() {
+                NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vw(value))
-                    return Err(())
+            }
-                }
+            "vh" if !context.in_page_rule() => {
-                Ok(NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vw(value)))
+                NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vh(value))
-            },
+            }
-            "vh" => {
+            "vmin" if !context.in_page_rule() => {
-                if context.in_page_rule() {
+                NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmin(value))
-                    return Err(())
+            }
-                }
+            "vmax" if !context.in_page_rule() => {
-                Ok(NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vh(value)))
+                NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmax(value))
-            },
+            }
-            "vmin" => {
+            _ => return Err(())
-                if context.in_page_rule() {
+        })
-                    return Err(())
-                }
-                Ok(NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmin(value)))
-            },
-            "vmax" => {
-                if context.in_page_rule() {
-                    return Err(())
-                }
-                Ok(NoCalcLength::ViewportPercentage(ViewportPercentageLength::Vmax(value)))
-            },
-            _ => Err(())
-        }
     }
 
     #[inline]