Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions gitoxide-core/src/repository/diff.rs
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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),
);

Expand Down
2 changes: 1 addition & 1 deletion gix-diff/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion gix-diff/src/blob/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
320 changes: 0 additions & 320 deletions gix-diff/src/blob/unified_diff.rs

This file was deleted.

Loading
Loading