Decode embed/role colours into Colour struct

This is for a little bit of ergonomics, and is of such a minute cost
that it is worth it to just directly decode the u32's received for
Role/Embed colours into the Colour struct.

1 files changed, 11 insertions, 0 deletions

diff --git a/src/utils/colour.rs b/src/utils/colour.rs
index b9a3bf5..e2c70e6 100644
--- a/src/utils/colour.rs
+++ b/src/utils/colour.rs
@@ -1,4 +1,5 @@
 use std::default::Default;
+use ::internal::prelude::*;
 
 macro_rules! colour {
     ($struct_:ident; $($name:ident, $val:expr;)*) => {
@@ -49,6 +50,7 @@ macro_rules! colour {
 /// [`Role`]: ../model/struct.Role.html
 /// [`dark_teal`]: #method.dark_teal
 /// [`get_g`]: #method.get_g
+#[derive(Clone, Copy, Debug)]
 pub struct Colour {
     /// The raw inner integer value of this Colour. This is worked with to
     /// generate values such as the red component value.
@@ -63,6 +65,15 @@ impl Colour {
         }
     }
 
+    #[doc(hidden)]
+    pub fn decode(value: Value) -> Result<Colour> {
+        match value {
+            Value::U64(v) => Ok(Colour::new(v as u32)),
+            Value::I64(v) => Ok(Colour::new(v as u32)),
+            other => Err(Error::Decode("Expected valid colour", other)),
+        }
+    }
+
     /// Returns the red RGB component of this Colour.
     pub fn get_r(&self) -> u8 {
         ((self.value >> 16) & 255) as u8