Replace eyre with miette

crates/kitsune-activitypub/src/error.rs

@@ -2,7 +2,10 @@ use diesel_async::pooled_connection::deadpool::PoolError as DatabasePoolError;
 use kitsune_core::error::BoxError;
 use kitsune_http_signatures::ring;
 use rsa::pkcs8::der;
-use std::convert::Infallible;
+use std::{
+    convert::Infallible,
+    fmt::{Debug, Display},
+};
 use thiserror::Error;
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -90,7 +93,7 @@ impl From<Infallible> for Error {
 
 impl<E> From<kitsune_db::PoolError<E>> for Error
 where
-    E: Into<Error>,
+    E: Into<Error> + Debug + Display,
 {
     fn from(value: kitsune_db::PoolError<E>) -> Self {
         match value {

crates/kitsune-config/Cargo.toml

@@ -5,7 +5,7 @@ edition.workspace = true
 version.workspace = true
 
 [dependencies]
-eyre = "0.6.9"
+miette = "5.10.0"
 serde = { version = "1.0.193", features = ["derive"] }
 smol_str = { version = "0.2.0", features = ["serde"] }
 tokio = { version = "1.34.0", features = ["fs"] }

crates/kitsune-config/src/lib.rs

@@ -13,6 +13,7 @@ pub mod server;
 pub mod storage;
 pub mod url;
 
+use miette::{Context, IntoDiagnostic};
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 use tokio::fs;
@@ -36,11 +37,17 @@ pub struct Configuration {
 }
 
 impl Configuration {
-    pub async fn load<P>(path: P) -> eyre::Result<Self>
+    pub async fn load<P>(path: P) -> miette::Result<Self>
     where
         P: AsRef<Path>,
     {
-        let content = fs::read_to_string(path).await?;
-        toml::from_str(&content).map_err(eyre::Report::from)
+        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")
     }
 }

crates/kitsune-db/Cargo.toml

@@ -19,6 +19,7 @@ iso8601-timestamp = { version = "0.2.12", features = ["diesel-pg"] }
 kitsune-blocking = { path = "../kitsune-blocking" }
 kitsune-language = { path = "../kitsune-language" }
 kitsune-type = { path = "../kitsune-type" }
+miette = "5.10.0"
 num-derive = "0.4.1"
 num-traits = "0.2.17"
 serde = { version = "1.0.193", features = ["derive"] }

crates/kitsune-db/src/error.rs

@@ -1,6 +1,8 @@
 use core::fmt;
 use diesel_async::pooled_connection::deadpool::PoolError;
+use miette::Diagnostic;
 use std::error::Error as StdError;
+use thiserror::Error;
 
 pub type BoxError = Box<dyn StdError + Send + Sync>;
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -35,7 +37,7 @@ impl fmt::Display for IsoCodeConversionError {
 
 impl StdError for IsoCodeConversionError {}
 
-#[derive(Debug, thiserror::Error)]
+#[derive(Debug, Diagnostic, Error)]
 pub enum Error {
     #[error(transparent)]
     Blocking(#[from] kitsune_blocking::Error),

crates/kitsune-db/src/pool.rs

@@ -3,11 +3,18 @@ use diesel_async::{
     scoped_futures::{ScopedBoxFuture, ScopedFutureWrapper},
     AsyncConnection, AsyncPgConnection,
 };
-use std::future::Future;
+use miette::Diagnostic;
+use std::{
+    fmt::{Debug, Display},
+    future::Future,
+};
 use thiserror::Error;
 
-#[derive(Debug, Error)]
-pub enum PoolError<E> {
+#[derive(Debug, Diagnostic, Error)]
+pub enum PoolError<E>
+where
+    E: Display + Debug,
+{
     #[error(transparent)]
     Pool(#[from] DeadpoolError),
 
@@ -35,6 +42,7 @@ impl PgPool {
         for<'conn> F:
             FnOnce(&'conn mut Object<AsyncPgConnection>) -> ScopedFutureWrapper<'conn, 'a, Fut>,
         Fut: Future<Output = Result<T, E>>,
+        E: Display + Debug,
     {
         let mut conn = self.inner.get().await?;
         func(&mut conn).await.map_err(PoolError::User)
@@ -48,7 +56,7 @@ impl PgPool {
             ) -> ScopedBoxFuture<'a, 'r, Result<R, E>>
             + Send
             + 'a,
-        E: From<diesel::result::Error> + Send + 'a,
+        E: From<diesel::result::Error> + Debug + Display + Send + 'a,
         R: Send + 'a,
     {
         let mut conn = self.inner.get().await?;

crates/kitsune-email/Cargo.toml

@@ -23,6 +23,7 @@ lettre = { version = "0.11.2", default-features = false, features = [
     "tokio1-rustls-tls",
     "tracing",
 ] }
+miette = "5.10.0"
 mrml = { version = "2.0.0-rc4", default-features = false, features = [
     "orderedmap",
     "parse",

crates/kitsune-email/src/error.rs

@@ -1,11 +1,15 @@
 use diesel_async::pooled_connection::deadpool::PoolError as DatabasePoolError;
-use std::error::Error as StdError;
+use miette::Diagnostic;
+use std::{
+    error::Error as StdError,
+    fmt::{Debug, Display},
+};
 use thiserror::Error;
 
 pub type BoxError = Box<dyn StdError + Send + Sync>;
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
-#[derive(Debug, Error)]
+#[derive(Debug, Diagnostic, Error)]
 pub enum Error {
     #[error(transparent)]
     Address(#[from] lettre::address::AddressError),
@@ -34,7 +38,7 @@ pub enum Error {
 
 impl<E> From<kitsune_db::PoolError<E>> for Error
 where
-    E: Into<Error>,
+    E: Into<Error> + Debug + Display,
 {
     fn from(value: kitsune_db::PoolError<E>) -> Self {
         match value {

crates/kitsune-embed/src/lib.rs

@@ -13,6 +13,7 @@ use kitsune_http_client::Client as HttpClient;
 use once_cell::sync::Lazy;
 use scraper::{Html, Selector};
 use smol_str::SmolStr;
+use std::fmt::{Debug, Display};
 use typed_builder::TypedBuilder;
 
 pub use embed_sdk;
@@ -47,7 +48,7 @@ pub enum Error {
 
 impl<E> From<kitsune_db::PoolError<E>> for Error
 where
-    E: Into<Error>,
+    E: Into<Error> + Debug + Display,
 {
     fn from(value: kitsune_db::PoolError<E>) -> Self {
         match value {

crates/kitsune-federation-filter/Cargo.toml

@@ -8,6 +8,7 @@ version.workspace = true
 globset = "0.4.14"
 kitsune-config = { path = "../kitsune-config" }
 kitsune-type = { path = "../kitsune-type" }
+miette = "5.10.0"
 thiserror = "1.0.50"
 url = "2.5.0"
 

crates/kitsune-federation-filter/src/error.rs

@@ -1,8 +1,9 @@
+use miette::Diagnostic;
 use thiserror::Error;
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
 
-#[derive(Debug, Error)]
+#[derive(Debug, Diagnostic, Error)]
 pub enum Error {
     #[error(transparent)]
     Glob(#[from] globset::Error),

crates/kitsune-jobs/Cargo.toml

@@ -9,15 +9,14 @@ athena = { path = "../../lib/athena" }
 derive_more = { version = "1.0.0-beta.6", features = ["from"] }
 diesel = "2.1.4"
 diesel-async = "0.4.1"
-eyre = "0.6.9"
 futures-util = "0.3.29"
 kitsune-core = { path = "../kitsune-core" }
 kitsune-db = { path = "../kitsune-db" }
 kitsune-email = { path = "../kitsune-email" }
+miette = "5.10.0"
 scoped-futures = "0.1.3"
 serde = { version = "1.0.193", features = ["derive"] }
 speedy-uuid = { path = "../../lib/speedy-uuid" }
-thiserror = "1.0.50"
 tracing = "0.1.40"
 typed-builder = "0.18.0"
 

crates/kitsune-jobs/src/deliver/accept.rs

@@ -1,7 +1,4 @@
-use crate::{
-    error::{Error, Result},
-    JobRunnerContext, Runnable,
-};
+use crate::{JobRunnerContext, Runnable};
 use diesel::{OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kitsune_core::traits::deliverer::Action;
@@ -17,7 +14,7 @@ pub struct DeliverAccept {
 
 impl Runnable for DeliverAccept {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(follow_id = %self.follow_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -42,7 +39,7 @@ impl Runnable for DeliverAccept {
         ctx.deliverer
             .deliver(Action::AcceptFollow(follow))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         Ok(())
     }

crates/kitsune-jobs/src/deliver/create.rs

@@ -1,4 +1,4 @@
-use crate::{error::Error, JobRunnerContext};
+use crate::JobRunnerContext;
 use athena::Runnable;
 use diesel::{OptionalExtension, QueryDsl, SelectableHelper};
 use diesel_async::RunQueryDsl;
@@ -15,7 +15,7 @@ pub struct DeliverCreate {
 
 impl Runnable for DeliverCreate {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(post_id = %self.post_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -41,7 +41,7 @@ impl Runnable for DeliverCreate {
         ctx.deliverer
             .deliver(Action::Create(post))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         Ok(())
     }

crates/kitsune-jobs/src/deliver/delete.rs

@@ -1,4 +1,4 @@
-use crate::{error::Error, JobRunnerContext};
+use crate::JobRunnerContext;
 use athena::Runnable;
 use diesel::{OptionalExtension, QueryDsl, SelectableHelper};
 use diesel_async::RunQueryDsl;
@@ -15,7 +15,7 @@ pub struct DeliverDelete {
 
 impl Runnable for DeliverDelete {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(post_id = %self.post_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -41,7 +41,7 @@ impl Runnable for DeliverDelete {
         ctx.deliverer
             .deliver(Action::Delete(post))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         ctx.db_pool
             .with_connection(|db_conn| {

crates/kitsune-jobs/src/deliver/favourite.rs

@@ -1,4 +1,4 @@
-use crate::{error::Error, JobRunnerContext};
+use crate::JobRunnerContext;
 use athena::Runnable;
 use diesel::QueryDsl;
 use diesel_async::RunQueryDsl;
@@ -15,7 +15,7 @@ pub struct DeliverFavourite {
 
 impl Runnable for DeliverFavourite {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(favourite_id = %self.favourite_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -32,7 +32,7 @@ impl Runnable for DeliverFavourite {
         ctx.deliverer
             .deliver(Action::Favourite(favourite))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         Ok(())
     }

crates/kitsune-jobs/src/deliver/follow.rs

@@ -1,4 +1,4 @@
-use crate::{error::Error, JobRunnerContext};
+use crate::JobRunnerContext;
 use athena::Runnable;
 use diesel::{OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
@@ -15,7 +15,7 @@ pub struct DeliverFollow {
 
 impl Runnable for DeliverFollow {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(follow_id = %self.follow_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -40,7 +40,7 @@ impl Runnable for DeliverFollow {
         ctx.deliverer
             .deliver(Action::Follow(follow))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         Ok(())
     }

crates/kitsune-jobs/src/deliver/reject.rs

@@ -1,7 +1,4 @@
-use crate::{
-    error::{Error, Result},
-    JobRunnerContext, Runnable,
-};
+use crate::{JobRunnerContext, Runnable};
 use diesel::{OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
 use kitsune_core::traits::deliverer::Action;
@@ -17,7 +14,7 @@ pub struct DeliverReject {
 
 impl Runnable for DeliverReject {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(follow_id = %self.follow_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -42,7 +39,7 @@ impl Runnable for DeliverReject {
         ctx.deliverer
             .deliver(Action::RejectFollow(follow))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         ctx.db_pool
             .with_connection(|db_conn| {

crates/kitsune-jobs/src/deliver/unfavourite.rs

@@ -1,4 +1,4 @@
-use crate::{error::Error, JobRunnerContext};
+use crate::JobRunnerContext;
 use athena::Runnable;
 use diesel::{OptionalExtension, QueryDsl};
 use diesel_async::RunQueryDsl;
@@ -15,7 +15,7 @@ pub struct DeliverUnfavourite {
 
 impl Runnable for DeliverUnfavourite {
     type Context = JobRunnerContext;
-    type Error = eyre::Report;
+    type Error = miette::Report;
 
     #[instrument(skip_all, fields(favourite_id = %self.favourite_id))]
     async fn run(&self, ctx: &Self::Context) -> Result<(), Self::Error> {
@@ -40,7 +40,7 @@ impl Runnable for DeliverUnfavourite {
         ctx.deliverer
             .deliver(Action::Unfavourite(favourite))
             .await
-            .map_err(Error::Delivery)?;
+            .map_err(|err| miette::Report::new_boxed(err.into()))?;
 
         ctx.db_pool
             .with_connection(|db_conn| {