Remove phone feature and code

Keats · May 13, 2023 · 897811a · 897811a
1 parent 61531d3
commit 897811a
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 157 deletions.
diff --git a/validator/Cargo.toml b/validator/Cargo.toml
@@ -20,13 +20,11 @@ serde_derive = "1"
 serde_json = "1"
 validator_derive = { version = "0.16", path = "../validator_derive", optional = true }
 card-validate = { version = "2.2", optional = true }
-phonenumber = { version = "0.3", optional = true }
 unic-ucd-common = { version = "0.9", optional = true }
 indexmap = {version = "1", features = ["serde-1"], optional = true }
 
 
 [features]
-phone = ["phonenumber", "validator_derive/phone"]
 card = ["card-validate", "validator_derive/card"]
 unic = ["unic-ucd-common", "validator_derive/unic"]
 derive = ["validator_derive"]
diff --git a/validator/src/validation/mod.rs b/validator/src/validation/mod.rs
@@ -8,8 +8,6 @@ pub mod length;
 pub mod must_match;
 #[cfg(feature = "unic")]
 pub mod non_control_character;
-#[cfg(feature = "phone")]
-pub mod phone;
 pub mod range;
 pub mod required;
 pub mod urls;
diff --git a/validator/src/validation/phone.rs b/validator/src/validation/phone.rs
diff --git a/validator_derive/Cargo.toml b/validator_derive/Cargo.toml
@@ -14,7 +14,6 @@ readme = "../README.md"
 proc-macro = true
 
 [features]
-phone = ["validator_types/phone"]
 card = ["validator_types/card"]
 unic = ["validator_types/unic"]
 

diff --git a/validator_derive/src/lib.rs b/validator_derive/src/lib.rs
@@ -404,7 +404,7 @@ fn find_validators_for_field(
                 for meta_item in meta_items {
                     match *meta_item {
                         syn::NestedMeta::Meta(ref item) => match *item {
-                            // email, url, phone, credit_card, non_control_character
+                            // email, url, credit_card, non_control_character
                             syn::Meta::Path(ref name) => {
                                 match name.get_ident().unwrap().to_string().as_ref() {
                                     "email" => {
@@ -413,11 +413,6 @@ fn find_validators_for_field(
                                     "url" => {
                                         validators.push(FieldValidation::new(Validator::Url));
                                     }
-                                    #[cfg(feature = "phone")]
-                                    "phone" => {
-                                        assert_string_type("phone", field_type, &field.ty);
-                                        validators.push(FieldValidation::new(Validator::Phone));
-                                    }
                                     #[cfg(feature = "card")]
                                     "credit_card" => {
                                         assert_string_type("credit_card", field_type, &field.ty);
@@ -528,7 +523,6 @@ fn find_validators_for_field(
                                     }
                                     "email"
                                     | "url"
-                                    | "phone"
                                     | "credit_card"
                                     | "non_control_character"
                                     | "required" => {

diff --git a/validator_derive/src/quoting.rs b/validator_derive/src/quoting.rs
@@ -309,26 +309,6 @@ pub fn quote_credit_card_validation(
     field_quoter.wrap_if_option(quoted)
 }
 
-#[cfg(feature = "phone")]
-pub fn quote_phone_validation(
-    field_quoter: &FieldQuoter,
-    validation: &FieldValidation,
-) -> proc_macro2::TokenStream {
-    let field_name = &field_quoter.name;
-    let validator_param = field_quoter.quote_validator_param();
-
-    let quoted_error = quote_error(validation);
-    let quoted = quote!(
-        if !::validator::validate_phone(#validator_param) {
-            #quoted_error
-            err.add_param(::std::borrow::Cow::from("value"), &#validator_param);
-            errors.add(#field_name, err);
-        }
-    );
-
-    field_quoter.wrap_if_option(quoted)
-}
-
 #[cfg(feature = "unic")]
 pub fn quote_non_control_character_validation(
     field_quoter: &FieldQuoter,
@@ -539,8 +519,6 @@ pub fn quote_validator(
         Validator::CreditCard => {
             validations.push(quote_credit_card_validation(field_quoter, validation))
         }
-        #[cfg(feature = "phone")]
-        Validator::Phone => validations.push(quote_phone_validation(field_quoter, validation)),
         Validator::Nested => nested_validations.push(quote_nested_validation(field_quoter)),
         #[cfg(feature = "unic")]
         Validator::NonControlCharacter => {

diff --git a/validator_derive/src/validation.rs b/validator_derive/src/validation.rs
@@ -297,7 +297,7 @@ pub fn extract_custom_validation(
     }
 }
 
-/// Extract url/email/phone/non_control_character field validation with a code or a message
+/// Extract url/email/non_control_character field validation with a code or a message
 pub fn extract_argless_validation(
     validator_name: String,
     field: String,
@@ -335,8 +335,6 @@ pub fn extract_argless_validation(
         "email" => Validator::Email,
         #[cfg(feature = "card")]
         "credit_card" => Validator::CreditCard,
-        #[cfg(feature = "phone")]
-        "phone" => Validator::Phone,
         #[cfg(feature = "unic")]
         "non_control_character" => Validator::NonControlCharacter,
         "required" => Validator::Required,

diff --git a/validator_derive_tests/Cargo.toml b/validator_derive_tests/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Vincent Prouillet <hello@vincentprouillet.com>"]
 edition = "2018"
 
 [dev-dependencies]
-validator = { version = "0.16", path = "../validator", features = ["phone", "card", "unic", "derive", "indexmap"] }
+validator = { version = "0.16", path = "../validator", features = ["card", "unic", "derive", "indexmap"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 trybuild = "1.0"

diff --git a/validator_derive_tests/tests/phone.rs b/validator_derive_tests/tests/phone.rs
diff --git a/validator_types/Cargo.toml b/validator_types/Cargo.toml
@@ -12,7 +12,6 @@ readme = "../README.md"
 
 
 [features]
-phone = []
 card = []
 unic = []