factor out into common crate

streams/Cargo.toml

@@ -20,6 +20,7 @@ chrono = { version = "0.4.19", features = ["serde"] }
 err = { path = "../err" }
 netpod = { path = "../netpod" }
 items = { path = "../items" }
+items_0 = { path = "../items_0" }
 items_2 = { path = "../items_2" }
 parse = { path = "../parse" }
 bitshuffle = { path = "../bitshuffle" }

streams/src/collect.rs

@@ -1,7 +1,7 @@
 use err::Error;
 use futures_util::{Stream, StreamExt};
 use items::{RangeCompletableItem, Sitemty, StreamItem};
-use items_2::collect::{Collectable, Collector};
+use items_0::collect_c::{Collectable, Collector};
 use netpod::log::*;
 use std::fmt;
 use std::time::{Duration, Instant};

streams/src/merge/mergedstream.rs

@@ -296,8 +296,8 @@ where
 
 #[cfg(test)]
 mod test {
+    use items_0::Empty;
     use items_2::channelevents::ChannelEvents;
-    use items_2::Empty;
 
     #[test]
     fn merge_channel_events() {

streams/src/test.rs

@@ -6,9 +6,9 @@ mod timebin;
 use err::Error;
 use futures_util::{stream, Stream};
 use items::{sitem_data, Sitemty};
+use items_0::Empty;
 use items_2::channelevents::ChannelEvents;
 use items_2::eventsdim0::EventsDim0;
-use items_2::Empty;
 use netpod::timeunits::SEC;
 use std::pin::Pin;