gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove error-type feature from lemmy-utils

remove-error-type-feature
Felix Ableitner 2024-02-26 10:51:40 +01:00
parent ab4deaa49a
commit 9742e8d5c1
5 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/api_common/Cargo.toml
View File

@ -44,7 +44,7 @@ lemmy_db_views = { workspace = true }
lemmy_db_views_moderator = { workspace = true } lemmy_db_views_moderator = { workspace = true }
lemmy_db_views_actor = { workspace = true } lemmy_db_views_actor = { workspace = true }
lemmy_db_schema = { workspace = true } lemmy_db_schema = { workspace = true }
lemmy_utils = { workspace = true, features = ["error-type"] } lemmy_utils = { workspace = true }
activitypub_federation = { workspace = true, optional = true } activitypub_federation = { workspace = true, optional = true }
serde = { workspace = true } serde = { workspace = true }
serde_with = { workspace = true } serde_with = { workspace = true }

4
crates/utils/Cargo.toml
View File

@ -23,7 +23,8 @@ workspace = true
[features] [features]
default = [ default = [
"error-type", "dep:serde",
"dep:strum",
"dep:serde_json", "dep:serde_json",
"dep:anyhow", "dep:anyhow",
"dep:tracing-error", "dep:tracing-error",
@ -53,7 +54,6 @@ default = [
] ]
full = ["default", "dep:ts-rs"] full = ["default", "dep:ts-rs"]
error-type = ["dep:serde", "dep:strum"]
[dependencies] [dependencies]
regex = { workspace = true, optional = true } regex = { workspace = true, optional = true }

4
crates/utils/src/error.rs
View File

@ -6,8 +6,8 @@ use strum_macros::{Display, EnumIter};
use ts_rs::TS; use ts_rs::TS;
#[derive(Display, Debug, Serialize, Deserialize, Clone, PartialEq, Eq, EnumIter, Hash)] #[derive(Display, Debug, Serialize, Deserialize, Clone, PartialEq, Eq, EnumIter, Hash)]
#[cfg_attr(feature = "ts-rs", derive(TS))] #[cfg_attr(feature = "full", derive(TS))]
#[cfg_attr(feature = "ts-rs", ts(export))] #[cfg_attr(feature = "full", ts(export))]
#[serde(tag = "error", content = "message", rename_all = "snake_case")] #[serde(tag = "error", content = "message", rename_all = "snake_case")]
#[non_exhaustive] #[non_exhaustive]
// TODO: order these based on the crate they belong to (utils, federation, db, api) // TODO: order these based on the crate they belong to (utils, federation, db, api)

7
crates/utils/src/lib.rs
View File

@ -12,17 +12,12 @@ cfg_if! {
pub mod settings; pub mod settings;
pub mod utils; pub mod utils;
pub mod version; pub mod version;
pub use error::LemmyErrorType;
} else { } else {
mod error; mod error;
} }
} }
cfg_if! {
if #[cfg(feature = "error-type")] {
pub use error::LemmyErrorType;
}
}
use std::time::Duration; use std::time::Duration;
pub type ConnectionId = usize; pub type ConnectionId = usize;

2
crates/utils/translations

@ -1 +1 @@
Subproject commit c3e61706e2ff7977db83e964e3010f72cad5e408 Subproject commit a36865ee8ca3658fea31ba948b67b75a812e84fc