rename Extra.field to Extra.field_we_are_currently_assigning_to

Author: adriangb

src/validators/generator.rs

@@ -218,7 +218,7 @@ impl InternalValidator {
             validator: validator.clone(),
             slots: slots.to_vec(),
             data: extra.data.map(|d| d.into_py(py)),
-            field: extra.field.map(|f| f.to_string()),
+            field: extra.field_we_are_currently_assigning_to.map(|f| f.to_string()),
             strict: extra.strict,
             context: extra.context.map(|d| d.into_py(py)),
             recursion_guard: recursion_guard.clone(),
@@ -236,7 +236,7 @@ impl InternalValidator {
     {
         let extra = Extra {
             data: self.data.as_ref().map(|data| data.as_ref(py)),
-            field: self.field.as_deref(),
+            field_we_are_currently_assigning_to: self.field.as_deref(),
             strict: self.strict,
             context: self.context.as_ref().map(|data| data.as_ref(py)),
             field_name: None,

src/validators/mod.rs

@@ -194,7 +194,7 @@ impl SchemaValidator {
     ) -> PyResult<PyObject> {
         let extra = Extra {
             data: Some(data),
-            field: Some(field.as_str()),
+            field_we_are_currently_assigning_to: Some(field.as_str()),
             strict,
             context,
             field_name: None,
@@ -453,7 +453,7 @@ pub struct Extra<'a> {
     /// If there is no model this will be None
     pub field_name: Option<&'a str>,
     /// The field being assigned to when validating assignment
-    pub field: Option<&'a str>,
+    pub field_we_are_currently_assigning_to: Option<&'a str>,
     /// whether we're in strict or lax mode
     pub strict: Option<bool>,
     /// context used in validator functions
@@ -474,7 +474,7 @@ impl<'a> Extra<'a> {
     pub fn as_strict(&self) -> Self {
         Self {
             data: self.data,
-            field: self.field,
+            field_we_are_currently_assigning_to: self.field_we_are_currently_assigning_to,
             strict: Some(true),
             context: self.context,
             field_name: self.field_name,

src/validators/typed_dict.rs

@@ -162,7 +162,7 @@ impl Validator for TypedDictValidator {
         slots: &'data [CombinedValidator],
         recursion_guard: &'s mut RecursionGuard,
     ) -> ValResult<'data, PyObject> {
-        if let Some(field) = extra.field {
+        if let Some(field) = extra.field_we_are_currently_assigning_to {
             // we're validating assignment, completely different logic
             return self.validate_assignment(py, field, input, extra, slots, recursion_guard);
         }
@@ -188,7 +188,7 @@ impl Validator for TypedDictValidator {
                 for field in &self.fields {
                     let extra = Extra {
                         data: Some(output_dict),
-                        field: None,
+                        field_we_are_currently_assigning_to: None,
                         field_name: Some(&field.name),
                         strict: extra.strict,
                         context: extra.context,