Moved err crate

crates/disk/Cargo.toml

@@ -30,7 +30,7 @@ num-traits = "0.2.14"
 num-derive = "0.4.0"
 url = "2.5.0"
 tiny-keccak = { version = "2.0", features = ["sha3"] }
-err = { path = "../err" }
+daqbuf-err = { path = "../../../daqbuf-err" }
 taskrun = { path = "../taskrun" }
 netpod = { path = "../netpod" }
 query = { path = "../query" }

crates/disk/src/aggtest.rs

@@ -2,6 +2,7 @@ use crate::eventchunker::EventChunkerConf;
 use crate::eventchunkermultifile::EventChunkerMultifile;
 use crate::AggQuerySingleChannel;
 use crate::SfDbChConf;
+use daqbuf_err as err;
 use err::Error;
 use netpod::range::evrange::NanoRange;
 use netpod::test_data_base_path_databuffer;

crates/disk/src/binnedstream.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Stream;
 use futures_util::StreamExt;

crates/disk/src/channelconfig.rs

@@ -1,4 +1,5 @@
 use crate::SfDbChConf;
+use daqbuf_err as err;
 use err::*;
 #[allow(unused)]
 use netpod::log::*;

crates/disk/src/dataopen.rs

@@ -1,5 +1,6 @@
 use super::paths;
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::ErrStr;
 use err::Error;
 use futures_util::StreamExt;

crates/disk/src/decode.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Stream;
 use futures_util::StreamExt;

crates/disk/src/disk.rs

@@ -22,6 +22,7 @@ pub use parse;
 use async_channel::Receiver;
 use async_channel::Sender;
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::future::FusedFuture;
 use futures_util::FutureExt;

crates/disk/src/eventchunker.rs

@@ -1,5 +1,6 @@
 use bytes::Buf;
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::thiserror;
 use err::Error;
 use err::ThisError;

crates/disk/src/eventchunkermultifile.rs

@@ -3,6 +3,7 @@ use crate::dataopen::open_files;
 use crate::dataopen::OpenedFileSet;
 use crate::eventchunker::EventChunker;
 use crate::eventchunker::EventChunkerConf;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Stream;
 use futures_util::StreamExt;

crates/disk/src/gen.rs

@@ -3,6 +3,7 @@ use crate::SfDbChConf;
 use bitshuffle::bitshuffle_compress;
 use bytes::BufMut;
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::Error;
 use netpod::log::*;
 use netpod::timeunits::*;

crates/disk/src/index.rs

@@ -1,4 +1,5 @@
 use arrayref::array_ref;
+use daqbuf_err as err;
 use err::Error;
 use netpod::log::*;
 use netpod::range::evrange::NanoRange;

crates/disk/src/paths.rs

@@ -1,4 +1,5 @@
 use crate::SfDbChConf;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::StreamExt;
 use netpod::timeunits::MS;

crates/disk/src/raw/conn.rs

@@ -2,6 +2,7 @@ use crate::eventchunker::EventChunkerConf;
 use crate::eventchunkermultifile::EventChunkerMultifile;
 use crate::raw::generated::EventBlobsGeneratorI32Test00;
 use crate::raw::generated::EventBlobsGeneratorI32Test01;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::stream;
 use futures_util::Stream;

crates/disk/src/read3.rs

@@ -1,4 +1,5 @@
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::Error;
 use netpod::log::*;
 use std::os::unix::prelude::RawFd;

crates/disk/src/read4.rs

@@ -1,4 +1,5 @@
 use bytes::BytesMut;
+use daqbuf_err as err;
 use err::Error;
 use netpod::log::*;
 use std::os::unix::prelude::RawFd;