From 1129afa7807f74210a5e2da4f0534371147f5d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABlle=20Huisman?= Date: Sun, 14 Dec 2025 17:18:46 +0100 Subject: [PATCH] refactor: use consistent format for expects --- examples/basic/src/user.rs | 2 +- packages/fortifier-macros/src/validate/type.rs | 2 +- packages/fortifier/src/validations/regex.rs | 3 +-- packages/fortifier/src/validations/url.rs | 2 +- packages/fortifier/tests/serde.rs | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/examples/basic/src/user.rs b/examples/basic/src/user.rs index af5b1e2..dcc27be 100644 --- a/examples/basic/src/user.rs +++ b/examples/basic/src/user.rs @@ -4,7 +4,7 @@ use fortifier::Validate; use regex::Regex; static COUNTRY_CODE_REGEX: LazyLock = - LazyLock::new(|| Regex::new(r"[A-Z]{2}").expect("Regex should be valid.")); + LazyLock::new(|| Regex::new(r"[A-Z]{2}").expect("valid regex")); #[derive(Validate)] pub struct CreateUser { diff --git a/packages/fortifier-macros/src/validate/type.rs b/packages/fortifier-macros/src/validate/type.rs index 269661a..eb04fa0 100644 --- a/packages/fortifier-macros/src/validate/type.rs +++ b/packages/fortifier-macros/src/validate/type.rs @@ -106,7 +106,7 @@ mod tests { use super::should_validate_type; fn validate(tokens: TokenStream) -> bool { - should_validate_type(&syn::parse2(tokens).expect("Type should be valid.")) + should_validate_type(&syn::parse2(tokens).expect("valid type")) } #[test] diff --git a/packages/fortifier/src/validations/regex.rs b/packages/fortifier/src/validations/regex.rs index 9105ec9..f030254 100644 --- a/packages/fortifier/src/validations/regex.rs +++ b/packages/fortifier/src/validations/regex.rs @@ -150,8 +150,7 @@ mod tests { use super::{RegexError, ValidateRegex}; - static REGEX: LazyLock = - LazyLock::new(|| Regex::new(r"[0-9]{4}").expect("Regex should be valid.")); + static REGEX: LazyLock = LazyLock::new(|| Regex::new(r"[0-9]{4}").expect("valid regex")); #[test] fn ok() { diff --git a/packages/fortifier/src/validations/url.rs b/packages/fortifier/src/validations/url.rs index 3d36caa..451b8b9 100644 --- a/packages/fortifier/src/validations/url.rs +++ b/packages/fortifier/src/validations/url.rs @@ -250,7 +250,7 @@ mod tests { ); assert_eq!( Url::parse("http://localhost") - .expect("URL should be valid.") + .expect("valid URL") .validate_url(), Ok(()) ); diff --git a/packages/fortifier/tests/serde.rs b/packages/fortifier/tests/serde.rs index 779721f..c34b2e2 100644 --- a/packages/fortifier/tests/serde.rs +++ b/packages/fortifier/tests/serde.rs @@ -82,7 +82,7 @@ fn serialize() { let (deserialized, serialized) = setup(); assert_eq!( - serde_json::to_value(&deserialized).expect("Value should be serializable."), + serde_json::to_value(&deserialized).expect("serializable value"), serialized ); } @@ -93,7 +93,7 @@ fn deserialize() { assert_eq!( serde_json::from_value::>(serialized) - .expect("Value should be deserializable."), + .expect("deserializable value"), deserialized, ); }