daqbuf/daqbuffer
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved err crate

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/items_2/Cargo.toml
View File

@@ -23,7 +23,7 @@ crc32fast = "1.3.2"
futures-util = "0.3.24"
humantime-serde = "1.1.1"
thiserror = "0.0.1"
err = { path = "../err" }
daqbuf-err = { path = "../../../daqbuf-err" }
items_0 = { path = "../items_0" }
items_proc = { path = "../items_proc" }
netpod = { path = "../netpod" }

1
crates/items_2/src/binning/container_bins.rs
View File

@@ -5,6 +5,7 @@ use super::___;
use crate::ts_offs_from_abs;
use crate::ts_offs_from_abs_with_anchor;
use core::fmt;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use items_0::collect_s::CollectableDyn;

1
crates/items_2/src/binning/container_events.rs
View File

@@ -3,6 +3,7 @@ use super::aggregator::AggregatorNumeric;
use super::aggregator::AggregatorTimeWeight;
use super::timeweight::timeweight_events_dyn::BinnedEventsTimeweightDynbox;
use core::fmt;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use items_0::timebin::BinningggContainerEventsDyn;

1
crates/items_2/src/binning/test/events00.rs
View File

@@ -1,6 +1,7 @@
use crate::binning::container_bins::ContainerBins;
use crate::binning::container_events::ContainerEvents;
use crate::binning::timeweight::timeweight_events::BinnedEventsTimeweight;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use netpod::log::*;

1
crates/items_2/src/binning/timeweight/timeweight_events.rs
View File

@@ -5,6 +5,7 @@ use crate::binning::container_events::ContainerEvents;
use crate::binning::container_events::ContainerEventsTakeUpTo;
use crate::binning::container_events::EventSingle;
use core::fmt;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use netpod::log::*;

11
crates/items_2/src/binning/timeweight/timeweight_events_dyn.rs
View File

@@ -2,6 +2,7 @@ use super::timeweight_events::BinnedEventsTimeweight;
use crate::binning::container_events::ContainerEvents;
use crate::binning::container_events::EventValueType;
use crate::channelevents::ChannelEvents;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use futures_util::Stream;
@@ -183,11 +184,11 @@ impl BinnedEventsTimeweightStream {
}
}
Ok(None) => Continue(()),
Err(e) => Break(Ready(Some(Err(::err::Error::from_string(e))))),
Err(e) => Break(Ready(Some(Err(err::Error::from_string(e))))),
}
// Continue(())
}
Err(e) => Break(Ready(Some(Err(::err::Error::from_string(e))))),
Err(e) => Break(Ready(Some(Err(err::Error::from_string(e))))),
},
ChannelEvents::Status(_) => {
// TODO use the status
@@ -218,13 +219,13 @@ impl BinnedEventsTimeweightStream {
if self.range_complete {
self.binned_events
.input_done_range_final()
.map_err(::err::Error::from_string)?;
.map_err(err::Error::from_string)?;
} else {
self.binned_events
.input_done_range_open()
.map_err(::err::Error::from_string)?;
.map_err(err::Error::from_string)?;
}
match self.binned_events.output().map_err(::err::Error::from_string)? {
match self.binned_events.output().map_err(err::Error::from_string)? {
Some(x) => {
trace_emit!("seeing ready bins {:?}", x);
Ready(Some(Ok(DataItem(Data(x)))))

1
crates/items_2/src/binsdim0.rs
View File

@@ -1,6 +1,7 @@
use crate::ts_offs_from_abs;
use crate::ts_offs_from_abs_with_anchor;
use crate::IsoDateTime;
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectableType;

1
crates/items_2/src/binsxbindim0.rs
View File

@@ -1,6 +1,7 @@
use crate::ts_offs_from_abs;
use crate::ts_offs_from_abs_with_anchor;
use crate::IsoDateTime;
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectableType;

1
crates/items_2/src/channelevents.rs
View File

@@ -1,6 +1,7 @@
use crate::framable::FrameType;
use crate::merger::Mergeable;
use crate::Events;
use daqbuf_err as err;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectedDyn;
use items_0::collect_s::CollectorDyn;

1
crates/items_2/src/empty.rs
View File

@@ -1,6 +1,7 @@
use crate::eventsdim0::EventsDim0;
use crate::eventsdim1::EventsDim1;
use crate::Error;
use daqbuf_err as err;
use items_0::Empty;
use items_0::Events;
use netpod::log::*;

1
crates/items_2/src/eventfull.rs
View File

@@ -1,6 +1,7 @@
use crate::framable::FrameType;
use crate::merger::Mergeable;
use bytes::BytesMut;
use daqbuf_err as err;
use err::thiserror;
use err::ThisError;
use items_0::container::ByteEstimate;

1
crates/items_2/src/eventsdim0.rs
View File

@@ -1,4 +1,5 @@
use crate::IsoDateTime;
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectedDyn;

1
crates/items_2/src/eventsdim0enum.rs
View File

@@ -1,3 +1,4 @@
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectedDyn;

1
crates/items_2/src/eventsdim1.rs
View File

@@ -1,6 +1,7 @@
use crate::binsdim0::BinsDim0;
use crate::eventsxbindim0::EventsXbinDim0;
use crate::IsoDateTime;
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectableType;

1
crates/items_2/src/eventsxbindim0.rs
View File

@@ -1,5 +1,6 @@
use crate::binsxbindim0::BinsXbinDim0;
use crate::IsoDateTime;
use daqbuf_err as err;
use err::Error;
use items_0::collect_s::CollectableDyn;
use items_0::collect_s::CollectableType;

1
crates/items_2/src/framable.rs
View File

@@ -4,6 +4,7 @@ use crate::frame::make_log_frame;
use crate::frame::make_range_complete_frame;
use crate::frame::make_stats_frame;
use bytes::BytesMut;
use daqbuf_err as err;
use items_0::framable::FrameTypeInnerDyn;
use items_0::framable::FrameTypeInnerStatic;
use items_0::streamitem::LogItem;

1
crates/items_2/src/frame.rs
View File

@@ -13,6 +13,7 @@ use bincode::config::WithOtherTrailing;
use bincode::DefaultOptions;
use bytes::BufMut;
use bytes::BytesMut;
use daqbuf_err as err;
use items_0::bincode;
use items_0::streamitem::LogItem;
use items_0::streamitem::StatsItem;

1
crates/items_2/src/items_2.rs
View File

@@ -21,6 +21,7 @@ pub mod testgen;
pub mod transform;
use channelevents::ChannelEvents;
use daqbuf_err as err;
use futures_util::Stream;
use items_0::isodate::IsoDateTime;
use items_0::streamitem::Sitemty;