Skip to content

Commit d8aef73

Browse files
committed
rename field_we_are_currently_assigning_to to assignee_field
1 parent 3c7ac5b commit d8aef73

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

src/validators/generator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ impl InternalValidator {
218218
validator: validator.clone(),
219219
slots: slots.to_vec(),
220220
data: extra.data.map(|d| d.into_py(py)),
221-
field: extra.field_we_are_currently_assigning_to.map(|f| f.to_string()),
221+
field: extra.assignee_field.map(|f| f.to_string()),
222222
strict: extra.strict,
223223
context: extra.context.map(|d| d.into_py(py)),
224224
recursion_guard: recursion_guard.clone(),
@@ -236,7 +236,7 @@ impl InternalValidator {
236236
{
237237
let extra = Extra {
238238
data: self.data.as_ref().map(|data| data.as_ref(py)),
239-
field_we_are_currently_assigning_to: self.field.as_deref(),
239+
assignee_field: self.field.as_deref(),
240240
strict: self.strict,
241241
context: self.context.as_ref().map(|data| data.as_ref(py)),
242242
field_name: None,

src/validators/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl SchemaValidator {
193193
) -> PyResult<PyObject> {
194194
let extra = Extra {
195195
data: Some(data),
196-
field_we_are_currently_assigning_to: Some(field.as_str()),
196+
assignee_field: Some(field.as_str()),
197197
strict,
198198
context,
199199
field_name: None,
@@ -449,7 +449,7 @@ pub struct Extra<'a> {
449449
/// If there is no model this will be None
450450
pub field_name: Option<&'a str>,
451451
/// The field being assigned to when validating assignment
452-
pub field_we_are_currently_assigning_to: Option<&'a str>,
452+
pub assignee_field: Option<&'a str>,
453453
/// whether we're in strict or lax mode
454454
pub strict: Option<bool>,
455455
/// context used in validator functions
@@ -470,7 +470,7 @@ impl<'a> Extra<'a> {
470470
pub fn as_strict(&self) -> Self {
471471
Self {
472472
data: self.data,
473-
field_we_are_currently_assigning_to: self.field_we_are_currently_assigning_to,
473+
assignee_field: self.assignee_field,
474474
strict: Some(true),
475475
context: self.context,
476476
field_name: self.field_name,

src/validators/typed_dict.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ impl Validator for TypedDictValidator {
162162
slots: &'data [CombinedValidator],
163163
recursion_guard: &'s mut RecursionGuard,
164164
) -> ValResult<'data, PyObject> {
165-
if let Some(field) = extra.field_we_are_currently_assigning_to {
165+
if let Some(field) = extra.assignee_field {
166166
// we're validating assignment, completely different logic
167167
return self.validate_assignment(py, field, input, extra, slots, recursion_guard);
168168
}
@@ -188,7 +188,7 @@ impl Validator for TypedDictValidator {
188188
for field in &self.fields {
189189
let extra = Extra {
190190
data: Some(output_dict),
191-
field_we_are_currently_assigning_to: None,
191+
assignee_field: None,
192192
field_name: Some(&field.name),
193193
strict: extra.strict,
194194
context: extra.context,

0 commit comments

Comments
 (0)