minimize changes to validators

Author: adriangb

Cargo.lock

@@ -1,4 +1,5 @@
 [package]
+rust-version = "1.59"
 name = "pydantic-core"
 version = "0.12.0"
 edition = "2021"

Cargo.toml

@@ -1 +1 @@
-stable
+nightly

rust-toolchain

@@ -12,6 +12,8 @@ use super::{BuildContext, BuildValidator, CombinedValidator, Extra, Validator};
 pub struct AnyValidator;
 
 impl BuildValidator for AnyValidator {
+    const EXPECTED_TYPE: &'static str = "any";
+
     fn build(
         _schema: &PyDict,
         _config: Option<&PyDict>,
@@ -35,6 +37,6 @@ impl Validator for AnyValidator {
     }
 
     fn get_name(&self) -> &str {
-        "any"
+        Self::EXPECTED_TYPE
     }
 }

src/validators/any.rs

@@ -30,6 +30,8 @@ pub struct ArgumentsValidator {
 }
 
 impl BuildValidator for ArgumentsValidator {
+    const EXPECTED_TYPE: &'static str = "arguments";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -313,6 +315,6 @@ impl Validator for ArgumentsValidator {
     }
 
     fn get_name(&self) -> &str {
-        "arguments"
+        Self::EXPECTED_TYPE
     }
 }

src/validators/arguments.rs

@@ -14,6 +14,8 @@ pub struct BoolValidator {
 }
 
 impl BuildValidator for BoolValidator {
+    const EXPECTED_TYPE: &'static str = "bool";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -41,6 +43,6 @@ impl Validator for BoolValidator {
     }
 
     fn get_name(&self) -> &str {
-        "bool"
+        Self::EXPECTED_TYPE
     }
 }

src/validators/bool.rs

@@ -15,6 +15,8 @@ pub struct BytesValidator {
 }
 
 impl BuildValidator for BytesValidator {
+    const EXPECTED_TYPE: &'static str = "bytes";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -48,7 +50,7 @@ impl Validator for BytesValidator {
     }
 
     fn get_name(&self) -> &str {
-        "bytes"
+        Self::EXPECTED_TYPE
     }
 }
 

src/validators/bytes.rs

@@ -19,6 +19,8 @@ pub struct CallValidator {
 }
 
 impl BuildValidator for CallValidator {
+    const EXPECTED_TYPE: &'static str = "call";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -36,7 +38,7 @@ impl BuildValidator for CallValidator {
         };
         let function: &PyAny = schema.get_as_req(intern!(py, "function"))?;
         let function_name: &str = function.getattr(intern!(py, "__name__"))?.extract()?;
-        let name = format!("{}[{function_name}]", "call");
+        let name = format!("{}[{function_name}]", Self::EXPECTED_TYPE);
 
         Ok(Self {
             function: function.to_object(py),

src/validators/call.rs

@@ -11,6 +11,8 @@ use super::{BuildContext, BuildValidator, CombinedValidator, Extra, Validator};
 pub struct CallableValidator;
 
 impl BuildValidator for CallableValidator {
+    const EXPECTED_TYPE: &'static str = "callable";
+
     fn build(
         _schema: &PyDict,
         _config: Option<&PyDict>,
@@ -36,6 +38,6 @@ impl Validator for CallableValidator {
     }
 
     fn get_name(&self) -> &str {
-        "callable"
+        Self::EXPECTED_TYPE
     }
 }

src/validators/callable.rs

@@ -17,6 +17,8 @@ pub struct ChainValidator {
 }
 
 impl BuildValidator for ChainValidator {
+    const EXPECTED_TYPE: &'static str = "chain";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -42,7 +44,7 @@ impl BuildValidator for ChainValidator {
 
                 Ok(Self {
                     steps,
-                    name: format!("{}[{descr}]", "chain"),
+                    name: format!("{}[{descr}]", Self::EXPECTED_TYPE),
                 }
                 .into())
             }

src/validators/chain.rs

@@ -59,6 +59,8 @@ pub struct CustomErrorValidator {
 }
 
 impl BuildValidator for CustomErrorValidator {
+    const EXPECTED_TYPE: &'static str = "custom-error";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -67,7 +69,7 @@ impl BuildValidator for CustomErrorValidator {
         let custom_error = CustomError::build(schema)?.unwrap();
         let schema: &PyAny = schema.get_as_req(intern!(schema.py(), "schema"))?;
         let validator = Box::new(build_validator(schema, config, build_context)?);
-        let name = format!("{}[{}]", "custom_error", validator.get_name());
+        let name = format!("{}[{}]", Self::EXPECTED_TYPE, validator.get_name());
         Ok(Self {
             validator,
             name,

src/validators/custom_error.rs

@@ -19,6 +19,8 @@ pub struct DateValidator {
 }
 
 impl BuildValidator for DateValidator {
+    const EXPECTED_TYPE: &'static str = "date";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -97,7 +99,7 @@ impl Validator for DateValidator {
     }
 
     fn get_name(&self) -> &str {
-        "date"
+        Self::EXPECTED_TYPE
     }
 }
 

src/validators/date.rs

@@ -20,6 +20,8 @@ pub struct DateTimeValidator {
 }
 
 impl BuildValidator for DateTimeValidator {
+    const EXPECTED_TYPE: &'static str = "datetime";
+
     fn build(
         schema: &PyDict,
         config: Option<&PyDict>,
@@ -101,7 +103,7 @@ impl Validator for DateTimeValidator {
     }
 
     fn get_name(&self) -> &str {
-        "datetime"
+        Self::EXPECTED_TYPE
     }
 }