refactor

- Make ports of old implementations easier
- remove NewlineSeparator variants which don't seem used quite as much - it's always conditionally
  adding newlines.

Author: Byron

gitoxide-core/src/repository/diff.rs

@@ -1,11 +1,8 @@
 use anyhow::Context;
+use gix::diff::blob::unified_diff::ConsumeBinaryHunk;
 use gix::{
     bstr::{BString, ByteSlice},
-    diff::blob::{
-        intern::TokenSource,
-        unified_diff::{ContextSize, NewlineSeparator},
-        UnifiedDiff,
-    },
+    diff::blob::{intern::TokenSource, unified_diff::ContextSize, UnifiedDiff},
     objs::tree::EntryMode,
     odb::store::RefreshMode,
     prelude::ObjectIdExt,
@@ -206,8 +203,7 @@ pub fn file(
 
     let unified_diff = UnifiedDiff::new(
         &interner,
-        String::new(),
-        NewlineSeparator::AfterHeaderAndLine("\n"),
+        ConsumeBinaryHunk::new(BString::default(), "\n"),
         ContextSize::symmetrical(3),
     );
 

gix-diff/Cargo.toml

@@ -9,7 +9,7 @@ description = "Calculate differences between various git objects"
 authors = ["Sebastian Thiel <[email protected]>"]
 edition = "2021"
 include = ["src/**/*", "LICENSE-*"]
-rust-version = "1.70"
+rust-version = "1.74"
 autotests = false
 
 [features]

gix-diff/src/blob/mod.rs

@@ -12,7 +12,7 @@ pub mod pipeline;
 pub mod platform;
 
 pub mod unified_diff;
-pub use unified_diff::_impl::UnifiedDiff;
+pub use unified_diff::impls::UnifiedDiff;
 
 /// Information about the diff performed to detect similarity.
 #[derive(Debug, Default, Clone, Copy, PartialEq, PartialOrd)]