Rename Absolute color enum values to follow rust coding style.

Author: tiaanl

src/color.rs

@@ -355,32 +355,32 @@ impl_lch_like!(Oklch, "oklch");
 #[derive(Clone, Copy, PartialEq, Debug)]
 pub enum AbsoluteColor {
     /// Specify sRGB colors directly by their red/green/blue/alpha chanels.
-    RGBA(Rgba),
+    Rgba(Rgba),
     /// Specifies a CIELAB color by CIE Lightness and its a- and b-axis hue
     /// coordinates (red/green-ness, and yellow/blue-ness) using the CIE LAB
     /// rectangular coordinate model.
-    LAB(Lab),
+    Lab(Lab),
     /// Specifies a CIELAB color by CIE Lightness, Chroma, and hue using the
     /// CIE LCH cylindrical coordinate model.
-    LCH(Lch),
+    Lch(Lch),
     /// Specifies an Oklab color by Oklab Lightness and its a- and b-axis hue
     /// coordinates (red/green-ness, and yellow/blue-ness) using the Oklab
     /// rectangular coordinate model.
-    OKLAB(Oklab),
+    Oklab(Oklab),
     /// Specifies an Oklab color by Oklab Lightness, Chroma, and hue using
     /// the OKLCH cylindrical coordinate model.
-    OKLCH(Oklch),
+    Oklch(Oklch),
 }
 
 impl AbsoluteColor {
     /// Return the alpha component of any of the schemes within.
     pub fn alpha(&self) -> f32 {
         match self {
-            Self::RGBA(c) => c.alpha,
-            Self::LAB(c) => c.alpha,
-            Self::LCH(c) => c.alpha,
-            Self::OKLAB(c) => c.alpha,
-            Self::OKLCH(c) => c.alpha,
+            Self::Rgba(c) => c.alpha,
+            Self::Lab(c) => c.alpha,
+            Self::Lch(c) => c.alpha,
+            Self::Oklab(c) => c.alpha,
+            Self::Oklch(c) => c.alpha,
         }
     }
 }
@@ -391,11 +391,11 @@ impl ToCss for AbsoluteColor {
         W: fmt::Write,
     {
         match self {
-            Self::RGBA(rgba) => rgba.to_css(dest),
-            Self::LAB(lab) => lab.to_css(dest),
-            Self::LCH(lch) => lch.to_css(dest),
-            Self::OKLAB(lab) => lab.to_css(dest),
-            Self::OKLCH(lch) => lch.to_css(dest),
+            Self::Rgba(rgba) => rgba.to_css(dest),
+            Self::Lab(lab) => lab.to_css(dest),
+            Self::Lch(lch) => lch.to_css(dest),
+            Self::Oklab(lab) => lab.to_css(dest),
+            Self::Oklch(lch) => lch.to_css(dest),
         }
     }
 }
@@ -407,7 +407,7 @@ pub(crate) const fn rgb(red: u8, green: u8, blue: u8) -> Color {
 
 #[inline]
 pub(crate) const fn rgba(red: u8, green: u8, blue: u8, alpha: f32) -> Color {
-    Color::Absolute(AbsoluteColor::RGBA(Rgba::new(red, green, blue, alpha)))
+    Color::Absolute(AbsoluteColor::Rgba(Rgba::new(red, green, blue, alpha)))
 }
 
 /// A <color> value.
@@ -566,7 +566,7 @@ impl Color {
         let token = input.next()?;
         match *token {
             Token::Hash(ref value) | Token::IDHash(ref value) => Rgba::parse_hash(value.as_bytes())
-                .map(|rgba| Color::Absolute(AbsoluteColor::RGBA(rgba))),
+                .map(|rgba| Color::Absolute(AbsoluteColor::Rgba(rgba))),
             Token::Ident(ref value) => parse_color_keyword(&*value),
             Token::Function(ref name) => {
                 let name = name.clone();
@@ -806,25 +806,25 @@ where
         // for L: 0% = 0.0, 100% = 100.0
         // for a and b: -100% = -125, 100% = 125
         "lab" => parse_lab_like(component_parser, arguments, 100.0, 125.0, |l, a, b, alpha| {
-            Color::Absolute(AbsoluteColor::LAB(Lab::new(l.max(0.), a , b , alpha)))
+            Color::Absolute(AbsoluteColor::Lab(Lab::new(l.max(0.), a , b , alpha)))
         }),
 
         // for L: 0% = 0.0, 100% = 100.0
         // for C: 0% = 0, 100% = 150
         "lch" => parse_lch_like(component_parser, arguments, 100.0, 150.0, |l, c, h, alpha| {
-            Color::Absolute(AbsoluteColor::LCH(Lch::new(l.max(0.), c.max(0.), h, alpha)))
+            Color::Absolute(AbsoluteColor::Lch(Lch::new(l.max(0.), c.max(0.), h, alpha)))
         }),
 
         // for L: 0% = 0.0, 100% = 1.0
         // for a and b: -100% = -0.4, 100% = 0.4
         "oklab" => parse_lab_like(component_parser, arguments, 1.0, 0.4, |l, a, b, alpha| {
-            Color::Absolute(AbsoluteColor::OKLAB(Oklab::new(l.max(0.), a, b, alpha)))
+            Color::Absolute(AbsoluteColor::Oklab(Oklab::new(l.max(0.), a, b, alpha)))
         }),
 
         // for L: 0% = 0.0, 100% = 1.0
         // for C: 0% = 0.0 100% = 0.4
         "oklch" => parse_lch_like(component_parser, arguments, 1.0, 0.4, |l, c, h, alpha| {
-            Color::Absolute(AbsoluteColor::OKLCH(Oklch::new(l.max(0.), c.max(0.), h, alpha)))
+            Color::Absolute(AbsoluteColor::Oklch(Oklch::new(l.max(0.), c.max(0.), h, alpha)))
         }),
 
         _ => return Err(arguments.new_unexpected_token_error(Token::Ident(name.to_owned().into()))),

src/tests.rs

@@ -551,7 +551,7 @@ fn serialize_rgba() {
 
 #[test]
 fn serialize_rgba_two_digit_float_if_roundtrips() {
-    let c = Color::Absolute(AbsoluteColor::RGBA(Rgba::from_floats(0., 0., 0., 0.5)));
+    let c = Color::Absolute(AbsoluteColor::Rgba(Rgba::from_floats(0., 0., 0., 0.5)));
     assert_eq!(c.to_css_string(), "rgba(0, 0, 0, 0.5)");
 }
 
@@ -845,13 +845,13 @@ impl ToJson for Color {
         match *self {
             Color::CurrentColor => "currentcolor".to_json(),
             Color::Absolute(absolute) => match absolute {
-                AbsoluteColor::RGBA(ref rgba) => {
+                AbsoluteColor::Rgba(ref rgba) => {
                     json!([rgba.red, rgba.green, rgba.blue, rgba.alpha])
                 }
-                AbsoluteColor::LAB(ref c) => json!([c.lightness, c.a, c.b, c.alpha]),
-                AbsoluteColor::LCH(ref c) => json!([c.lightness, c.chroma, c.hue, c.alpha]),
-                AbsoluteColor::OKLAB(ref c) => json!([c.lightness, c.a, c.b, c.alpha]),
-                AbsoluteColor::OKLCH(ref c) => json!([c.lightness, c.chroma, c.hue, c.alpha]),
+                AbsoluteColor::Lab(ref c) => json!([c.lightness, c.a, c.b, c.alpha]),
+                AbsoluteColor::Lch(ref c) => json!([c.lightness, c.chroma, c.hue, c.alpha]),
+                AbsoluteColor::Oklab(ref c) => json!([c.lightness, c.a, c.b, c.alpha]),
+                AbsoluteColor::Oklch(ref c) => json!([c.lightness, c.chroma, c.hue, c.alpha]),
             },
         }
     }