fix: Resolve multiple ColumnConfig definitions and type mismatches

Co-authored-by: aider (openai/andrew/openrouter/deepseek/deepseek-chat-v3.1) <aider@aider.chat>
This commit is contained in:
Andrew Phillips
2025-09-08 19:04:30 -03:00
parent 0ab5c93845
commit b9059da814
3 changed files with 18 additions and 20 deletions

View File

@@ -5,16 +5,6 @@ use serde::{Deserialize, Serialize};
use log::{debug, error};
use crate::args::{Args};
#[derive(Debug, Clone, Serialize)]
pub struct ColumnConfig {
pub name: String,
pub label: String,
#[serde(default)]
pub align: ColumnAlignment,
#[serde(default)]
pub max_len: Option<String>,
}
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
#[serde(rename_all = "lowercase")]
pub enum ColumnAlignment {
@@ -122,6 +112,14 @@ impl<'de> serde::Deserialize<'de> for ColumnConfig {
align: ColumnAlignment,
#[serde(default)]
max_len: Option<String>,
#[serde(default)]
fg_color: Option<TableColor>,
#[serde(default)]
bg_color: Option<TableColor>,
#[serde(default)]
attributes: Vec<TableAttribute>,
#[serde(default)]
padding: Option<(u16, u16)>,
}
let helper = Helper::deserialize(deserializer)?;
@@ -132,6 +130,10 @@ impl<'de> serde::Deserialize<'de> for ColumnConfig {
label,
align: helper.align,
max_len: helper.max_len,
fg_color: helper.fg_color,
bg_color: helper.bg_color,
attributes: helper.attributes,
padding: helper.padding,
})
}
}