mirrors/zero-to-production
1
0
Fork 0
mirror of https://github.com/LukeMathWalker/zero-to-production.git synced 2024-12-18 05:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Iterator::any to find forbidden characters (#30)

Browse source 
* Use Iterator::any to find forbidden characters

Iterator any stops if any are found, easier to understand than counting.

* Use Self rather than SubscriberName
This commit is contained in:
Ivan Tham 2020-12-23 05:19:50 +08:00 committed by GitHub
parent 9fa3183fd7
commit 6af7e78ef5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/domain.rs
View file

@ -30,11 +30,7 @@ impl SubscriberName {
// Iterate over all characters in the input `s` to check if any of them matches // Iterate over all characters in the input `s` to check if any of them matches
// one of the characters in the forbidden array. // one of the characters in the forbidden array.
let forbidden_characters = ['/', '(', ')', '"', '<', '>', '\\', '{', '}']; let forbidden_characters = ['/', '(', ')', '"', '<', '>', '\\', '{', '}'];
let contains_forbidden_characters = s let contains_forbidden_characters = s.chars().any(|g| forbidden_characters.contains(&g));
.chars()
.filter(|g| forbidden_characters.contains(g))
.count()
> 0;
if is_empty_or_whitespace || is_too_long || contains_forbidden_characters { if is_empty_or_whitespace || is_too_long || contains_forbidden_characters {
Err(format!("{} is not a valid subscriber name.", s)) Err(format!("{} is not a valid subscriber name.", s))
@ -80,7 +76,7 @@ mod tests {
} }
#[test] #[test]
fn names_containing_an_invalid_characters_are_rejected() { fn names_containing_an_invalid_character_are_rejected() {
for name in vec!['/', '(', ')', '"', '<', '>', '\\', '{', '}'] { for name in vec!['/', '(', ')', '"', '<', '>', '\\', '{', '}'] {
let name = name.to_string(); let name = name.to_string();
assert_err!(SubscriberName::parse(name)); assert_err!(SubscriberName::parse(name));