diff --git a/src/trace/implementations/chunker.rs b/src/trace/implementations/chunker.rs index fdfadbace..018b8a632 100644 --- a/src/trace/implementations/chunker.rs +++ b/src/trace/implementations/chunker.rs @@ -1,7 +1,6 @@ //! Organize streams of data into sorted chunks. use std::collections::VecDeque; -use std::marker::PhantomData; use timely::communication::message::RefOrMut; use timely::Container; use timely::container::columnation::{Columnation, TimelyStack}; @@ -270,17 +269,15 @@ where } /// Chunk a stream of vectors into chains of vectors. -pub struct ContainerChunker { +pub struct ContainerChunker { pending: Output, empty: Output, ready: VecDeque, consolidator: Consolidator, - _marker: PhantomData<(Input, Consolidator)>, } -impl Default for ContainerChunker +impl Default for ContainerChunker where - Input: Default, Output: Default, Consolidator: Default, { @@ -290,12 +287,11 @@ where empty: Output::default(), ready: VecDeque::default(), consolidator: Consolidator::default(), - _marker: PhantomData, } } } -impl<'a, Input, Output, Consolidator> PushInto> for ContainerChunker +impl<'a, Input, Output, Consolidator> PushInto> for ContainerChunker where Input: Container, Output: SizableContainer + PushInto> + PushInto>, @@ -335,10 +331,9 @@ where } } -impl ContainerBuilder for ContainerChunker +impl ContainerBuilder for ContainerChunker where - Input: Container, - for<'a> Output: SizableContainer + PushInto> + PushInto>, + Output: SizableContainer, Consolidator: ConsolidateContainer + Default + 'static, { type Container = Output; diff --git a/src/trace/implementations/ord_neu.rs b/src/trace/implementations/ord_neu.rs index ffc8aa0a5..bf6139121 100644 --- a/src/trace/implementations/ord_neu.rs +++ b/src/trace/implementations/ord_neu.rs @@ -47,7 +47,6 @@ pub type FlatValSpine = Spine< MergeBatcher< C, ContainerChunker< - C, FlatStack<<((K,V),T,R) as Containerized>::Region>, ContainerConsolidator, >, @@ -79,7 +78,6 @@ pub type FlatKeySpine = Spine< MergeBatcher< C, ContainerChunker< - C, FlatStack<<((K,()),T,R) as Containerized>::Region>, ContainerConsolidator, >,