From ef15aa7cdb70e304ed2a49209ec99ff200995690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABlle=20Huisman?= Date: Sat, 27 Dec 2025 10:56:52 +0100 Subject: [PATCH] fix: prevent cycle by moving macro tests to a separate package --- Cargo.lock | 16 +++++--- Cargo.toml | 4 +- packages/fortifier-macros-tests/Cargo.toml | 41 +++++++++++++++++++ packages/fortifier-macros-tests/README.md | 3 ++ .../tests/integrations.rs | 0 .../tests/integrations/serde_pass.rs | 0 .../tests/validate.rs | 0 .../tests/validate/context_pass.rs | 0 .../tests/validate/enum_mixed_pass.rs | 0 .../tests/validate/enum_named_pass.rs | 0 .../tests/validate/enum_unit_pass.rs | 0 .../tests/validate/enum_unnamed_pass.rs | 0 .../tests/validate/nested_pass.rs | 0 .../validate/struct_named_generics_pass.rs | 0 .../validate/struct_named_lifetimes_pass.rs | 0 .../tests/validate/struct_named_pass.rs | 0 .../tests/validate/struct_unit_pass.rs | 0 .../validate/struct_unnamed_generics_pass.rs | 0 .../validate/struct_unnamed_lifetimes_pass.rs | 0 .../tests/validate/struct_unnamed_pass.rs | 0 .../tests/validations.rs | 0 .../invalid_allow_display_text_fail.rs | 0 .../invalid_allow_display_text_fail.stderr | 0 .../invalid_allow_domain_literal_fail.rs | 0 .../invalid_allow_domain_literal_fail.stderr | 0 .../invalid_minimum_sub_domains_fail.rs | 0 .../invalid_minimum_sub_domains_fail.stderr | 0 .../validations/email-address/types_pass.rs | 0 .../validations/email-address/unknown_fail.rs | 0 .../email-address/unknown_fail.stderr | 0 .../validations/length/conflict_max_fail.rs | 0 .../length/conflict_max_fail.stderr | 0 .../validations/length/conflict_min_fail.rs | 0 .../length/conflict_min_fail.stderr | 0 .../tests/validations/length/options_pass.rs | 0 .../tests/validations/length/types_pass.rs | 0 .../tests/validations/length/unknown_fail.rs | 0 .../validations/length/unknown_fail.stderr | 0 .../invalid_allowed_countries_fail.rs | 0 .../invalid_allowed_countries_fail.stderr | 0 .../invalid_default_country_fail.rs | 0 .../invalid_default_country_fail.stderr | 0 .../validations/phone-number/options_pass.rs | 0 .../validations/phone-number/types_pass.rs | 0 .../validations/phone-number/unknown_fail.rs | 0 .../phone-number/unknown_fail.stderr | 0 .../validations/range/conflict_max_fail.rs | 0 .../range/conflict_max_fail.stderr | 0 .../validations/range/conflict_min_fail.rs | 0 .../range/conflict_min_fail.stderr | 0 .../tests/validations/range/options_pass.rs | 0 .../tests/validations/range/unknown_fail.rs | 0 .../validations/range/unknown_fail.stderr | 0 .../regex/invalid_expression_fail.rs | 0 .../regex/invalid_expression_fail.stderr | 0 .../tests/validations/regex/types_pass.rs | 0 .../tests/validations/regex/unknown_fail.rs | 0 .../validations/regex/unknown_fail.stderr | 0 .../tests/validations/url/types_pass.rs | 0 .../tests/validations/url/unknown_fail.rs | 0 .../tests/validations/url/unknown_fail.stderr | 0 packages/fortifier-macros/Cargo.toml | 23 ----------- 62 files changed, 57 insertions(+), 30 deletions(-) create mode 100644 packages/fortifier-macros-tests/Cargo.toml create mode 100644 packages/fortifier-macros-tests/README.md rename packages/{fortifier-macros => fortifier-macros-tests}/tests/integrations.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/integrations/serde_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/context_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/enum_mixed_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/enum_named_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/enum_unit_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/enum_unnamed_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/nested_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_named_generics_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_named_lifetimes_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_named_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_unit_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_unnamed_generics_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_unnamed_lifetimes_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validate/struct_unnamed_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_allow_display_text_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_allow_display_text_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_allow_domain_literal_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_allow_domain_literal_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_minimum_sub_domains_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/invalid_minimum_sub_domains_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/types_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/email-address/unknown_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/conflict_max_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/conflict_max_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/conflict_min_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/conflict_min_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/options_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/types_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/length/unknown_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/invalid_allowed_countries_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/invalid_allowed_countries_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/invalid_default_country_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/invalid_default_country_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/options_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/types_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/phone-number/unknown_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/conflict_max_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/conflict_max_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/conflict_min_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/conflict_min_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/options_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/range/unknown_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/regex/invalid_expression_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/regex/invalid_expression_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/regex/types_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/regex/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/regex/unknown_fail.stderr (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/url/types_pass.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/url/unknown_fail.rs (100%) rename packages/{fortifier-macros => fortifier-macros-tests}/tests/validations/url/unknown_fail.stderr (100%) diff --git a/Cargo.lock b/Cargo.lock index e3791be..b42238f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -379,21 +379,27 @@ dependencies = [ name = "fortifier-macros" version = "0.1.1" dependencies = [ - "chrono", "convert_case", + "proc-macro-crate", + "proc-macro2", + "quote", + "syn 2.0.110", +] + +[[package]] +name = "fortifier-macros-tests" +version = "0.1.1" +dependencies = [ + "chrono", "email_address", "fortifier", "indexmap", "phonenumber", "pretty_assertions", - "proc-macro-crate", - "proc-macro2", - "quote", "regex", "rust_decimal", "serde", "serde_json", - "syn 2.0.110", "trybuild", "url", "uuid", diff --git a/Cargo.toml b/Cargo.toml index b97f925..ddf1137 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,8 +12,8 @@ version = "0.1.1" [workspace.dependencies] chrono = "0.4.42" email_address = { version = "0.2.9", default-features = false } -fortifier = { path = "./packages/fortifier", version = "0.1.0" } -fortifier-macros = { path = "./packages/fortifier-macros", version = "0.1.0" } +fortifier = { path = "./packages/fortifier", version = "0.1.1" } +fortifier-macros = { path = "./packages/fortifier-macros", version = "0.1.1" } indexmap = "2.12.0" phonenumber = "0.3.7" pretty_assertions = "1.4.1" diff --git a/packages/fortifier-macros-tests/Cargo.toml b/packages/fortifier-macros-tests/Cargo.toml new file mode 100644 index 0000000..4f28d36 --- /dev/null +++ b/packages/fortifier-macros-tests/Cargo.toml @@ -0,0 +1,41 @@ +[package] +name = "fortifier-macros-tests" +description = "Tests for Fortifier macros. Separate package to prevent a cycle." +publish = false + +authors.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true +version.workspace = true + +[package.metadata.docs.rs] +all-features = true + +# TODO: Remove after adding more tests. +[package.metadata.cargo-machete] +ignored = ["chrono", "rust_decimal", "uuid"] + +[dependencies] + +[dev-dependencies] +chrono.workspace = true +email_address.workspace = true +fortifier = { workspace = true, features = [ + "all-types", + "all-validations", + "serde", +] } +indexmap.workspace = true +phonenumber.workspace = true +pretty_assertions.workspace = true +regex.workspace = true +rust_decimal.workspace = true +serde.workspace = true +serde_json.workspace = true +trybuild = "1.0.114" +url.workspace = true +uuid.workspace = true + +[lints] +workspace = true diff --git a/packages/fortifier-macros-tests/README.md b/packages/fortifier-macros-tests/README.md new file mode 100644 index 0000000..d87de96 --- /dev/null +++ b/packages/fortifier-macros-tests/README.md @@ -0,0 +1,3 @@ +# Fortifier Macros Tests + +Tests for Fortifier macros. Separate package to prevent a cycle between `fortifier` and `fortifier-macros`. diff --git a/packages/fortifier-macros/tests/integrations.rs b/packages/fortifier-macros-tests/tests/integrations.rs similarity index 100% rename from packages/fortifier-macros/tests/integrations.rs rename to packages/fortifier-macros-tests/tests/integrations.rs diff --git a/packages/fortifier-macros/tests/integrations/serde_pass.rs b/packages/fortifier-macros-tests/tests/integrations/serde_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/integrations/serde_pass.rs rename to packages/fortifier-macros-tests/tests/integrations/serde_pass.rs diff --git a/packages/fortifier-macros/tests/validate.rs b/packages/fortifier-macros-tests/tests/validate.rs similarity index 100% rename from packages/fortifier-macros/tests/validate.rs rename to packages/fortifier-macros-tests/tests/validate.rs diff --git a/packages/fortifier-macros/tests/validate/context_pass.rs b/packages/fortifier-macros-tests/tests/validate/context_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/context_pass.rs rename to packages/fortifier-macros-tests/tests/validate/context_pass.rs diff --git a/packages/fortifier-macros/tests/validate/enum_mixed_pass.rs b/packages/fortifier-macros-tests/tests/validate/enum_mixed_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/enum_mixed_pass.rs rename to packages/fortifier-macros-tests/tests/validate/enum_mixed_pass.rs diff --git a/packages/fortifier-macros/tests/validate/enum_named_pass.rs b/packages/fortifier-macros-tests/tests/validate/enum_named_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/enum_named_pass.rs rename to packages/fortifier-macros-tests/tests/validate/enum_named_pass.rs diff --git a/packages/fortifier-macros/tests/validate/enum_unit_pass.rs b/packages/fortifier-macros-tests/tests/validate/enum_unit_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/enum_unit_pass.rs rename to packages/fortifier-macros-tests/tests/validate/enum_unit_pass.rs diff --git a/packages/fortifier-macros/tests/validate/enum_unnamed_pass.rs b/packages/fortifier-macros-tests/tests/validate/enum_unnamed_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/enum_unnamed_pass.rs rename to packages/fortifier-macros-tests/tests/validate/enum_unnamed_pass.rs diff --git a/packages/fortifier-macros/tests/validate/nested_pass.rs b/packages/fortifier-macros-tests/tests/validate/nested_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/nested_pass.rs rename to packages/fortifier-macros-tests/tests/validate/nested_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_named_generics_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_named_generics_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_named_generics_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_named_generics_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_named_lifetimes_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_named_lifetimes_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_named_lifetimes_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_named_lifetimes_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_named_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_named_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_named_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_named_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_unit_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_unit_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_unit_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_unit_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_unnamed_generics_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_unnamed_generics_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_unnamed_generics_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_unnamed_generics_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_unnamed_lifetimes_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_unnamed_lifetimes_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_unnamed_lifetimes_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_unnamed_lifetimes_pass.rs diff --git a/packages/fortifier-macros/tests/validate/struct_unnamed_pass.rs b/packages/fortifier-macros-tests/tests/validate/struct_unnamed_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validate/struct_unnamed_pass.rs rename to packages/fortifier-macros-tests/tests/validate/struct_unnamed_pass.rs diff --git a/packages/fortifier-macros/tests/validations.rs b/packages/fortifier-macros-tests/tests/validations.rs similarity index 100% rename from packages/fortifier-macros/tests/validations.rs rename to packages/fortifier-macros-tests/tests/validations.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_allow_display_text_fail.rs b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_display_text_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_allow_display_text_fail.rs rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_display_text_fail.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_allow_display_text_fail.stderr b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_display_text_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_allow_display_text_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_display_text_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_allow_domain_literal_fail.rs b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_domain_literal_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_allow_domain_literal_fail.rs rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_domain_literal_fail.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_allow_domain_literal_fail.stderr b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_domain_literal_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_allow_domain_literal_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_allow_domain_literal_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_minimum_sub_domains_fail.rs b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_minimum_sub_domains_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_minimum_sub_domains_fail.rs rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_minimum_sub_domains_fail.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/invalid_minimum_sub_domains_fail.stderr b/packages/fortifier-macros-tests/tests/validations/email-address/invalid_minimum_sub_domains_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/invalid_minimum_sub_domains_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/email-address/invalid_minimum_sub_domains_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/email-address/types_pass.rs b/packages/fortifier-macros-tests/tests/validations/email-address/types_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/types_pass.rs rename to packages/fortifier-macros-tests/tests/validations/email-address/types_pass.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/email-address/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/email-address/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/email-address/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/email-address/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/email-address/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/email-address/unknown_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/length/conflict_max_fail.rs b/packages/fortifier-macros-tests/tests/validations/length/conflict_max_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/length/conflict_max_fail.rs rename to packages/fortifier-macros-tests/tests/validations/length/conflict_max_fail.rs diff --git a/packages/fortifier-macros/tests/validations/length/conflict_max_fail.stderr b/packages/fortifier-macros-tests/tests/validations/length/conflict_max_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/length/conflict_max_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/length/conflict_max_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/length/conflict_min_fail.rs b/packages/fortifier-macros-tests/tests/validations/length/conflict_min_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/length/conflict_min_fail.rs rename to packages/fortifier-macros-tests/tests/validations/length/conflict_min_fail.rs diff --git a/packages/fortifier-macros/tests/validations/length/conflict_min_fail.stderr b/packages/fortifier-macros-tests/tests/validations/length/conflict_min_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/length/conflict_min_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/length/conflict_min_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/length/options_pass.rs b/packages/fortifier-macros-tests/tests/validations/length/options_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/length/options_pass.rs rename to packages/fortifier-macros-tests/tests/validations/length/options_pass.rs diff --git a/packages/fortifier-macros/tests/validations/length/types_pass.rs b/packages/fortifier-macros-tests/tests/validations/length/types_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/length/types_pass.rs rename to packages/fortifier-macros-tests/tests/validations/length/types_pass.rs diff --git a/packages/fortifier-macros/tests/validations/length/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/length/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/length/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/length/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/length/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/length/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/length/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/length/unknown_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/phone-number/invalid_allowed_countries_fail.rs b/packages/fortifier-macros-tests/tests/validations/phone-number/invalid_allowed_countries_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/invalid_allowed_countries_fail.rs rename to packages/fortifier-macros-tests/tests/validations/phone-number/invalid_allowed_countries_fail.rs diff --git a/packages/fortifier-macros/tests/validations/phone-number/invalid_allowed_countries_fail.stderr b/packages/fortifier-macros-tests/tests/validations/phone-number/invalid_allowed_countries_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/invalid_allowed_countries_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/phone-number/invalid_allowed_countries_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/phone-number/invalid_default_country_fail.rs b/packages/fortifier-macros-tests/tests/validations/phone-number/invalid_default_country_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/invalid_default_country_fail.rs rename to packages/fortifier-macros-tests/tests/validations/phone-number/invalid_default_country_fail.rs diff --git a/packages/fortifier-macros/tests/validations/phone-number/invalid_default_country_fail.stderr b/packages/fortifier-macros-tests/tests/validations/phone-number/invalid_default_country_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/invalid_default_country_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/phone-number/invalid_default_country_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/phone-number/options_pass.rs b/packages/fortifier-macros-tests/tests/validations/phone-number/options_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/options_pass.rs rename to packages/fortifier-macros-tests/tests/validations/phone-number/options_pass.rs diff --git a/packages/fortifier-macros/tests/validations/phone-number/types_pass.rs b/packages/fortifier-macros-tests/tests/validations/phone-number/types_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/types_pass.rs rename to packages/fortifier-macros-tests/tests/validations/phone-number/types_pass.rs diff --git a/packages/fortifier-macros/tests/validations/phone-number/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/phone-number/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/phone-number/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/phone-number/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/phone-number/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/phone-number/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/phone-number/unknown_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/range/conflict_max_fail.rs b/packages/fortifier-macros-tests/tests/validations/range/conflict_max_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/range/conflict_max_fail.rs rename to packages/fortifier-macros-tests/tests/validations/range/conflict_max_fail.rs diff --git a/packages/fortifier-macros/tests/validations/range/conflict_max_fail.stderr b/packages/fortifier-macros-tests/tests/validations/range/conflict_max_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/range/conflict_max_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/range/conflict_max_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/range/conflict_min_fail.rs b/packages/fortifier-macros-tests/tests/validations/range/conflict_min_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/range/conflict_min_fail.rs rename to packages/fortifier-macros-tests/tests/validations/range/conflict_min_fail.rs diff --git a/packages/fortifier-macros/tests/validations/range/conflict_min_fail.stderr b/packages/fortifier-macros-tests/tests/validations/range/conflict_min_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/range/conflict_min_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/range/conflict_min_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/range/options_pass.rs b/packages/fortifier-macros-tests/tests/validations/range/options_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/range/options_pass.rs rename to packages/fortifier-macros-tests/tests/validations/range/options_pass.rs diff --git a/packages/fortifier-macros/tests/validations/range/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/range/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/range/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/range/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/range/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/range/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/range/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/range/unknown_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/regex/invalid_expression_fail.rs b/packages/fortifier-macros-tests/tests/validations/regex/invalid_expression_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/regex/invalid_expression_fail.rs rename to packages/fortifier-macros-tests/tests/validations/regex/invalid_expression_fail.rs diff --git a/packages/fortifier-macros/tests/validations/regex/invalid_expression_fail.stderr b/packages/fortifier-macros-tests/tests/validations/regex/invalid_expression_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/regex/invalid_expression_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/regex/invalid_expression_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/regex/types_pass.rs b/packages/fortifier-macros-tests/tests/validations/regex/types_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/regex/types_pass.rs rename to packages/fortifier-macros-tests/tests/validations/regex/types_pass.rs diff --git a/packages/fortifier-macros/tests/validations/regex/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/regex/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/regex/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/regex/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/regex/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/regex/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/regex/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/regex/unknown_fail.stderr diff --git a/packages/fortifier-macros/tests/validations/url/types_pass.rs b/packages/fortifier-macros-tests/tests/validations/url/types_pass.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/url/types_pass.rs rename to packages/fortifier-macros-tests/tests/validations/url/types_pass.rs diff --git a/packages/fortifier-macros/tests/validations/url/unknown_fail.rs b/packages/fortifier-macros-tests/tests/validations/url/unknown_fail.rs similarity index 100% rename from packages/fortifier-macros/tests/validations/url/unknown_fail.rs rename to packages/fortifier-macros-tests/tests/validations/url/unknown_fail.rs diff --git a/packages/fortifier-macros/tests/validations/url/unknown_fail.stderr b/packages/fortifier-macros-tests/tests/validations/url/unknown_fail.stderr similarity index 100% rename from packages/fortifier-macros/tests/validations/url/unknown_fail.stderr rename to packages/fortifier-macros-tests/tests/validations/url/unknown_fail.stderr diff --git a/packages/fortifier-macros/Cargo.toml b/packages/fortifier-macros/Cargo.toml index 38f4e54..95fdfc0 100644 --- a/packages/fortifier-macros/Cargo.toml +++ b/packages/fortifier-macros/Cargo.toml @@ -11,10 +11,6 @@ version.workspace = true [package.metadata.docs.rs] all-features = true -# TODO: Remove after adding more tests. -[package.metadata.cargo-machete] -ignored = ["chrono", "rust_decimal", "uuid"] - [lib] proc-macro = true @@ -30,24 +26,5 @@ proc-macro2 = "1.0.103" quote = "1.0.42" syn = "2.0.110" -[dev-dependencies] -chrono.workspace = true -email_address.workspace = true -fortifier = { workspace = true, features = [ - "all-types", - "all-validations", - "serde", -] } -indexmap.workspace = true -phonenumber.workspace = true -pretty_assertions.workspace = true -regex.workspace = true -rust_decimal.workspace = true -serde.workspace = true -serde_json.workspace = true -trybuild = "1.0.114" -url.workspace = true -uuid.workspace = true - [lints] workspace = true