This commit is contained in:
Dominik Werder
2024-11-04 16:35:26 +01:00
parent 5543389c1e
commit 35d15c4694
32 changed files with 268 additions and 220 deletions
+17 -2
View File
@@ -1,4 +1,3 @@
use err::Error;
use netpod::log::Level;
use netpod::DiskStats;
use netpod::EventDataReadStats;
@@ -69,7 +68,9 @@ impl LogItem {
}
}
pub type Sitemty<T> = Result<StreamItem<RangeCompletableItem<T>>, Error>;
pub type SitemErrTy = err::Error;
pub type Sitemty<T> = Result<StreamItem<RangeCompletableItem<T>>, SitemErrTy>;
pub type Sitemty2<T, E> = Result<StreamItem<RangeCompletableItem<T>>, E>;
@@ -144,6 +145,20 @@ pub fn sitem_data<X>(x: X) -> Sitemty<X> {
Ok(StreamItem::DataItem(RangeCompletableItem::Data(x)))
}
pub fn sitem_err_from_string<T, D>(x: T) -> Sitemty<D>
where
T: ToString,
{
Err(err::Error::from_string(x))
}
pub fn sitem_err2_from_string<T>(x: T) -> err::Error
where
T: ToString,
{
err::Error::from_string(x)
}
mod levelserde {
use super::Level;
use serde::de::{self, Visitor};
-9
View File
@@ -1,18 +1,9 @@
use crate::collect_s::CollectableDyn;
use crate::collect_s::CollectorDyn;
use crate::collect_s::ToJsonResult;
use crate::AsAnyMut;
use crate::AsAnyRef;
use crate::Events;
use crate::Resettable;
use crate::TypeName;
use crate::WithLen;
use err::Error;
use netpod::log::*;
use netpod::BinnedRange;
use netpod::BinnedRangeEnum;
use netpod::TsNano;
use std::any::Any;
use std::fmt;
use std::ops::Range;