fix build (#293)

Sebastian Thiel committed 4 years ago

Commit e3977fe1 parent 7721b5f4 files · +10 −8Browse files

Unified · Split

4 files

git-features/tests/parallel/in_order_iter.rs +2 −1
git-pack/src/data/output/entry/iter_from_counts.rs +2 −4
git-pack/tests/pack/data/output/count_and_entries.rs +4 −2
gitoxide-core/src/pack/create.rs +2 −1

git-features/tests/parallel/in_order_iter.rs+2−1

@@ -1,6 +1,7 @@
1		−use git_features::parallel::InOrderIter;
2	1	use std::convert::Infallible;
3	2
	3	+use git_features::parallel::InOrderIter;
	4	+
4	5	#[test]
5	6	fn in_order_stays_in_order() {
6	7	assert_eq!(

git-pack/src/data/output/entry/iter_from_counts.rs+2−4

@@ -1,7 +1,6 @@
1	1	use std::{cmp::Ordering, sync::Arc};
2	2
3		−use git_features::parallel::SequenceId;
4		−use git_features::{parallel, progress::Progress};
	3	+use git_features::{parallel, parallel::SequenceId, progress::Progress};
5	4
6	5	use crate::data::output;
7	6
@@ -277,8 +276,7 @@ mod util { · 269 unmodified lines
277	276	mod reduce {
278	277	use std::marker::PhantomData;
279	278
280		− use git_features::parallel;
281		− use git_features::parallel::SequenceId;
	279	+ use git_features::{parallel, parallel::SequenceId};
282	280
283	281	use super::Outcome;
284	282	use crate::data::output;

git-pack/tests/pack/data/output/count_and_entries.rs+4−2

@@ -1,7 +1,9 @@
1	1	use std::{convert::Infallible, sync::atomic::AtomicBool};
2	2
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	+};
5	7	use git_odb::{compound, pack, pack::FindExt};
6	8	use git_pack::data::{
7	9	output,

gitoxide-core/src/pack/create.rs+2−1

@@ -8,6 +8,7 @@ use git_repository::{ · 7 unmodified lines
8	8	interrupt,
9	9	objs::bstr::ByteVec,
10	10	odb::{pack, pack::FindExt},
	11	+ parallel::InOrderIter,
11	12	prelude::Finalize,
12	13	progress, traverse, Progress,
13	14	};
@@ -237,7 +238,7 @@ where · 223 unmodified lines
237	238	let num_objects = counts.len();
238	239	let mut in_order_entries = {
239	240	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(
241	242	counts,
242	243	handle,
243	244	progress,