Moved err crate

crates/scyllaconn/src/accounting/toplist.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::StreamExt;

crates/scyllaconn/src/accounting/totals.rs

@@ -1,4 +1,5 @@
 use crate::errconv::ErrConv;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Future;
 use futures_util::FutureExt;

crates/scyllaconn/src/conn.rs

@@ -1,4 +1,5 @@
 use crate::errconv::ErrConv;
+use daqbuf_err as err;
 use err::Error;
 use netpod::log::*;
 use netpod::ScyllaConfig;

crates/scyllaconn/src/errconv.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::Error;
 use scylla::frame::response::cql_to_rust::FromRowError as ScyFromRowError;
 use scylla::transport::errors::NewSessionError as ScyNewSessionError;

crates/scyllaconn/src/events.rs

@@ -3,6 +3,8 @@ use crate::events2::prepare::StmtsEvents;
 use crate::range::ScyllaSeriesRange;
 use crate::worker::ScyllaQueue;
 use core::fmt;
+use daqbuf_err as err;
+use daqbuf_series::SeriesId;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;
@@ -22,7 +24,6 @@ use netpod::TsMs;
 use netpod::TsNano;
 use scylla::frame::response::result::Row;
 use scylla::Session;
-use series::SeriesId;
 use std::pin::Pin;
 use std::sync::Arc;
 use std::time::Instant;

crates/scyllaconn/src/events2/events.rs

@@ -4,6 +4,8 @@ use crate::events::ReadJobTrace;
 use crate::events::ReadNextValuesOpts;
 use crate::range::ScyllaSeriesRange;
 use crate::worker::ScyllaQueue;
+use daqbuf_err as err;
+use daqbuf_series::SeriesId;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;
@@ -20,7 +22,6 @@ use netpod::ScalarType;
 use netpod::Shape;
 use netpod::TsMs;
 use netpod::TsMsVecFmt;
-use series::SeriesId;
 use std::collections::VecDeque;
 use std::pin::Pin;
 use std::task::Context;

crates/scyllaconn/src/events2/firstbefore.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Stream;

crates/scyllaconn/src/events2/mergert.rs

@@ -4,6 +4,7 @@ use super::firstbefore::FirstBeforeAndInside;
 use crate::events2::firstbefore;
 use crate::range::ScyllaSeriesRange;
 use crate::worker::ScyllaQueue;
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;

crates/scyllaconn/src/events2/msp.rs

@@ -1,6 +1,8 @@
 use super::prepare::StmtsEvents;
 use crate::range::ScyllaSeriesRange;
 use crate::worker::ScyllaQueue;
+use daqbuf_err as err;
+use daqbuf_series::SeriesId;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;
@@ -12,7 +14,6 @@ use netpod::ttl::RetentionTime;
 use netpod::TsMs;
 use netpod::TsMsVecFmt;
 use scylla::Session;
-use series::SeriesId;
 use std::collections::VecDeque;
 use std::pin::Pin;
 use std::task::Context;

crates/scyllaconn/src/events2/prepare.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use netpod::ttl::RetentionTime;

crates/scyllaconn/src/schema.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use netpod::ttl::RetentionTime;

crates/scyllaconn/src/scyllaconn.rs

@@ -9,8 +9,8 @@ pub mod schema;
 pub mod status;
 pub mod worker;
 
+pub use daqbuf_series::SeriesId;
 pub use scylla;
-pub use series::SeriesId;
 
 pub async fn test_log() {
     use netpod::log::*;

crates/scyllaconn/src/status.rs

@@ -1,4 +1,5 @@
 use crate::errconv::ErrConv;
+use daqbuf_err as err;
 use err::Error;
 use futures_util::Future;
 use futures_util::FutureExt;

crates/scyllaconn/src/worker.rs

@@ -5,6 +5,7 @@ use crate::events2::prepare::StmtsEvents;
 use crate::range::ScyllaSeriesRange;
 use async_channel::Receiver;
 use async_channel::Sender;
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use futures_util::Future;