Brevity, and more colors

Author: matthew-a-thomas

src/background.rs

@@ -2,7 +2,7 @@ use crate::colors::*;
 use core::fmt;
 
 pub trait Background: Sized {
-    fn background(self, rgb: Rgb) -> WithBackground<Self>;
+    fn bg(self, rgb: Rgb) -> WithBackground<Self>;
 }
 
 pub struct WithBackground<T> {
@@ -11,7 +11,7 @@ pub struct WithBackground<T> {
 }
 
 impl<T> Background for &T {
-    fn background(self, rgb: Rgb) -> WithBackground<Self> {
+    fn bg(self, rgb: Rgb) -> WithBackground<Self> {
         WithBackground {
             t: self,
             rgb

src/colors.rs

@@ -8,6 +8,10 @@ pub struct Rgb {
 }
 
 impl Rgb {
+    pub const fn default() -> Self {
+        Self::new(0, 0, 0)
+    }
+
     pub const fn new(r: u8, g: u8, b: u8) -> Self {
         Self {
             r,
@@ -23,46 +27,58 @@ impl Default for Rgb {
     }
 }
 
-pub struct Colors();
+pub const fn white() -> Rgb {
+    Rgb::new(255, 255, 255)
+}
 
-impl Colors {
-    pub fn white() -> Rgb {
-        Rgb::new(255, 255, 255)
-    }
+pub const fn black() -> Rgb {
+    Rgb::default()
+}
 
-    pub fn black() -> Rgb {
-        Default::default()
-    }
+pub const fn red() -> Rgb {
+    Rgb::new(255, 0, 0)
+}
 
-    pub fn red() -> Rgb {
-        Rgb::new(255, 0, 0)
-    }
+pub const fn orange() -> Rgb {
+    Rgb::new(255, 128, 0)
+}
 
-    pub fn orange() -> Rgb {
-        Rgb::new(255, 127, 0)
-    }
+pub const fn yellow() -> Rgb {
+    Rgb::new(255, 255, 0)
+}
 
-    pub fn yellow() -> Rgb {
-        Rgb::new(255, 255, 0)
-    }
+pub const fn yellow_green() -> Rgb {
+    Rgb::new(128, 255, 0)
+}
 
-    pub fn green() -> Rgb {
-        Rgb::new(0, 255, 0)
-    }
+pub const fn green() -> Rgb {
+    Rgb::new(0, 255, 0)
+}
 
-    pub fn cyan() -> Rgb {
-        Rgb::new(0, 255, 255)
-    }
+pub const fn green_cyan() -> Rgb {
+    Rgb::new(0, 255, 128)
+}
 
-    pub fn blue() -> Rgb {
-        Rgb::new(0, 0, 255)
-    }
+pub const fn cyan() -> Rgb {
+    Rgb::new(0, 255, 255)
+}
 
-    pub fn purple() -> Rgb {
-        Rgb::new(127, 0, 127)
-    }
+pub const fn cyan_blue() -> Rgb {
+    Rgb::new(0, 128, 255)
+}
 
-    pub fn violet() -> Rgb {
-        Rgb::new(127, 0, 255)
-    }
+pub const fn blue() -> Rgb {
+    Rgb::new(0, 0, 255)
+}
+
+pub const fn blue_magenta() -> Rgb {
+    Rgb::new(128, 0, 255)
+}
+
+pub const fn magenta() -> Rgb {
+    Rgb::new(255, 0, 255)
+}
+
+pub const fn magenta_pink() -> Rgb {
+    Rgb::new(255, 0, 128)
 }

src/foreground.rs

@@ -2,7 +2,7 @@ use crate::colors::*;
 use core::fmt;
 
 pub trait Foreground: Sized {
-    fn foreground(self, rgb: Rgb) -> WithForeground<Self>;
+    fn fg(self, rgb: Rgb) -> WithForeground<Self>;
 }
 
 pub struct WithForeground<T> {
@@ -11,7 +11,7 @@ pub struct WithForeground<T> {
 }
 
 impl<T> Foreground for &T {
-    fn foreground(self, rgb: Rgb) -> WithForeground<Self> {
+    fn fg(self, rgb: Rgb) -> WithForeground<Self> {
         WithForeground {
             t: self,
             rgb

src/main.rs

@@ -1,14 +1,18 @@
 pub use colored::*;
 
 fn main() {
-    println!("{}, {}, {}, {}, {}, {}, {}, {}",
-        "Red".foreground(Colors::black()).background(Colors::red()),
-        "Orange".foreground(Colors::black()).background(Colors::orange()),
-        "Yellow".foreground(Colors::black()).background(Colors::yellow()),
-        "Green".foreground(Colors::black()).background(Colors::green()),
-        "Cyan".foreground(Colors::black()).background(Colors::cyan()),
-        "Blue".foreground(Colors::white()).background(Colors::blue()),
-        "Purple".foreground(Colors::white()).background(Colors::purple()),
-        "Violet".foreground(Colors::white()).background(Colors::violet())
+    println!("{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}\n{}",
+        "Red".fg(red()),
+        "Orange".fg(orange()),
+        "Yellow".fg(yellow()),
+        "Yellow green".fg(yellow_green()),
+        "Green".fg(green()),
+        "Green cyan".fg(green_cyan()),
+        "Cyan".fg(cyan()),
+        "Cyan blue".fg(white()).bg(cyan_blue()),
+        "Blue".fg(white()).bg(blue()),
+        "Blue magenta".fg(white()).bg(blue_magenta()),
+        "Magenta".fg(magenta()),
+        "Magenta pink".fg(magenta_pink())
     );
 }