refactor

adjust Git sink to fit into to conform to project convetions

Author: Byron

gix-diff/src/blob/git_diff.rs

@@ -63,12 +63,13 @@ pub struct ChangeGroup {
     /// Range indicating the lines of the previous block.
     /// To actually see how the previous block looked like, you need to combine this range with
     /// the [`InternedInput`].
-    before: Range<usize>,
+    pub before: Range<usize>,
     /// Range indicating the lines of the new block
     /// To actually see how the current block looks like, you need to combine this range with
     /// the [`InternedInput`].
-    after: Range<usize>,
-    change_kind: ChangeKind,
+    pub after: Range<usize>,
+    /// Further specify what kind of change is denoted by the ranges above.
+    pub change_kind: ChangeKind,
 }
 
 /// A [`Sink`] that creates a diff like git would.
@@ -316,85 +317,3 @@ where
         self.changes
     }
 }
-
-#[test]
-fn git_diff_test() {
-    let before = r#"struct SomeStruct {
-    field1: f64,
-    field2: f64,
-}
-
-fn main() {
-    // Some comment
-    let c = SomeStruct { field1: 10.0, field2: 10.0 };
-
-    println!(
-        "Print field1 from SomeStruct {}",
-        get_field1(&c)
-    );
-}
-
-fn get_field1(c: &SomeStruct) -> f64 {
-    c.field1
-}
-"#;
-
-    let after = r#"/// This is a struct
-struct SomeStruct {
-    field1: f64,
-    field2: f64,
-}
-
-fn main() {
-    let c = SomeStruct { field1: 10.0, field2: 10.0 };
-
-    println!(
-        "Print field1 and field2 from SomeStruct {} {}",
-        get_field1(&c), get_field2(&c)
-    );
-    println!("Print another line");
-}
-
-fn get_field1(c: &SomeStruct) -> f64 {
-    c.field1
-}
-
-fn get_field2(c: &SomeStruct) -> f64 {
-    c.field2
-}
-"#;
-    use crate::blob::git_diff::ChangeKind;
-
-    let input = InternedInput::new(before, after);
-    let diff = imara_diff::diff(imara_diff::Algorithm::Histogram, &input, GitDiff::new(&input));
-    assert_eq!(
-        diff,
-        vec![
-            ChangeGroup {
-                before: 0..0,
-                after: 0..1,
-                change_kind: ChangeKind::Added
-            },
-            ChangeGroup {
-                before: 6..7,
-                after: 7..7,
-                change_kind: ChangeKind::RemovedBelow
-            },
-            ChangeGroup {
-                before: 10..12,
-                after: 10..12,
-                change_kind: ChangeKind::Modified
-            },
-            ChangeGroup {
-                before: 13..13,
-                after: 13..14,
-                change_kind: ChangeKind::Added
-            },
-            ChangeGroup {
-                before: 17..17,
-                after: 19..23,
-                change_kind: ChangeKind::Added
-            }
-        ]
-    );
-}

gix-diff/tests/diff/blob/git_diff.rs

@@ -0,0 +1,84 @@
+use gix_diff::blob::intern::InternedInput;
+use gix_diff::blob::{Algorithm, ChangeGroup, ChangeKind, GitDiff};
+
+#[test]
+fn basic() {
+    let before = r#"struct SomeStruct {
+    field1: f64,
+    field2: f64,
+}
+
+fn main() {
+    // Some comment
+    let c = SomeStruct { field1: 10.0, field2: 10.0 };
+
+    println!(
+        "Print field1 from SomeStruct {}",
+        get_field1(&c)
+    );
+}
+
+fn get_field1(c: &SomeStruct) -> f64 {
+    c.field1
+}
+"#;
+
+    let after = r#"/// This is a struct
+struct SomeStruct {
+    field1: f64,
+    field2: f64,
+}
+
+fn main() {
+    let c = SomeStruct { field1: 10.0, field2: 10.0 };
+
+    println!(
+        "Print field1 and field2 from SomeStruct {} {}",
+        get_field1(&c), get_field2(&c)
+    );
+    println!("Print another line");
+}
+
+fn get_field1(c: &SomeStruct) -> f64 {
+    c.field1
+}
+
+fn get_field2(c: &SomeStruct) -> f64 {
+    c.field2
+}
+"#;
+    use crate::blob::git_diff::ChangeKind;
+
+    let input = InternedInput::new(before, after);
+    let diff = gix_diff::blob::diff(Algorithm::Histogram, &input, GitDiff::new(&input));
+    assert_eq!(
+        diff,
+        vec![
+            ChangeGroup {
+                before: 0..0,
+                after: 0..1,
+                change_kind: ChangeKind::Added
+            },
+            ChangeGroup {
+                before: 6..7,
+                after: 7..7,
+                change_kind: ChangeKind::RemovedBelow
+            },
+            ChangeGroup {
+                before: 10..12,
+                after: 10..12,
+                change_kind: ChangeKind::Modified
+            },
+            ChangeGroup {
+                before: 13..13,
+                after: 13..14,
+                change_kind: ChangeKind::Added
+            },
+            ChangeGroup {
+                before: 17..17,
+                after: 19..23,
+                change_kind: ChangeKind::Added
+            }
+        ]
+    );
+}

gix-diff/tests/diff/blob/mod.rs

@@ -1,3 +1,4 @@
+mod git_diff;
 pub(crate) mod pipeline;
 mod platform;
 mod unified_diff;