get some tests passing

1 files changed, 13 insertions, 27 deletions

diff --git a/src/cell.rs b/src/cell.rs
index b1821c6..b5210e5 100644
--- a/src/cell.rs
+++ b/src/cell.rs
@@ -1,12 +1,7 @@
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, Default)]
 pub struct Cell {
     contents: String,
-    fgcolor: crate::color::Color,
-    bgcolor: crate::color::Color,
-    bold: bool,
-    italic: bool,
-    inverse: bool,
-    underline: bool,
+    attrs: crate::attrs::Attrs,
 }
 
 impl Cell {
@@ -14,45 +9,36 @@ impl Cell {
         Self::default()
     }
 
+    pub(crate) fn set(&mut self, c: String, a: crate::attrs::Attrs) {
+        self.contents = c;
+        self.attrs = a;
+    }
+
     pub fn contents(&self) -> &str {
         &self.contents
     }
 
     pub fn fgcolor(&self) -> crate::color::Color {
-        self.fgcolor
+        self.attrs.fgcolor
     }
 
     pub fn bgcolor(&self) -> crate::color::Color {
-        self.bgcolor
+        self.attrs.bgcolor
     }
 
     pub fn bold(&self) -> bool {
-        self.bold
+        self.attrs.bold
     }
 
     pub fn italic(&self) -> bool {
-        self.italic
+        self.attrs.italic
     }
 
     pub fn inverse(&self) -> bool {
-        self.inverse
+        self.attrs.inverse
     }
 
     pub fn underline(&self) -> bool {
-        self.underline
-    }
-}
-
-impl Default for Cell {
-    fn default() -> Self {
-        Self {
-            contents: String::new(),
-            fgcolor: crate::color::Color::Default,
-            bgcolor: crate::color::Color::Default,
-            bold: false,
-            italic: false,
-            inverse: false,
-            underline: false,
-        }
+        self.attrs.underline
     }
 }