Skip to content

Commit 9479e6b

Browse files
committed
fix error message
1 parent a06a803 commit 9479e6b

File tree

4 files changed

+13
-5
lines changed

4 files changed

+13
-5
lines changed

src/rule/composer/or.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ mod test {
9090

9191
#[test]
9292
fn test_rule_binder_macro_err() {
93-
type SampleRule = Or![EmailRule<String>, NonEmptyStringRule, EmailRule<String>];
94-
assert!(SampleRule::validate("".to_string()).is_err());
93+
type SampleRule = Or![EmailRule<String>, NonEmptyStringRule];
94+
assert_eq!(SampleRule::validate("".to_string()).unwrap_err().to_string(), "[\"\" does not match the regex pattern ^[a-zA-Z0-9_.+-]+@([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]*\\.)+[a-zA-Z]{2,}$ || \"\" does not satisfy Not<refined_type::rule::empty::EmptyRule<alloc::string::String>>]");
9595
}
9696
}

src/rule/string.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ mod ipv6;
77
mod regex;
88

99
pub use alpha_digit::*;
10-
pub use alphabet::{Alphabet, AlphabetRule};
10+
pub use alphabet::*;
1111
pub use digit::*;
12-
pub use email::{Email, EmailRule};
12+
pub use email::*;
1313
pub use ipv4::*;
1414
pub use ipv6::*;
1515
pub use regex::*;

src/rule/string/email.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,19 @@ use crate::{declare_regex_rule, Refined};
1414
/// ```
1515
pub type Email<STRING> = Refined<EmailRule<STRING>>;
1616

17+
pub type EmailString = Refined<EmailStringRule>;
18+
19+
pub type EmailStr = Refined<EmailStrRule>;
20+
1721
declare_regex_rule![
1822
pub EmailRule,
1923
r"^[a-zA-Z0-9_.+-]+@([a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]*\.)+[a-zA-Z]{2,}$"
2024
];
2125

26+
pub type EmailStringRule = EmailRule<String>;
27+
28+
pub type EmailStrRule = EmailRule<&'static str>;
29+
2230
#[cfg(test)]
2331
mod test {
2432
use crate::rule::string::email::EmailRule;

src/rule/string/regex.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ macro_rules! declare_regex_rule {
3636
if regex.is_match(target_as_ref) {
3737
Ok(target)
3838
} else {
39-
let message = format!("{target_as_ref} does not match the regex pattern {regex}");
39+
let message = format!("\"{target_as_ref}\" does not match the regex pattern {regex}");
4040
Err($crate::result::Error::new(target, message))
4141
}
4242
}

0 commit comments

Comments
 (0)