diff options
author | metamuffin <metamuffin@disroot.org> | 2024-04-15 17:13:15 +0200 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-04-15 17:13:15 +0200 |
commit | 29a62d702b24d8ea30c72e17569d9a98ad2775b9 (patch) | |
tree | 0f3f746054d7d52cb537c055217e8afe88f68baf /server/src/routes/ui/error.rs | |
parent | 2c1b50a1f32c5f87489c2bc03f81e53da8cf3d29 (diff) | |
download | jellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar jellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar.bz2 jellything-29a62d702b24d8ea30c72e17569d9a98ad2775b9.tar.zst |
upgrade all deps (except image-rs)
Diffstat (limited to 'server/src/routes/ui/error.rs')
-rw-r--r-- | server/src/routes/ui/error.rs | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs index 02011fc..b8a132d 100644 --- a/server/src/routes/ui/error.rs +++ b/server/src/routes/ui/error.rs @@ -102,40 +102,40 @@ impl From<serde_json::Error> for MyError { MyError(anyhow::anyhow!("{err}")) } } -impl From<jellybase::database::CommitError> for MyError { - fn from(err: jellybase::database::CommitError) -> Self { +impl From<jellybase::database::redb::CommitError> for MyError { + fn from(err: jellybase::database::redb::CommitError) -> Self { MyError(anyhow::anyhow!("database oopsie during commit: {err}")) } } -impl From<jellybase::database::CompactionError> for MyError { - fn from(err: jellybase::database::CompactionError) -> Self { +impl From<jellybase::database::redb::CompactionError> for MyError { + fn from(err: jellybase::database::redb::CompactionError) -> Self { MyError(anyhow::anyhow!("database oopsie during compaction: {err}")) } } -impl From<jellybase::database::DatabaseError> for MyError { - fn from(err: jellybase::database::DatabaseError) -> Self { +impl From<jellybase::database::redb::DatabaseError> for MyError { + fn from(err: jellybase::database::redb::DatabaseError) -> Self { MyError(anyhow::anyhow!("generic database oopsie: {err}")) } } -impl From<jellybase::database::SavepointError> for MyError { - fn from(err: jellybase::database::SavepointError) -> Self { +impl From<jellybase::database::redb::SavepointError> for MyError { + fn from(err: jellybase::database::redb::SavepointError) -> Self { MyError(anyhow::anyhow!( "database oopsie during savepointing: {err}" )) } } -impl From<jellybase::database::StorageError> for MyError { - fn from(err: jellybase::database::StorageError) -> Self { +impl From<jellybase::database::redb::StorageError> for MyError { + fn from(err: jellybase::database::redb::StorageError) -> Self { MyError(anyhow::anyhow!("database oopsie, storage error: {err}")) } } -impl From<jellybase::database::TableError> for MyError { - fn from(err: jellybase::database::TableError) -> Self { +impl From<jellybase::database::redb::TableError> for MyError { + fn from(err: jellybase::database::redb::TableError) -> Self { MyError(anyhow::anyhow!("database oopsie, table error: {err}")) } } -impl From<jellybase::database::TransactionError> for MyError { - fn from(err: jellybase::database::TransactionError) -> Self { +impl From<jellybase::database::redb::TransactionError> for MyError { + fn from(err: jellybase::database::redb::TransactionError) -> Self { MyError(anyhow::anyhow!("database oopsie during transaction: {err}")) } } |