Moved err crate

This commit is contained in:
Dominik Werder
2024-11-07 18:26:02 +01:00
parent 8fd7e72796
commit 2f89c969cd
124 changed files with 191 additions and 738 deletions

View File

@@ -14,7 +14,7 @@ serde_yaml = "0.9.27"
chrono = "0.4.31"
url = "2.5.0"
clap = { version = "4.5.7", features = ["derive", "cargo"] }
err = { path = "../err" }
daqbuf-err = { path = "../../../daqbuf-err" }
taskrun = { path = "../taskrun" }
netpod = { path = "../netpod" }
disk = { path = "../disk" }

View File

@@ -2,10 +2,10 @@ use chrono::DateTime;
use chrono::Duration;
use chrono::Utc;
use clap::Parser;
use daqbuf_err::Error;
use daqbuffer::cli::ClientType;
use daqbuffer::cli::Opts;
use daqbuffer::cli::SubCmd;
use err::Error;
use netpod::log::*;
use netpod::query::CacheUsage;
use netpod::NodeConfig;

View File

@@ -1,14 +1,14 @@
pub trait ErrConv<T> {
fn ec(self) -> Result<T, ::err::Error>;
fn ec(self) -> Result<T, daqbuf_err::Error>;
}
pub trait Convable: ToString {}
impl<T, E: Convable> ErrConv<T> for Result<T, E> {
fn ec(self) -> Result<T, err::Error> {
fn ec(self) -> Result<T, daqbuf_err::Error> {
match self {
Ok(x) => Ok(x),
Err(e) => Err(::err::Error::from_string(e.to_string())),
Err(e) => Err(daqbuf_err::Error::from_string(e.to_string())),
}
}
}

View File

@@ -1,5 +1,5 @@
use err::thiserror;
use err::ThisError;
use daqbuf_err::thiserror;
use daqbuf_err::ThisError;
use futures_util::future;
use futures_util::StreamExt;
use http::header;