refactor: move status & diff modules into git module

src/diff/mod.rs → src/git/diff/mod.rs

@@ -20,7 +20,7 @@ impl Display for Diff {
 }
 
 #[derive(Parser)]
-#[grammar = "diff/diff.pest"]
+#[grammar = "git/diff/diff.pest"]
 struct DiffParser;
 
 impl Diff {

src/git/mod.rs

@@ -1,6 +1,12 @@
-use crate::{diff::Diff, status::Status, Res};
 use std::{path::Path, process::Command, str};
 
+use crate::Res;
+
+use self::{diff::Diff, status::Status};
+
+pub(crate) mod diff;
+pub(crate) mod status;
+
 // TODO Check for.git/index.lock and block if it exists
 // TODO Use only plumbing commands
 

src/status/mod.rs → src/git/status/mod.rs

@@ -42,7 +42,7 @@ impl StatusFile {
 }
 
 #[derive(Parser)]
-#[grammar = "status/status.pest"] // relative to src
+#[grammar = "git/status/status.pest"] // relative to src
 struct StatusParser;
 
 impl Status {

src/items.rs

@@ -1,9 +1,9 @@
-use crate::diff;
+use crate::git::diff::Delta;
+use crate::git::diff::Diff;
+use crate::git::diff::Hunk;
 use crate::theme;
 use crate::theme::CURRENT_THEME;
 use ansi_to_tui::IntoText;
-use diff::Delta;
-use diff::Hunk;
 use ratatui::style::Color;
 use ratatui::style::Modifier;
 use ratatui::style::Style;
@@ -36,7 +36,7 @@ pub(crate) enum TargetData {
 }
 
 pub(crate) fn create_diff_items<'a>(
-    diff: &'a diff::Diff,
+    diff: &'a Diff,
     depth: &'a usize,
 ) -> impl Iterator<Item = Item> + 'a {
     diff.deltas.iter().flat_map(|delta| {

src/main.rs

@@ -1,10 +1,8 @@
 pub mod cli;
-mod diff;
 mod git;
 mod items;
 mod keybinds;
 mod screen;
-mod status;
 mod theme;
 mod ui;
 mod util;

src/screen/status.rs

@@ -1,7 +1,6 @@
 use super::Screen;
 use crate::{
-    diff::Diff,
-    git,
+    git::{self, diff::Diff},
     items::{self, Item},
     theme::CURRENT_THEME,
     Config, Res,