diff --git a/Cargo.toml b/Cargo.toml index 897b624..9141b56 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,7 @@ humantime = "2.1.0" http = "1" http-body = "1" http-body-util = "0.1.0" -autoerr = "0.0.3" +autoerr = "0.0" chrono = { version = "0.4.38", features = ["serde"] } wasmer = { version = "5.0.1", default-features = false, features = ["sys", "cranelift"], optional = true } netpod = { path = "../daqbuf-netpod", package = "daqbuf-netpod" } diff --git a/src/rangefilter2/test.rs b/src/rangefilter2/test.rs index b5c3062..fef40e2 100644 --- a/src/rangefilter2/test.rs +++ b/src/rangefilter2/test.rs @@ -13,8 +13,12 @@ use netpod::DtNano; use netpod::TsNano; use std::collections::VecDeque; -#[derive(Debug, thiserror::Error)] -pub enum Error {} +autoerr::create_error_v1!( + name(Error, "RangefilterTest"), + enum variants { + Logic, + }, +); fn pu(c: &mut ContainerEvents, ts: TsNano, v: f32) { c.push_back(ts, v); diff --git a/src/test.rs b/src/test.rs index c383392..d9b19cd 100644 --- a/src/test.rs +++ b/src/test.rs @@ -14,9 +14,12 @@ use netpod::timeunits::SEC; use netpod::TsNano; use std::pin::Pin; -#[derive(Debug, thiserror::Error)] -#[cstm(name = "StreamsTest")] -pub enum Error {} +autoerr::create_error_v1!( + name(Error, "StreamsTest"), + enum variants { + Logic, + }, +); type BoxedEventStream = Pin> + Send>>; diff --git a/src/test/events.rs b/src/test/events.rs index d19e151..74e5949 100644 --- a/src/test/events.rs +++ b/src/test/events.rs @@ -23,12 +23,13 @@ use query::api4::events::PlainEventsQuery; use std::pin::Pin; use std::sync::Arc; -#[derive(Debug, thiserror::Error)] -#[cstm(name = "TestEvents")] -pub enum Error { - InMem(#[from] crate::frames::inmem::Error), - Generator(#[from] crate::generators::Error), -} +autoerr::create_error_v1!( + name(Error, "TestEvents"), + enum variants { + InMem(#[from] crate::frames::inmem::Error), + Generator(#[from] crate::generators::Error), + }, +); #[test] fn merged_events_cbor() {