diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/channel/app.rs | 4 | ||||
| -rw-r--r-- | src/cli.rs | 4 | ||||
| -rw-r--r-- | src/index/app.rs | 2 | ||||
| -rw-r--r-- | src/login/app.rs | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/channel/app.rs b/src/channel/app.rs index 0a28fb6..4505ea9 100644 --- a/src/channel/app.rs +++ b/src/channel/app.rs @@ -109,7 +109,7 @@ impl<'a> Channels<'a> { #[derive(Debug, thiserror::Error)] pub enum InternalError { - #[error("database error: {0}")] + #[error(transparent)] DatabaseError(#[from] sqlx::Error), } @@ -117,7 +117,7 @@ pub enum InternalError { pub enum EventsError { #[error("channel {0} not found")] ChannelNotFound(channel::Id), - #[error("database error: {0}")] + #[error(transparent)] DatabaseError(#[from] sqlx::Error), } @@ -75,11 +75,9 @@ fn started_msg(listener: &net::TcpListener) -> io::Result<String> { } #[derive(Debug, thiserror::Error)] +#[error(transparent)] pub enum Error { - #[error("io error: {0}")] IoError(#[from] io::Error), - #[error("database error: {0}")] DatabaseError(#[from] sqlx::Error), - #[error("database migration error: {0}")] MigrateError(#[from] sqlx::migrate::MigrateError), } diff --git a/src/index/app.rs b/src/index/app.rs index a3456c0..4f234ee 100644 --- a/src/index/app.rs +++ b/src/index/app.rs @@ -31,6 +31,6 @@ impl<'a> Index<'a> { pub enum Error { #[error("channel {0} not found")] ChannelNotFound(channel::Id), - #[error("database error: {0}")] + #[error(transparent)] DatabaseError(#[from] sqlx::Error), } diff --git a/src/login/app.rs b/src/login/app.rs index f0e0571..c972cce 100644 --- a/src/login/app.rs +++ b/src/login/app.rs @@ -78,9 +78,9 @@ impl<'a> Logins<'a> { pub enum LoginError { #[error("invalid login")] Rejected, - #[error("database error: {0}")] + #[error(transparent)] DatabaseError(#[from] sqlx::Error), - #[error("password hash error: {0}")] + #[error(transparent)] PasswordHashError(#[from] password_hash::Error), } @@ -88,6 +88,6 @@ pub enum LoginError { pub enum ValidateError { #[error("invalid token")] InvalidToken, - #[error("database error: {0}")] + #[error(transparent)] DatabaseError(#[from] sqlx::Error), } |