Moved err crate

crates/netpod/Cargo.toml

@@ -22,7 +22,7 @@ num-traits = "0.2.16"
 hex = "0.4.3"
 rand = "0.8.5"
 thiserror = "0.0.1"
-err = { path = "../err" }
+daqbuf-err = { path = "../../../daqbuf-err" }
 
 [patch.crates-io]
 thiserror = { git = "https://github.com/dominikwerder/thiserror.git", branch = "cstm" }

crates/netpod/src/channelstatus.rs

@@ -1,3 +1,5 @@
+use daqbuf_err as err;
+
 #[derive(Debug, Clone)]
 pub enum ChannelStatusClosedReason {
     ShutdownCommand,

crates/netpod/src/netpod.rs

@@ -60,6 +60,8 @@ pub mod log_ {
     pub use tracing::{self, event, span, Level};
 }
 
+use daqbuf_err as err;
+
 use bytes::Bytes;
 use chrono::DateTime;
 use chrono::TimeZone;
@@ -4103,7 +4105,7 @@ pub struct StatusBoardEntry {
     // #[serde(skip_serializing_if = "is_false")]
     done: bool,
     // #[serde(skip_serializing_if = "Vec::is_empty")]
-    errors: Vec<::err::Error>,
+    errors: Vec<err::Error>,
     // TODO make this a better Stats container and remove pub access.
     // #[serde(default, skip_serializing_if = "CmpZero::is_zero")]
     error_count: usize,
@@ -4170,7 +4172,7 @@ pub struct StatusBoardEntryUser {
     // #[serde(default, skip_serializing_if = "CmpZero::is_zero")]
     channel_not_found: usize,
     #[serde(skip_serializing_if = "Vec::is_empty")]
-    errors: Vec<::err::PublicError>,
+    errors: Vec<err::PublicError>,
 }
 
 impl StatusBoardEntryUser {
@@ -4257,7 +4259,7 @@ impl StatusBoard {
         }
     }
 
-    pub fn add_error(&mut self, status_id: &str, err: ::err::Error) {
+    pub fn add_error(&mut self, status_id: &str, err: err::Error) {
         match self.entries.get_mut(status_id) {
             Some(e) => {
                 e.ts_updated = SystemTime::now();

crates/netpod/src/query.rs

@@ -2,6 +2,8 @@ pub mod api1;
 pub mod datetime;
 pub mod prebinned;
 
+use daqbuf_err as err;
+
 use crate::get_url_query_pairs;
 use crate::log::*;
 use crate::AggKind;

crates/netpod/src/query/api1.rs

@@ -1,7 +1,11 @@
 use crate::query::datetime::Datetime;
-use crate::{DiskIoTune, FileIoBufferSize, ReadSys};
+use crate::DiskIoTune;
+use crate::FileIoBufferSize;
+use crate::ReadSys;
+use daqbuf_err as err;
 use err::Error;
-use serde::{Deserialize, Serialize};
+use serde::Deserialize;
+use serde::Serialize;
 use std::fmt;
 use std::time::Duration;
 

crates/netpod/src/query/datetime.rs

@@ -1,5 +1,6 @@
 use chrono::DateTime;
 use chrono::FixedOffset;
+use daqbuf_err as err;
 use err::Error;
 use serde::de::Visitor;
 use serde::Deserialize;

crates/netpod/src/range/evrange.rs

@@ -9,6 +9,7 @@ use crate::TsNano;
 use chrono::DateTime;
 use chrono::TimeZone;
 use chrono::Utc;
+use daqbuf_err as err;
 use err::Error;
 use serde::Deserialize;
 use serde::Serialize;

crates/netpod/src/streamext.rs

@@ -1,3 +1,4 @@
+use daqbuf_err as err;
 use err::Error;
 use futures_util::{Stream, StreamExt};
 use std::pin::Pin;

crates/netpod/src/ttl.rs

@@ -1,4 +1,5 @@
 use core::fmt;
+use daqbuf_err as err;
 use err::thiserror;
 use err::ThisError;
 use serde::Deserialize;