Combine WithForeground and WithBackground into Colored

matthew-a-thomas · matthew-a-thomas · commit 0d77122be5a4 · 2020-08-18T11:48:28.000-04:00
diff --git a/src/color.rs b/src/color.rs
@@ -9,63 +9,56 @@ pub enum Canvas {
 /// Generates ANSI escape sequences for a specific kind of color
 pub trait FormatColor {
     /// Apply the color
-    fn prelude(&self, f: &mut fmt::Formatter, canvas: Canvas) -> fmt::Result;
+    fn prelude(&self, f: &mut fmt::Formatter, canvas: &Canvas) -> fmt::Result;
 
     /// Undo the color application
     #[allow(unused)]
-    fn epilogue(&self, f: &mut fmt::Formatter, canvas: Canvas) -> fmt::Result {
+    fn epilogue(&self, f: &mut fmt::Formatter, canvas: &Canvas) -> fmt::Result {
         f.write_str("\x1B[0m")
     }
 }
 
-/// Something with a background color
-pub struct WithBackground<T, TFormatColor: FormatColor> {
+/// Something which has been colored
+pub struct Colored<T, TFormatColor: FormatColor> {
     t: T,
-    color: TFormatColor,
-}
-
-/// Something with a foreground color
-pub struct WithForeground<T, TFormatColor: FormatColor> {
-    t: T,
-    color: TFormatColor,
+    format_color: TFormatColor,
+    canvas: Canvas
 }
 
 /// Adds a foreground or background color
 pub trait Colorable<TFormatColor: FormatColor>: Sized {
     /// Adds the given background color
-    fn bg(self, color: TFormatColor) -> WithBackground<Self, TFormatColor>;
+    fn bg(self, format_color: TFormatColor) -> Colored<Self, TFormatColor>;
 
     /// Adds the given foreground color
-    fn fg(self, color: TFormatColor) -> WithForeground<Self, TFormatColor>;
+    fn fg(self, format_color: TFormatColor) -> Colored<Self, TFormatColor>;
 }
 
 impl<T, TFormatColor: FormatColor> Colorable<TFormatColor> for T {
-    fn bg(self, color: TFormatColor) -> WithBackground<Self, TFormatColor> {
-        WithBackground { t: self, color }
+    fn bg(self, format_color: TFormatColor) -> Colored<Self, TFormatColor> {
+        Colored {
+            t: self,
+            format_color,
+            canvas: Canvas::Background
+        }
     }
 
-    fn fg(self, color: TFormatColor) -> WithForeground<Self, TFormatColor> {
-        WithForeground { t: self, color }
+    fn fg(self, format_color: TFormatColor) -> Colored<Self, TFormatColor> {
+        Colored {
+            t: self,
+            format_color,
+            canvas: Canvas::Foreground
+        }
     }
 }
 
 macro_rules! impl_me {
     ($bound:path) => {
-        impl<T: $bound, TFormatColor: FormatColor> $bound for WithBackground<T, TFormatColor> {
-            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                self.color
-                    .prelude(f, Canvas::Background)
-                    .and_then(|_| self.t.fmt(f))
-                    .and_then(|_| self.color.epilogue(f, Canvas::Background))
-            }
-        }
-
-        impl<T: $bound, TFormatColor: FormatColor> $bound for WithForeground<T, TFormatColor> {
+        impl<T: $bound, TFormatColor: FormatColor> $bound for Colored<T, TFormatColor> {
             fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-                self.color
-                    .prelude(f, Canvas::Foreground)
+                self.format_color.prelude(f, &self.canvas)
                     .and_then(|_| self.t.fmt(f))
-                    .and_then(|_| self.color.epilogue(f, Canvas::Foreground))
+                    .and_then(|_| self.format_color.epilogue(f, &self.canvas))
             }
         }
     };
diff --git a/src/colors.rs b/src/colors.rs
@@ -4,7 +4,7 @@ use core::fmt;
 use rgb::RGB8;
 
 impl FormatColor for RGB8 {
-    fn prelude(&self, f: &mut fmt::Formatter, canvas: crate::Canvas) -> fmt::Result {
+    fn prelude(&self, f: &mut fmt::Formatter, canvas: &crate::Canvas) -> fmt::Result {
         match canvas {
             Canvas::Foreground => write!(f, "\x1B[38;2;{};{};{}m", self.r, self.g, self.b),
             Canvas::Background => write!(f, "\x1B[48;2;{};{};{}m", self.r, self.g, self.b),
@@ -98,7 +98,7 @@ pub enum Color3 {
 }
 
 impl FormatColor for Color3 {
-    fn prelude(&self, f: &mut fmt::Formatter, canvas: crate::Canvas) -> fmt::Result {
+    fn prelude(&self, f: &mut fmt::Formatter, canvas: &crate::Canvas) -> fmt::Result {
         match canvas {
             Canvas::Foreground => write!(f, "\x1B[{}m", 30 + *self as u8),
             Canvas::Background => write!(f, "\x1B[{}m", 40 + *self as u8),
@@ -143,7 +143,7 @@ impl Color4 {
 }
 
 impl FormatColor for Color4 {
-    fn prelude(&self, f: &mut fmt::Formatter, canvas: crate::Canvas) -> fmt::Result {
+    fn prelude(&self, f: &mut fmt::Formatter, canvas: &crate::Canvas) -> fmt::Result {
         match canvas {
             Canvas::Foreground => write!(
                 f,
@@ -180,7 +180,7 @@ impl Color8 {
 }
 
 impl FormatColor for Color8 {
-    fn prelude(&self, f: &mut fmt::Formatter, canvas: Canvas) -> fmt::Result {
+    fn prelude(&self, f: &mut fmt::Formatter, canvas: &Canvas) -> fmt::Result {
         write!(
             f,
             "\x1B[{};5;{}m",
