Skip to content

Commit

Permalink
chore: reduce proc-macro dep strum
Browse files Browse the repository at this point in the history
Signed-off-by: tison <wander4096@gmail.com>
  • Loading branch information
tisonkun committed Jan 28, 2025
1 parent 493dfb0 commit ed14645
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 9 deletions.
2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ integration_test = []
[dependencies]
ansi-str = { version = "0.8", optional = true }
console = { version = "0.15", optional = true }
strum = "0.26"
strum_macros = "0.26"
unicode-width = "0.2"

[dev-dependencies]
Expand Down
31 changes: 28 additions & 3 deletions src/style/table.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
use strum_macros::EnumIter;

/// Specify how comfy_table should arrange the content in your table.
///
/// ```
Expand Down Expand Up @@ -46,7 +44,7 @@ pub enum ContentArrangement {
/// | | | | The inner "+" chars are MiddleIntersections
/// +---+---+---+
/// ```
#[derive(Debug, PartialEq, Eq, Hash, EnumIter, Clone, Copy)]
#[derive(Debug, PartialEq, Eq, Hash, Clone, Copy)]
pub enum TableComponent {
LeftBorder,
RightBorder,
Expand All @@ -68,3 +66,30 @@ pub enum TableComponent {
BottomLeftCorner,
BottomRightCorner,
}

impl TableComponent {
pub fn components() -> impl Iterator<Item = TableComponent> {
[
TableComponent::LeftBorder,
TableComponent::RightBorder,
TableComponent::TopBorder,
TableComponent::BottomBorder,
TableComponent::LeftHeaderIntersection,
TableComponent::HeaderLines,
TableComponent::MiddleHeaderIntersections,
TableComponent::RightHeaderIntersection,
TableComponent::VerticalLines,
TableComponent::HorizontalLines,
TableComponent::MiddleIntersections,
TableComponent::LeftBorderIntersections,
TableComponent::RightBorderIntersections,
TableComponent::TopBorderIntersections,
TableComponent::BottomBorderIntersections,
TableComponent::TopLeftCorner,
TableComponent::TopRightCorner,
TableComponent::BottomLeftCorner,
TableComponent::BottomRightCorner,
]
.into_iter()
}
}
7 changes: 3 additions & 4 deletions src/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use std::slice::{Iter, IterMut};
use crossterm::terminal;
#[cfg(feature = "tty")]
use crossterm::tty::IsTty;
use strum::IntoEnumIterator;

use crate::cell::Cell;
use crate::column::Column;
Expand Down Expand Up @@ -454,7 +453,7 @@ impl Table {
///
/// If the string is too long, remaining charaacters will be simply ignored.
pub fn load_preset(&mut self, preset: &str) -> &mut Self {
let mut components = TableComponent::iter();
let mut components = TableComponent::components();

for character in preset.chars() {
if let Some(component) = components.next() {
Expand Down Expand Up @@ -489,7 +488,7 @@ impl Table {
/// assert_eq!(UTF8_FULL, table.current_style_as_preset())
/// ```
pub fn current_style_as_preset(&mut self) -> String {
let components = TableComponent::iter();
let components = TableComponent::components();
let mut preset_string = String::new();

for component in components {
Expand All @@ -516,7 +515,7 @@ impl Table {
/// table.apply_modifier(UTF8_ROUND_CORNERS);
/// ```
pub fn apply_modifier(&mut self, modifier: &str) -> &mut Self {
let mut components = TableComponent::iter();
let mut components = TableComponent::components();

for character in modifier.chars() {
// Skip spaces while applying modifiers.
Expand Down

0 comments on commit ed14645

Please # to comment.