Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename error variants for consistency #18

Merged
merged 1 commit into from
Oct 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/redis_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,19 @@ use crate::{
};

/// An error type for `RedisStore`.
#[allow(clippy::enum_variant_names)]
#[derive(thiserror::Error, Debug)]
pub enum RedisStoreError {
/// A variant to map to `fred::error::RedisError` errors.
#[error("Redis error: {0}")]
RedisError(#[from] fred::error::RedisError),
Redis(#[from] fred::error::RedisError),

/// A variant to map `rmp_serde` encode errors.
#[error("Rust MsgPack encode error: {0}")]
RmpSerdeEncodeError(#[from] rmp_serde::encode::Error),
RmpSerdeEncode(#[from] rmp_serde::encode::Error),

/// A variant to map `rmp_serde` decode errors.
#[error("Rust MsgPack decode error: {0}")]
RmpSerdeDecodeError(#[from] rmp_serde::decode::Error),
RmpSerdeDecode(#[from] rmp_serde::decode::Error),
}

/// A Redis session store.
Expand Down
11 changes: 5 additions & 6 deletions src/sqlx_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,25 @@ mod postgres_store;
mod mysql_store;

/// An error type for SQLx stores.
#[allow(clippy::enum_variant_names)]
#[derive(thiserror::Error, Debug)]
pub enum SqlxStoreError {
/// A variant to map session errors.
#[error(transparent)]
SessionError(#[from] SessionError),
Session(#[from] SessionError),

/// A variant to map `sqlx` errors.
#[error("SQLx error: {0}")]
SqlxError(#[from] sqlx::Error),
Sqlx(#[from] sqlx::Error),

/// A variant to map `serde_json` errors.
#[error("JSON serialization/deserialization error: {0}")]
SerdeJsonError(#[from] serde_json::Error),
SerdeJson(#[from] serde_json::Error),

/// A variant to map `rmp_serde` encode errors.
#[error("Rust MsgPack encode error: {0}")]
RmpSerdeEncodeError(#[from] rmp_serde::encode::Error),
RmpSerdeEncode(#[from] rmp_serde::encode::Error),

/// A variant to map `rmp_serde` decode errors.
#[error("Rust MsgPack decode error: {0}")]
RmpSerdeDecodeError(#[from] rmp_serde::decode::Error),
RmpSerdeDecode(#[from] rmp_serde::decode::Error),
}