diff --git a/src/trace/implementations/merge_batcher.rs b/src/trace/implementations/merge_batcher.rs index 935ba7a5b..1bae0ef2a 100644 --- a/src/trace/implementations/merge_batcher.rs +++ b/src/trace/implementations/merge_batcher.rs @@ -264,15 +264,14 @@ impl VecMerger { } } -impl Merger for VecMerger<((K, V), T, R)> +impl Merger for VecMerger<(D, T, R)> where - K: Data, - V: Data, + D: Data, T: Ord + PartialOrder + Clone + 'static, R: Semigroup + 'static, { type Time = T; - type Chunk = Vec<((K, V), T, R)>; + type Chunk = Vec<(D, T, R)>; fn merge(&mut self, list1: Vec, list2: Vec, output: &mut Vec, stash: &mut Vec) { let mut list1 = list1.into_iter(); diff --git a/src/trace/implementations/merge_batcher_col.rs b/src/trace/implementations/merge_batcher_col.rs index 39a9e53ce..c70863070 100644 --- a/src/trace/implementations/merge_batcher_col.rs +++ b/src/trace/implementations/merge_batcher_col.rs @@ -52,15 +52,14 @@ impl ColumnationMerger { } } -impl Merger for ColumnationMerger<((K, V), T, R)> +impl Merger for ColumnationMerger<(D, T, R)> where - K: Columnation + Ord + Data, - V: Columnation + Ord + Data, + D: Columnation + Ord + Data, T: Columnation + Ord + PartialOrder + Data, R: Columnation + Semigroup + 'static, { type Time = T; - type Chunk = TimelyStack<((K, V), T, R)>; + type Chunk = TimelyStack<(D, T, R)>; fn merge(&mut self, list1: Vec, list2: Vec, output: &mut Vec, stash: &mut Vec) { let mut list1 = list1.into_iter();