Renamed new enums

src/symbols.rs

@@ -231,15 +231,15 @@ pub enum Marker {
     /// Up to 8 points per cell
     Braille,
     /// extra markers from 'block'
-    ExtraBlock(Block),
+    Blocks(Block),
     /// extra markers from 'bar'
-    ExtraBar(Bar),
+    Bars(Bar),
     /// extra markers from 'line'
-    ExtraLine(Line),
+    Lines(Line),
     
 }
 #[derive(Debug, Clone, Copy)]
-pub enum Block {
+pub enum Blocks {
     /// One point per cell completely filled
     FULL,
     SevenEights,
@@ -252,7 +252,7 @@ pub enum Block {
 }
 
 #[derive(Debug, Clone, Copy)]
-pub enum Bar {
+pub enum Bars {
     /// One point per cell completely filled
     FULL,
     SevenEights,
@@ -265,7 +265,7 @@ pub enum Bar {
 }
 
 #[derive(Debug, Clone, Copy)]
-pub enum Line {
+pub enum Lines {
     /// One point per cell completely filled
     VERTICAL,
     DoubleVertical,

src/widgets/canvas/mod.rs

@@ -265,7 +265,7 @@ impl<'a> Context<'a> {
             symbols::Marker::Block => Box::new(CharGrid::new(width, height, '▄')),
             symbols::Marker::Braille => Box::new(BrailleGrid::new(width, height)),
             // added FULL so I can graph a 'background'
-            symbols::Marker::ExtraBlock(marker) => {
+            symbols::Marker::Blocks(marker) => {
                 match marker {
                     symbols::Block::FULL => Box::new(CharGrid::new(width, height+2, '█')),
                     symbols::Block::SevenEights => Box::new(CharGrid::new(width, height, '▉')),
@@ -278,7 +278,7 @@ impl<'a> Context<'a> {
 
                 }
             }
-            symbols::Marker::ExtraBar(marker) => {
+            symbols::Marker::Bars(marker) => {
                 match marker {
                     symbols::Bar::FULL => Box::new(CharGrid::new(width, height+2, '█')),
                     symbols::Bar::SevenEights => Box::new(CharGrid::new(width, height, '▇')),
@@ -291,7 +291,7 @@ impl<'a> Context<'a> {
 
                 }
             }
-            symbols::Marker::ExtraLine(marker ) => {
+            symbols::Marker::Lines(marker ) => {
                 match marker {
                     symbols::Line::VERTICAL => Box::new(CharGrid::new(width, height, '│')),
                     symbols::Line::DoubleVertical => Box::new(CharGrid::new(width, height, '║')),