fix build (#293)

Sebastian Thiel committed 4 years ago

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

Unified · Split

4 files

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

 use std::{cmp::Ordering, sync::Arc};
-use git_features::parallel::SequenceId;
+use git_features::{parallel, parallel::SequenceId, progress::Progress};
-use git_features::{parallel, progress::Progress};
 use crate::data::output;
 mod reduce {
     use std::marker::PhantomData;
-    use git_features::parallel;
+    use git_features::{parallel, parallel::SequenceId};
-    use git_features::parallel::SequenceId;
     use super::Outcome;
     use crate::data::output;

 use std::{convert::Infallible, sync::atomic::AtomicBool};
-use git_features::parallel::InOrderIter;
+use git_features::{
-use git_features::{parallel::reduce::Finalize, progress};
+    parallel::{reduce::Finalize, InOrderIter},
+    progress,
+};
 use git_odb::{compound, pack, pack::FindExt};
 use git_pack::data::{
     output,

     interrupt,
     objs::bstr::ByteVec,
     odb::{pack, pack::FindExt},
+    parallel::InOrderIter,
     prelude::Finalize,
     progress, traverse, Progress,
 };
     let num_objects = counts.len();
     let mut in_order_entries = {
         let progress = progress.add_child("creating entries");
-        pack::data::output::InOrderIter::from(pack::data::output::entry::iter_from_counts(
+        InOrderIter::from(pack::data::output::entry::iter_from_counts(
             counts,
             handle,
             progress,