Moved err crate

crates/nodenet/Cargo.toml

@@ -17,7 +17,7 @@ byteorder = "1.4.3"
 futures-util = "0.3.14"
 tracing = "0.1.25"
 hex = "0.4.3"
-err = { path = "../err" }
+daqbuf-err = { path = "../../../daqbuf-err" }
 netpod = { path = "../netpod" }
 query = { path = "../query" }
 disk = { path = "../disk" }

crates/nodenet/src/channelconfig.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use dbconn::worker::PgQueue;
 use err::thiserror;
 use err::ThisError;

crates/nodenet/src/client.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Future;
 use futures_util::TryFutureExt;

crates/nodenet/src/configquorum.rs

@@ -1,4 +1,5 @@
 use crate::channelconfig::http_get_channel_config;
+use daqbuf_err as err;
 use dbconn::worker::PgQueue;
 use err::thiserror;
 use err::ThisError;

crates/nodenet/src/conn.rs

@@ -1,5 +1,6 @@
 use crate::scylla::scylla_channel_event_stream;
 use bytes::Bytes;
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Stream;

crates/nodenet/src/conn/test.rs

@@ -1,5 +1,6 @@
 use crate::conn::events_conn_handler;
 use crate::conn::Frame1Parts;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::StreamExt;
 use items_0::streamitem::sitem_data;

crates/nodenet/src/scylla.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;
@@ -157,7 +158,7 @@ impl Stream for ScyllaEventsReadStream {
                         self.stream = Some(x);
                         continue;
                     }
-                    Ready(Err(e)) => Ready(Some(Err(::err::Error::from_string(e)))),
+                    Ready(Err(e)) => Ready(Some(Err(err::Error::from_string(e)))),
                     Pending => Pending,
                 }
             } else if let Some(fut) = self.stream.as_mut() {