Skip to content

Commit e3977fe

Browse files
committed
fix build (#293)
1 parent 7721b5f commit e3977fe

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

git-features/tests/parallel/in_order_iter.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
use git_features::parallel::InOrderIter;
21
use std::convert::Infallible;
32

3+
use git_features::parallel::InOrderIter;
4+
45
#[test]
56
fn in_order_stays_in_order() {
67
assert_eq!(

git-pack/src/data/output/entry/iter_from_counts.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use std::{cmp::Ordering, sync::Arc};
22

3-
use git_features::parallel::SequenceId;
4-
use git_features::{parallel, progress::Progress};
3+
use git_features::{parallel, parallel::SequenceId, progress::Progress};
54

65
use crate::data::output;
76

@@ -277,8 +276,7 @@ mod util {
277276
mod reduce {
278277
use std::marker::PhantomData;
279278

280-
use git_features::parallel;
281-
use git_features::parallel::SequenceId;
279+
use git_features::{parallel, parallel::SequenceId};
282280

283281
use super::Outcome;
284282
use crate::data::output;

git-pack/tests/pack/data/output/count_and_entries.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
use std::{convert::Infallible, sync::atomic::AtomicBool};
22

3-
use git_features::parallel::InOrderIter;
4-
use git_features::{parallel::reduce::Finalize, progress};
3+
use git_features::{
4+
parallel::{reduce::Finalize, InOrderIter},
5+
progress,
6+
};
57
use git_odb::{compound, pack, pack::FindExt};
68
use git_pack::data::{
79
output,

gitoxide-core/src/pack/create.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use git_repository::{
88
interrupt,
99
objs::bstr::ByteVec,
1010
odb::{pack, pack::FindExt},
11+
parallel::InOrderIter,
1112
prelude::Finalize,
1213
progress, traverse, Progress,
1314
};
@@ -237,7 +238,7 @@ where
237238
let num_objects = counts.len();
238239
let mut in_order_entries = {
239240
let progress = progress.add_child("creating entries");
240-
pack::data::output::InOrderIter::from(pack::data::output::entry::iter_from_counts(
241+
InOrderIter::from(pack::data::output::entry::iter_from_counts(
241242
counts,
242243
handle,
243244
progress,

0 commit comments

Comments
 (0)