Skip to content

Commit e6a730d

Browse files
committed
Resolve some compile errors
1 parent e6fc00d commit e6a730d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/info/git/mod.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ use crate::cli::MyRegex;
44
use anyhow::Result;
55
use gix::bstr::ByteSlice;
66
use gix::bstr::{BString, Utf8Error};
7-
use gix::object::tree::diff::change::Event;
7+
use gix::object::tree::diff::Change;
88
use gix::object::tree::diff::Action;
99
use gix::prelude::ObjectIdExt;
10-
use gix::traverse::commit::simple::Sorting;
10+
use gix::revision::walk::Sorting;
11+
use gix::traverse::commit::simple::CommitTimeOrder;
1112
use gix::{Commit, ObjectId};
1213
use std::collections::HashMap;
1314
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
@@ -41,7 +42,7 @@ pub fn traverse_commit_graph(
4142
.head_commit()?
4243
.id()
4344
.ancestors()
44-
.sorting(Sorting::ByCommitTimeNewestFirst)
45+
.sorting(Sorting::ByCommitTime(CommitTimeOrder::NewestFirst))
4546
.use_commit_graph(can_use_author_threads)
4647
.with_commit_graph(commit_graph)
4748
.all()?;
@@ -264,10 +265,10 @@ fn compute_diff_with_parent(
264265
.track_rewrites(None)
265266
.for_each_to_obtain_tree(&commit.tree()?, |change| {
266267
let is_file_change = match change.event {
267-
Event::Addition { entry_mode, .. } | Event::Modification { entry_mode, .. } => {
268+
Change::Addition { entry_mode, .. } | Change::Modification { entry_mode, .. } => {
268269
entry_mode.is_blob()
269270
}
270-
Event::Deletion { .. } | Event::Rewrite { .. } => false,
271+
Change::Deletion { .. } | Change::Rewrite { .. } => false,
271272
};
272273
if is_file_change {
273274
let path = change.location;

0 commit comments

Comments
 (0)