Factor out parse_modern_alpha.

Author: tiaanl

src/color.rs

@@ -1269,6 +1269,21 @@ where
     })
 }
 
+fn parse_modern_alpha<'i, 't, P>(
+    color_parser: &P,
+    arguments: &mut Parser<'i, 't>,
+) -> Result<Option<f32>, ParseError<'i, P::Error>>
+where
+    P: ColorParser<'i>,
+{
+    if !arguments.is_exhausted() {
+        arguments.expect_delim('/')?;
+        parse_none_or(arguments, |p| parse_alpha_component(color_parser, p))
+    } else {
+        Ok(Some(OPAQUE))
+    }
+}
+
 #[inline]
 fn parse_rgb<'i, 't, P>(
     color_parser: &P,
@@ -1324,12 +1339,7 @@ where
             color_parser.parse_number_or_percentage(p)
         })?);
 
-        if !arguments.is_exhausted() {
-            arguments.expect_delim('/')?;
-            parse_none_or(arguments, |p| parse_alpha_component(color_parser, p))?.unwrap_or(0.0)
-        } else {
-            OPAQUE
-        }
+        parse_modern_alpha(color_parser, arguments)?.unwrap_or(0.0)
     };
 
     Ok(P::Output::from_rgba(red, green, blue, alpha))
@@ -1364,12 +1374,7 @@ where
         saturation = parse_none_or(arguments, |p| color_parser.parse_percentage(p))?.unwrap_or(0.0);
         lightness = parse_none_or(arguments, |p| color_parser.parse_percentage(p))?.unwrap_or(0.0);
 
-        if !arguments.is_exhausted() {
-            arguments.expect_delim('/')?;
-            parse_none_or(arguments, |p| parse_alpha_component(color_parser, p))?.unwrap_or(0.0)
-        } else {
-            OPAQUE
-        }
+        parse_modern_alpha(color_parser, arguments)?.unwrap_or(0.0)
     };
 
     let hue = if let Some(h) = maybe_hue {
@@ -1570,12 +1575,7 @@ where
     let r2 = parse_none_or(input, |p| f2(color_parser, p))?;
     let r3 = parse_none_or(input, |p| f3(color_parser, p))?;
 
-    let alpha = if !input.is_exhausted() {
-        input.expect_delim('/')?;
-        parse_none_or(input, |p| parse_alpha_component(color_parser, p))?
-    } else {
-        Some(OPAQUE)
-    };
+    let alpha = parse_modern_alpha(color_parser, input)?;
 
     Ok((r1, r2, r3, alpha))
 }

src/tests.rs

@@ -1624,6 +1624,10 @@ fn generic_parser() {
             "hsl(none 10% none / none)",
             OutputType::Hsl(0.0, 0.1, 0.0, 0.0),
         ),
+        (
+            "hsl(120 100.0% 50.0%)",
+            OutputType::Hsl(120.0, 1.0, 0.5, 1.0),
+        ),
         (
             "hwb(45deg 20% 30% / 0.4)",
             OutputType::Hwb(Some(45.0), Some(0.2), Some(0.3), Some(0.4)),