Move diff from git to new module

Author: MitMaro

src/diff.rs

@@ -0,0 +1,31 @@
+mod commit;
+mod commit_diff;
+mod commit_diff_loader;
+mod commit_diff_loader_options;
+mod delta;
+mod diff_line;
+mod file_mode;
+mod file_status;
+mod file_status_builder;
+mod origin;
+mod reference;
+mod reference_kind;
+mod status;
+mod user;
+
+pub(crate) use self::{
+	commit::Commit,
+	commit_diff::CommitDiff,
+	commit_diff_loader::CommitDiffLoader,
+	commit_diff_loader_options::CommitDiffLoaderOptions,
+	delta::Delta,
+	diff_line::DiffLine,
+	file_mode::FileMode,
+	file_status::FileStatus,
+	file_status_builder::FileStatusBuilder,
+	origin::Origin,
+	reference::Reference,
+	reference_kind::ReferenceKind,
+	status::Status,
+	user::User,
+};

src/git/commit.rs renamed to src/diff/commit.rs

@@ -1,6 +1,9 @@
 use chrono::{DateTime, Local, TimeZone as _};
 
-use crate::git::{GitError, Reference, User};
+use crate::{
+	diff::{Reference, User},
+	git::GitError,
+};
 
 /// Represents a commit.
 #[derive(Debug, PartialEq, Eq)]

src/git/commit_diff.rs renamed to src/diff/commit_diff.rs

@@ -1,4 +1,4 @@
-use crate::git::{Commit, FileStatus};
+use crate::diff::{Commit, FileStatus};
 
 /// Represents a commit with a diff
 #[derive(Debug)]
@@ -73,7 +73,7 @@ mod tests {
 	use claims::assert_some_eq;
 
 	use crate::{
-		git::{Delta, DiffLine, FileMode, FileStatus, FileStatusBuilder, Origin, Status},
+		diff::{Delta, DiffLine, FileMode, FileStatus, FileStatusBuilder, Origin, Status},
 		test_helpers::builders::{CommitBuilder, CommitDiffBuilder},
 	};
 

src/git/commit_diff_loader.rs renamed to src/diff/commit_diff_loader.rs

@@ -3,7 +3,7 @@ use std::{path::PathBuf, sync::LazyLock};
 use git2::{DiffFindOptions, DiffOptions, Oid, Repository};
 use parking_lot::Mutex;
 
-use crate::git::{
+use crate::diff::{
 	Commit,
 	CommitDiff,
 	CommitDiffLoaderOptions,
@@ -155,7 +155,7 @@ mod tests {
 	};
 
 	use super::*;
-	use crate::{git::Origin, test_helpers::with_temp_repository};
+	use crate::{diff::Origin, test_helpers::with_temp_repository};
 
 	#[cfg(not(tarpaulin_include))]
 	fn _format_status(status: &FileStatus) -> String {

src/git/commit_diff_loader_options.rs renamed to src/diff/commit_diff_loader_options.rs

@@ -1,4 +1,4 @@
-use crate::git::DiffLine;
+use crate::diff::DiffLine;
 
 /// Represents a single set of changes
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -89,7 +89,7 @@ mod tests {
 	use claims::assert_err;
 
 	use super::*;
-	use crate::git::Origin;
+	use crate::diff::Origin;
 
 	#[test]
 	fn new_with_correctly_formatted_context() {

src/git/delta.rs renamed to src/diff/delta.rs

@@ -1,4 +1,4 @@
-use crate::git::Origin;
+use crate::diff::Origin;
 
 /// Represents a single line in a diff
 #[derive(Debug, Clone, PartialEq, Eq)]

src/git/diff_line.rs renamed to src/diff/diff_line.rs

@@ -1,6 +1,6 @@
 use std::path::{Path, PathBuf};
 
-use crate::git::{Delta, FileMode, Status};
+use crate::diff::{Delta, FileMode, Status};
 
 /// Represents a file change within a Git repository
 #[derive(Debug, Clone, PartialEq, Eq)]

src/git/file_mode.rs renamed to src/diff/file_mode.rs

@@ -1,4 +1,4 @@
-use crate::git::{Delta, DiffLine, FileStatus};
+use crate::diff::{Delta, DiffLine, FileStatus};
 
 #[derive(Debug, Clone)]
 pub(crate) struct FileStatusBuilder {
@@ -62,7 +62,7 @@ mod tests {
 	use std::path::PathBuf;
 
 	use super::*;
-	use crate::git::{FileMode, Origin, Status};
+	use crate::diff::{FileMode, Origin, Status};
 
 	#[test]
 	fn build_file_stat_with_file_stat_without_delta() {