diff options
author | metamuffin <metamuffin@disroot.org> | 2024-01-20 00:50:20 +0100 |
---|---|---|
committer | metamuffin <metamuffin@disroot.org> | 2024-01-20 00:50:20 +0100 |
commit | 46c251655db7bb3d9aa814b1a5dde85336b0b9b1 (patch) | |
tree | ab0696f2c92e8854ce6aa0737877cc15184bd8b6 /server/src/routes/ui/error.rs | |
parent | 1c37d32a0985ff7390313833345b9299f9f0b196 (diff) | |
download | jellything-46c251655db7bb3d9aa814b1a5dde85336b0b9b1.tar jellything-46c251655db7bb3d9aa814b1a5dde85336b0b9b1.tar.bz2 jellything-46c251655db7bb3d9aa814b1a5dde85336b0b9b1.tar.zst |
replace sled with redb
Diffstat (limited to 'server/src/routes/ui/error.rs')
-rw-r--r-- | server/src/routes/ui/error.rs | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/server/src/routes/ui/error.rs b/server/src/routes/ui/error.rs index 07a6bed..98c6b7f 100644 --- a/server/src/routes/ui/error.rs +++ b/server/src/routes/ui/error.rs @@ -5,7 +5,7 @@ */ use super::layout::{DynLayoutPage, LayoutPage}; use crate::{routes::ui::account::rocket_uri_macro_r_account_login, uri}; -use jellybase::{database::sled, AssetLocationExt}; +use jellybase::AssetLocationExt; use jellycommon::AssetLocation; use log::info; use rocket::{ @@ -96,13 +96,43 @@ impl From<std::io::Error> for MyError { MyError(anyhow::anyhow!("{err}")) } } -impl From<sled::Error> for MyError { - fn from(err: sled::Error) -> Self { +impl From<serde_json::Error> for MyError { + fn from(err: serde_json::Error) -> Self { MyError(anyhow::anyhow!("{err}")) } } -impl From<serde_json::Error> for MyError { - fn from(err: serde_json::Error) -> Self { +impl From<jellybase::database::CommitError> for MyError { + fn from(err: jellybase::database::CommitError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::CompactionError> for MyError { + fn from(err: jellybase::database::CompactionError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::DatabaseError> for MyError { + fn from(err: jellybase::database::DatabaseError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::SavepointError> for MyError { + fn from(err: jellybase::database::SavepointError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::StorageError> for MyError { + fn from(err: jellybase::database::StorageError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::TableError> for MyError { + fn from(err: jellybase::database::TableError) -> Self { + MyError(anyhow::anyhow!("{err}")) + } +} +impl From<jellybase::database::TransactionError> for MyError { + fn from(err: jellybase::database::TransactionError) -> Self { MyError(anyhow::anyhow!("{err}")) } } |