replace with macros, replace miette

crates/kitsune-config/Cargo.toml

@@ -6,8 +6,8 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
+eyre = "0.6.12"
 isolang = { version = "2.4.0", features = ["serde"] }
-miette = "7.2.0"
 serde = { version = "1.0.197", features = ["derive"] }
 smol_str = { version = "0.2.1", features = ["serde"] }
 tokio = { version = "1.37.0", features = ["fs"] }

crates/kitsune-config/src/lib.rs

@@ -15,7 +15,7 @@ pub mod server;
 pub mod storage;
 pub mod url;
 
-use miette::{Context, IntoDiagnostic};
+use eyre::{Result, WrapErr};
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use tokio::fs;
@@ -41,17 +41,14 @@ pub struct Configuration {
 }
 
 impl Configuration {
-    pub async fn load<P>(path: P) -> miette::Result<Self>
+    pub async fn load<P>(path: P) -> Result<Self>
     where
         P: AsRef<Path>,
     {
         let content = fs::read_to_string(path)
             .await
-            .into_diagnostic()
             .wrap_err("Couldn't read configuration file")?;
 
-        toml::from_str(&content)
-            .into_diagnostic()
-            .wrap_err("Failed to parse configuration file")
+        toml::from_str(&content).wrap_err("Failed to parse configuration file")
     }
 }

crates/kitsune-core/Cargo.toml

@@ -9,6 +9,7 @@ build = "build.rs"
 [dependencies]
 async-trait = "0.1.79"
 const_format = "0.2.32"
+eyre = "0.6.12"
 http = "1.1.0"
 kitsune-db = { path = "../kitsune-db" }
 kitsune-messaging = { path = "../kitsune-messaging" }

crates/kitsune-core/src/error.rs

@@ -1,10 +1,7 @@
 use http::StatusCode;
 use std::borrow::Cow;
-use std::error::Error as StdError;
 use thiserror::Error;
 
-pub type BoxError = Box<dyn StdError + Send + Sync>;
-
 macro_rules! http_error {
     ($($variant_name:ident => $status_code:path),*$(,)?) => {
         #[derive(Debug, Error)]

crates/kitsune-core/src/traits/deliverer.rs

@@ -1,5 +1,5 @@
-use crate::error::BoxError;
 use async_trait::async_trait;
+use eyre::Result;
 use kitsune_db::model::{account::Account, favourite::Favourite, follower::Follow, post::Post};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -22,12 +22,12 @@ pub enum Action {
 
 #[async_trait]
 pub trait Deliverer: Send + Sync + 'static {
-    async fn deliver(&self, action: Action) -> Result<(), BoxError>;
+    async fn deliver(&self, action: Action) -> Result<()>;
 }
 
 #[async_trait]
 impl Deliverer for Arc<dyn Deliverer> {
-    async fn deliver(&self, action: Action) -> Result<(), BoxError> {
+    async fn deliver(&self, action: Action) -> Result<()> {
         (**self).deliver(action).await
     }
 }
@@ -37,7 +37,7 @@ impl<T> Deliverer for Vec<T>
 where
     T: Deliverer,
 {
-    async fn deliver(&self, action: Action) -> Result<(), BoxError> {
+    async fn deliver(&self, action: Action) -> Result<()> {
         for deliverer in self {
             deliverer.deliver(action.clone()).await?;
         }