Further reorganization

differential-dataflow/benches/chunk_bench.rs

@@ -26,7 +26,7 @@ use differential_dataflow::trace::chunk::{merge_chains, Chunk, NavigableChunk};
 use differential_dataflow::trace::chunk::vec::VecChunk;
 use differential_dataflow::columnar::trace::ColChunk;
 use differential_dataflow::trace::cursor::Cursor;
-use differential_dataflow::trace::implementations::merge_batcher::chunker::ContainerChunker;
+use differential_dataflow::batcher::merge::chunker::ContainerChunker;
 
 /// A global allocator that tracks currently-resident bytes, so we can snapshot
 /// the heap footprint of a built chunk chain.

differential-dataflow/examples/spines.rs

@@ -81,7 +81,7 @@ fn main() {
                     use differential_dataflow::Hashable;
                     use differential_dataflow::columnar::trace::{Spine, ColChunk};
                     use differential_dataflow::trace::chunk::ChunkBatcher;
-                    use differential_dataflow::trace::implementations::merge_batcher::chunker::ContainerChunker;
+                    use differential_dataflow::batcher::merge::chunker::ContainerChunker;
                     use differential_dataflow::operators::arrange::arrangement::arrange_core;
                     use timely::dataflow::channels::pact::Exchange;
 

differential-dataflow/src/trace/implementations/merge_batcher/chunker.rs → differential-dataflow/src/batcher/merge/chunker.rs

@@ -1,4 +1,4 @@
-//! Organizes streams of data into sorted chunks for a merge batcher.
+//! Organizes streams of data into sorted chunks for a [`MergeBatcher`](super::MergeBatcher).
 
 use std::collections::VecDeque;