From d26c46d6e18abba75d962967dddc7aac60228ff0 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Mon, 24 Mar 2025 03:57:43 +0200 Subject: [PATCH] remove redundant generic --- src/model.rs | 2 +- src/model/column.rs | 10 ++++------ src/view/table.rs | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/model.rs b/src/model.rs index 565e53f..05ed108 100644 --- a/src/model.rs +++ b/src/model.rs @@ -12,7 +12,7 @@ pub struct Taggart { pub cursor: usize, pub offset: usize, pub column: usize, - pub columns: ColumnsOption>, fn(&mut [Entry], usize, &str)>, + pub columns: ColumnsOption>, fn(&mut [Entry], usize, &str)>, pub display: Measure, pub tasks: Vec, pub mode: Option, diff --git a/src/model/column.rs b/src/model/column.rs index 2c67dd3..2ffba3a 100644 --- a/src/model/column.rs +++ b/src/model/column.rs @@ -1,9 +1,8 @@ use crate::*; -pub struct Columns(pub Vec>); +pub struct Columns(pub Vec>); -pub struct Column { - __: std::marker::PhantomData, +pub struct Column { pub title: Arc, pub width: usize, pub getter: G, @@ -11,7 +10,7 @@ pub struct Column { //pub styler: Option, } -impl ColumnOption>, fn(&mut [T], usize, &str)> { +impl ColumnOption>, fn(&mut [T], usize, &str)> { pub fn new ( title: &impl AsRef, width: usize, @@ -22,7 +21,6 @@ impl ColumnOption>, fn(&mut [T], usize, &str)> { title: title.as_ref().into(), getter, setter: None, - __: Default::default(), } } fn setter (mut self, setter: fn(&mut [T], usize, &str)) -> Self { @@ -45,7 +43,7 @@ macro_rules! setter { } } -impl Default for ColumnsOption>, fn(&mut [Entry], usize, &str)> { +impl Default for ColumnsOption>, fn(&mut [Entry], usize, &str)> { fn default () -> Self { Self(vec![ Column::new(&"Hash", 8, |entry: &Entry|entry.hash()), diff --git a/src/view/table.rs b/src/view/table.rs index 1da0282..882d5b0 100644 --- a/src/view/table.rs +++ b/src/view/table.rs @@ -83,7 +83,7 @@ impl<'a> TreeTable<'a> { } } -impl Columns { +impl Columns { pub fn header (&self) -> Arc { let mut output = String::new(); for Column { width, title, .. } in self.0.iter() {