members/libpt-cli/src/printing.rs

@@ -42,7 +42,7 @@ pub fn blockprint(content: impl ToString, color: Color) {
 pub fn blockfmt(content: impl ToString, color: Color) -> String {
     blockfmt_advanced(
         content,
-        Some(color),
+        color,
         presets::UTF8_BORDERS_ONLY,
         ContentArrangement::DynamicFullWidth,
         CellAlignment::Center,
@@ -67,7 +67,7 @@ pub fn blockfmt(content: impl ToString, color: Color) -> String {
 ///     "{}",
 ///     blockfmt_advanced(
 ///         "Hello world!".to_string(),
-///         Some(Color::Blue),
+///         Color::Blue,
 ///         presets::UTF8_FULL,
 ///         ContentArrangement::DynamicFullWidth,
 ///         CellAlignment::Center
@@ -86,7 +86,7 @@ pub fn blockfmt(content: impl ToString, color: Color) -> String {
 ///
 pub fn blockfmt_advanced(
     content: impl ToString,
-    color: Option<Color>,
+    color: Color,
     preset: &str,
     arrangement: ContentArrangement,
     alignment: CellAlignment,
@@ -98,8 +98,5 @@ pub fn blockfmt_advanced(
         .add_row(vec![content.to_string()]);
     table.column_mut(0).unwrap().set_cell_alignment(alignment);
 
-    match color {
+    format!("{}", style(table).fg(color))
-        Some(c) => format!("{}", style(table).fg(c)),
-        None => table.to_string(),
-    }
 }