WIP refactor

streams/src/collect.rs

@@ -10,9 +10,9 @@ use items_0::streamitem::StatsItem;
 use items_0::streamitem::StreamItem;
 use items_0::WithLen;
 use netpod::log::*;
+use netpod::range::evrange::SeriesRange;
 use netpod::BinnedRangeEnum;
 use netpod::DiskStats;
-use netpod::SeriesRange;
 use std::fmt;
 use std::time::Duration;
 use std::time::Instant;

streams/src/eventchunker.rs

@@ -14,11 +14,11 @@ use items_0::WithLen;
 use items_2::eventfull::EventFull;
 use netpod::histo::HistoLog2;
 use netpod::log::*;
+use netpod::range::evrange::NanoRange;
 use netpod::timeunits::SEC;
 use netpod::ByteSize;
 use netpod::ChannelConfig;
 use netpod::EventDataReadStats;
-use netpod::NanoRange;
 use netpod::ScalarType;
 use netpod::Shape;
 use parse::channelconfig::CompressionMethod;

streams/src/rangefilter2.rs

@@ -8,7 +8,7 @@ use items_0::streamitem::StreamItem;
 use items_0::MergeError;
 use items_2::merger::Mergeable;
 use netpod::log::*;
-use netpod::NanoRange;
+use netpod::range::evrange::NanoRange;
 use netpod::RangeFilterStats;
 use std::fmt;
 use std::pin::Pin;