Change parse_hash_color to output a FromParsedColor.

Author: tiaanl

src/color.rs

@@ -842,31 +842,30 @@ pub trait FromParsedColor {
 
 /// Parse a color hash, without the leading '#' character.
 #[inline]
-
-pub fn parse_hash_color<'i, 't, P>(value: &[u8]) -> Result<P::Output, ()>
+pub fn parse_hash_color<'i, 't, O>(value: &[u8]) -> Result<O, ()>
 where
-    P: ColorParser<'i>,
+    O: FromParsedColor,
 {
     Ok(match value.len() {
-        8 => P::Output::from_rgba(
+        8 => O::from_rgba(
             Some(from_hex(value[0])? * 16 + from_hex(value[1])?),
             Some(from_hex(value[2])? * 16 + from_hex(value[3])?),
             Some(from_hex(value[4])? * 16 + from_hex(value[5])?),
             Some((from_hex(value[6])? * 16 + from_hex(value[7])?) as f32 / 255.0),
         ),
-        6 => P::Output::from_rgba(
+        6 => O::from_rgba(
             Some(from_hex(value[0])? * 16 + from_hex(value[1])?),
             Some(from_hex(value[2])? * 16 + from_hex(value[3])?),
             Some(from_hex(value[4])? * 16 + from_hex(value[5])?),
             Some(OPAQUE),
         ),
-        4 => P::Output::from_rgba(
+        4 => O::from_rgba(
             Some(from_hex(value[0])? * 17),
             Some(from_hex(value[1])? * 17),
             Some(from_hex(value[2])? * 17),
             Some((from_hex(value[3])? * 17) as f32 / 255.0),
         ),
-        3 => P::Output::from_rgba(
+        3 => O::from_rgba(
             Some(from_hex(value[0])? * 17),
             Some(from_hex(value[1])? * 17),
             Some(from_hex(value[2])? * 17),
@@ -888,9 +887,7 @@ where
     let location = input.current_source_location();
     let token = input.next()?;
     match *token {
-        Token::Hash(ref value) | Token::IDHash(ref value) => {
-            parse_hash_color::<P>(value.as_bytes())
-        }
+        Token::Hash(ref value) | Token::IDHash(ref value) => parse_hash_color(value.as_bytes()),
         Token::Ident(ref value) => parse_color_keyword(&*value),
         Token::Function(ref name) => {
             let name = name.clone();

src/lib.rs

@@ -68,8 +68,8 @@ fn parse_border_spacing(_context: &ParserContext, input: &mut Parser)
 #![recursion_limit = "200"] // For color::parse_color_keyword
 
 pub use crate::color::{
-    hsl_to_rgb, hwb_to_rgb, parse_color_keyword, parse_color_with, AngleOrNumber, Color,
-    ColorFunction, ColorParser, FromParsedColor, Lab, Lch, NumberOrPercentage, Oklab, Oklch,
+    hsl_to_rgb, hwb_to_rgb, parse_color_keyword, parse_color_with, parse_hash_color, AngleOrNumber,
+    Color, ColorFunction, ColorParser, FromParsedColor, Lab, Lch, NumberOrPercentage, Oklab, Oklch,
     PredefinedColorSpace, RGBA,
 };
 pub use crate::cow_rc_str::CowRcStr;

src/tests.rs

@@ -1626,20 +1626,20 @@ fn generic_parser() {
         ("rgba(1, 2, 3, 0.4)",          OutputType::Rgba(Some(1), Some(2), Some(3), Some(0.4))),
         ("rgb(none none none / none)",  OutputType::Rgba(None, None, None, None)),
         ("rgb(1 none 3 / none)",        OutputType::Rgba(Some(1), None, Some(3), None)),
-        
+
         ("hsla(45deg, 20%, 30%, 0.4)",  OutputType::Hsl(Some(45.0), Some(0.2), Some(0.3), Some(0.4))),
         ("hsl(45deg none none)",        OutputType::Hsl(Some(45.0), None, None, Some(1.0))),
         ("hsl(none 10% none / none)",   OutputType::Hsl(None, Some(0.1), None, None)),
         ("hsl(120 100.0% 50.0%)",       OutputType::Hsl(Some(120.0), Some(1.0), Some(0.5), Some(1.0))),
-        
+
         ("hwb(45deg 20% 30% / 0.4)",    OutputType::Hwb(Some(45.0), Some(0.2), Some(0.3), Some(0.4))),
-        
+
         ("lab(100 20 30 / 0.4)",        OutputType::Lab(Some(100.0), Some(20.0), Some(30.0), Some(0.4))),
         ("lch(100 20 30 / 0.4)",        OutputType::Lch(Some(100.0), Some(20.0), Some(30.0), Some(0.4))),
-        
+
         ("oklab(100 20 30 / 0.4)",      OutputType::Oklab(Some(100.0), Some(20.0), Some(30.0), Some(0.4))),
         ("oklch(100 20 30 / 0.4)",      OutputType::Oklch(Some(100.0), Some(20.0), Some(30.0), Some(0.4))),
-        
+
         ("color(srgb 0.1 0.2 0.3 / 0.4)",           OutputType::ColorFunction(PredefinedColorSpace::Srgb, Some(0.1), Some(0.2), Some(0.3), Some(0.4))),
         ("color(srgb none none none)",              OutputType::ColorFunction(PredefinedColorSpace::Srgb, None, None, None, Some(1.0))),
         ("color(srgb none none none / none)",       OutputType::ColorFunction(PredefinedColorSpace::Srgb, None, None, None, None)),