Remove thiserror from netfetch

netfetch/src/metrics/delete.rs

@@ -8,8 +8,6 @@ use bytes::Bytes;
 use chrono::DateTime;
 use chrono::Utc;
 use core::fmt;
-use err::thiserror;
-use err::ThisError;
 use futures_util::StreamExt;
 use futures_util::TryStreamExt;
 use netpod::log::*;
@@ -47,22 +45,22 @@ macro_rules! debug_cql {
     };
 }
 
-#[derive(Debug, ThisError)]
-#[cstm(name = "HttpDelete")]
-pub enum Error {
-    Logic,
-    MissingRetentionTime,
-    MissingSeriesId,
-    MissingScalarType,
-    MissingBegDate,
-    MissingEndDate,
-    ScyllaTransport(#[from] scylla::transport::errors::NewSessionError),
-    ScyllaQuery(#[from] scylla::transport::errors::QueryError),
-    ScyllaRowError(#[from] scylla::cql_to_rust::FromRowError),
-    ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError),
-    ScyllaTypeCheck(#[from] scylla::deserialize::TypeCheckError),
-    InvalidTimestamp,
-}
+autoerr::create_error_v1!(
+    name(Error, "HttpDelete"),
+    enum variants {
+        Logic,
+        MissingRetentionTime,
+        MissingSeriesId,
+        MissingScalarType,
+        MissingBegDate,
+        MissingEndDate,
+        ScyllaTransport(#[from] scylla::transport::errors::NewSessionError),
+        ScyllaQuery(#[from] scylla::transport::errors::QueryError),
+        ScyllaNextRow(#[from] scylla::transport::iterator::NextRowError),
+        ScyllaTypeCheck(#[from] scylla::deserialize::TypeCheckError),
+        InvalidTimestamp,
+    },
+);
 
 pub async fn delete(
     (headers, Query(params), body): (HeaderMap, Query<HashMap<String, String>>, axum::body::Body),

netfetch/src/metrics/ingest.rs

@@ -6,8 +6,6 @@ use axum::Json;
 use bytes::Bytes;
 use core::fmt;
 use dbpg::seriesbychannel::ChannelInfoQuery;
-use err::thiserror;
-use err::ThisError;
 use futures_util::StreamExt;
 use futures_util::TryStreamExt;
 use items_2::binning::container_events::ContainerEvents;
@@ -133,24 +131,24 @@ impl EmittableType for WritableType {
     }
 }
 
-#[derive(Debug, ThisError)]
-#[cstm(name = "MetricsIngest")]
-pub enum Error {
-    UnsupportedContentType,
-    Logic,
-    SeriesWriter(#[from] serieswriter::writer::Error),
-    MissingChannelName,
-    MissingScalarType,
-    MissingShape,
-    SendError,
-    Decode,
-    FramedBytes(#[from] streams::framed_bytes::Error),
-    InsertQueues(#[from] scywr::insertqueues::Error),
-    Serde(#[from] serde_json::Error),
-    #[error("Parse({0})")]
-    Parse(String),
-    NotSupported,
-}
+autoerr::create_error_v1!(
+    name(Error, "MetricsIngest"),
+    enum variants {
+        UnsupportedContentType,
+        Logic,
+        SeriesWriter(#[from] serieswriter::writer::Error),
+        MissingChannelName,
+        MissingScalarType,
+        MissingShape,
+        SendError,
+        Decode,
+        FramedBytes(#[from] streams::framed_bytes::Error),
+        InsertQueues(#[from] scywr::insertqueues::Error),
+        Serde(#[from] serde_json::Error),
+        Parse(String),
+        NotSupported,
+    },
+);
 
 pub async fn post_v01(
     (headers, Query(params), body): (HeaderMap, Query<HashMap<String, String>>, axum::body::Body),

netfetch/src/metrics/status.rs

@@ -6,8 +6,6 @@ use crate::conf::ChannelConfigForStatesApi;
 use async_channel::Sender;
 use chrono::DateTime;
 use chrono::Utc;
-use err::thiserror;
-use err::ThisError;
 use serde::Serialize;
 use std::collections::BTreeMap;
 use std::collections::HashMap;