Bump edition to now stable 2024 edition (shiny!).

2025-02-23 11:52:54 +00:00
parent 9f83c5f295
commit b8aa203c05
14 changed files with 214 additions and 171 deletions
@@ -1,6 +1,6 @@
 #[repr(u32)]
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
-pub enum Color {
+pub enum Colour {
    ARGB(u8, u8, u8, u8),
    RGB(u8, u8, u8),
    HexARGB(u32),
@@ -14,40 +14,40 @@ pub enum Color {
    White = 0xFFFFFFFF,
 }

-impl Into<u32> for Color {
-    fn into(self) -> u32 {
-        match self {
-            Color::ARGB(a, r, g, b) => {
+impl From<Colour> for u32 {
+    fn from(val: Colour) -> Self {
+        match val {
+            Colour::ARGB(a, r, g, b) => {
                (a as u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | (b as u32)
            }
-            Color::RGB(r, g, b) => (0u32) << 24 | (r as u32) << 16 | (g as u32) << 8 | (b as u32),
-            Color::HexARGB(hex) => hex,
-            Color::Black => 0xFF000000,
-            Color::Blue => 0xFF0000FF,
-            Color::Green => 0xFF00FF00,
-            Color::Cyan => 0xFF00FFFF,
-            Color::Red => 0xFFFF0000,
-            Color::Magenta => 0xFFFF00FF,
-            Color::Yellow => 0xFFFFFF00,
-            Color::White => 0xFFFFFFFF,
+            Colour::RGB(r, g, b) => ((r as u32) << 16) | (g as u32) << 8 | (b as u32),
+            Colour::HexARGB(hex) => hex,
+            Colour::Black => 0xFF000000,
+            Colour::Blue => 0xFF0000FF,
+            Colour::Green => 0xFF00FF00,
+            Colour::Cyan => 0xFF00FFFF,
+            Colour::Red => 0xFFFF0000,
+            Colour::Magenta => 0xFFFF00FF,
+            Colour::Yellow => 0xFFFFFF00,
+            Colour::White => 0xFFFFFFFF,
        }
    }
 }

-impl core::fmt::Display for Color {
+impl core::fmt::Display for Colour {
    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
        match self {
-            Color::ARGB(r, g, b, a) => write!(f, "RGBA(#{:x}{:x}{:x}{:x})", r, g, b, a),
-            Color::RGB(r, g, b) => write!(f, "RGB(#{:x}{:x}{:x})", r, g, b),
-            Color::HexARGB(hex) => write!(f, "Hex(#{:x})", hex),
-            Color::Black => write!(f, "Black"),
-            Color::Blue => write!(f, "Blue"),
-            Color::Green => write!(f, "Green"),
-            Color::Cyan => write!(f, "Cyan"),
-            Color::Red => write!(f, "Red"),
-            Color::Magenta => write!(f, "Magenta"),
-            Color::Yellow => write!(f, "Yellow"),
-            Color::White => write!(f, "White"),
+            Colour::ARGB(r, g, b, a) => write!(f, "RGBA(#{:x}{:x}{:x}{:x})", r, g, b, a),
+            Colour::RGB(r, g, b) => write!(f, "RGB(#{:x}{:x}{:x})", r, g, b),
+            Colour::HexARGB(hex) => write!(f, "Hex(#{:x})", hex),
+            Colour::Black => write!(f, "Black"),
+            Colour::Blue => write!(f, "Blue"),
+            Colour::Green => write!(f, "Green"),
+            Colour::Cyan => write!(f, "Cyan"),
+            Colour::Red => write!(f, "Red"),
+            Colour::Magenta => write!(f, "Magenta"),
+            Colour::Yellow => write!(f, "Yellow"),
+            Colour::White => write!(f, "White"),
        }
    }
 }