Skip to content

fix: ensure code is required in Utoipa schema #109

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.

Sign up for GitHub

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

Merged
DanielleHuisman merged 1 commit into from
Mar 4, 2026
Merged

fix: ensure code is required in Utoipa schema #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 1 addition & 5 deletions benchmarks/compile/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ structs-10-fields-10 = []
validator = ["dep:validator"]

[dependencies]
fortifier = { workspace = true, features = [
"email-address",
"serde",
"url",
], optional = true }
fortifier = { workspace = true, features = ["email-address", "serde", "url"], optional = true }
validator = { version = "0.20.0", features = ["derive"], optional = true }

[lints]
Expand Down
7 changes: 1 addition & 6 deletions examples/basic/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ repository.workspace = true
version.workspace = true

[dependencies]
fortifier = { workspace = true, features = [
"email-address",
"phone-number",
"regex",
"url",
] }
fortifier = { workspace = true, features = ["email-address", "phone-number", "regex", "url"] }
regex.workspace = true
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }

Expand Down
8 changes: 1 addition & 7 deletions examples/server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,7 @@ version.workspace = true

[dependencies]
axum = "0.8.7"
fortifier = { workspace = true, features = [
"email-address",
"regex",
"serde",
"url",
"utoipa",
] }
fortifier = { workspace = true, features = ["email-address", "regex", "serde", "url", "utoipa"] }
serde = { workspace = true, features = ["derive"] }
thiserror = "2.0.17"
tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
Expand Down
6 changes: 1 addition & 5 deletions packages/fortifier-macros-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ ignored = ["chrono", "rust_decimal", "uuid"]
chrono.workspace = true
constant-string.workspace = true
email_address.workspace = true
fortifier = { workspace = true, features = [
"all-types",
"all-validations",
"serde",
] }
fortifier = { workspace = true, features = ["all-types", "all-validations", "serde"] }
indexmap.workspace = true
phonenumber.workspace = true
pretty_assertions.workspace = true
Expand Down
6 changes: 3 additions & 3 deletions packages/fortifier/src/validations/length.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ pub enum LengthError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: LengthErrorCode,

/// A human-readable error message.
Expand All @@ -54,7 +54,7 @@ pub enum LengthError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: LengthErrorCode,

/// A human-readable error message.
Expand All @@ -71,7 +71,7 @@ pub enum LengthError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: LengthErrorCode,

/// A human-readable error message.
Expand Down
14 changes: 7 additions & 7 deletions packages/fortifier/src/validations/phone_number.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pub enum PhoneNumberError {
NoNumber {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -41,7 +41,7 @@ pub enum PhoneNumberError {
InvalidCountryCode {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -52,7 +52,7 @@ pub enum PhoneNumberError {
TooShortAfterIdd {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -63,7 +63,7 @@ pub enum PhoneNumberError {
TooShortNsn {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -74,7 +74,7 @@ pub enum PhoneNumberError {
TooLong {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -85,7 +85,7 @@ pub enum PhoneNumberError {
MalformedInteger {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// A human-readable error message.
Expand All @@ -96,7 +96,7 @@ pub enum PhoneNumberError {
DisallowedCountryCode {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: PhoneNumberErrorCode,

/// Allowed country codes.
Expand Down
8 changes: 4 additions & 4 deletions packages/fortifier/src/validations/range.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub enum RangeError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: RangeErrorCode,

/// A human-readable error message.
Expand All @@ -50,7 +50,7 @@ pub enum RangeError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: RangeErrorCode,

/// A human-readable error message.
Expand All @@ -67,7 +67,7 @@ pub enum RangeError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: RangeErrorCode,

/// A human-readable error message.
Expand All @@ -84,7 +84,7 @@ pub enum RangeError<T> {

/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: RangeErrorCode,

/// A human-readable error message.
Expand Down
2 changes: 1 addition & 1 deletion packages/fortifier/src/validations/regex.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ constant_string!(RegexErrorCode, REGEX_ERROR_CODE, "regex");
pub struct RegexError {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: RegexErrorCode,

/// A human-readable error message.
Expand Down
22 changes: 11 additions & 11 deletions packages/fortifier/src/validations/url.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub enum UrlError {
EmptyHost {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -40,7 +40,7 @@ pub enum UrlError {
IdnaError {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -51,7 +51,7 @@ pub enum UrlError {
InvalidPort {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -62,7 +62,7 @@ pub enum UrlError {
InvalidIpv4Address {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -73,7 +73,7 @@ pub enum UrlError {
InvalidIpv6Address {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -84,7 +84,7 @@ pub enum UrlError {
InvalidDomainCharacter {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -95,7 +95,7 @@ pub enum UrlError {
RelativeUrlWithoutBase {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -106,7 +106,7 @@ pub enum UrlError {
RelativeUrlWithCannotBeABaseBase {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -117,7 +117,7 @@ pub enum UrlError {
SetHostOnCannotBeABaseUrl {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -128,7 +128,7 @@ pub enum UrlError {
Overflow {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand All @@ -139,7 +139,7 @@ pub enum UrlError {
Unknown {
/// The error code.
#[cfg_attr(feature = "serde", serde(default))]
#[cfg_attr(feature = "utoipa", schema(inline))]
#[cfg_attr(feature = "utoipa", schema(inline, required))]
code: UrlErrorCode,

/// A human-readable error message.
Expand Down