From 5cbf23f253e670fe45549f405ebbf175950ce5fd Mon Sep 17 00:00:00 2001 From: Erik Kundt Date: Fri, 13 Dec 2024 10:51:09 +0100 Subject: [PATCH] bin: Introduce unknown hunk state --- bin/git.rs | 7 ++++--- bin/ui/span.rs | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/git.rs b/bin/git.rs index c81be0d0..3a59c1a2 100644 --- a/bin/git.rs +++ b/bin/git.rs @@ -215,6 +215,7 @@ impl From<&Hunk> for HunkStats { #[derive(Clone, Default, Debug, PartialEq)] pub enum HunkState { #[default] + Unknown, Rejected, Accepted, } @@ -343,8 +344,8 @@ impl StatefulHunkDiff { } } -impl From<(&HunkDiff, &HunkState)> for StatefulHunkDiff { - fn from(value: (&HunkDiff, &HunkState)) -> Self { - Self(value.0.clone(), value.1.clone()) +impl From<&HunkDiff> for StatefulHunkDiff { + fn from(diff: &HunkDiff) -> Self { + Self(diff.clone(), HunkState::Unknown) } } diff --git a/bin/ui/span.rs b/bin/ui/span.rs index 739b9a6b..6b40a962 100644 --- a/bin/ui/span.rs +++ b/bin/ui/span.rs @@ -11,8 +11,8 @@ use tui::ui::span; pub fn hunk_state(state: &HunkState) -> Span<'static> { match state { + HunkState::Unknown => span::secondary("?"), HunkState::Accepted => span::positive("✓"), - // HunkState::Rejected => span::secondary("?"), HunkState::Rejected => span::negative("✗"), } }