Skip to content

Commit 5b54998

Browse files
adriangbadriangb
committed
bulk rename slots -> definitions
1 parent dfe212e commit 5b54998

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+231
-184
lines changed

‎src/input/return_enums.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ fn validate_iter_to_vec<'a, 's>(
5454
capacity: usize,
5555
validator: &'s CombinedValidator,
5656
extra: &Extra,
57-
slots: &'a [CombinedValidator],
57+
definitions: &'a [CombinedValidator],
5858
recursion_guard: &'s mut RecursionGuard,
5959
) -> ValResult<'a, Vec<PyObject>> {
6060
let mut output: Vec<PyObject> = Vec::with_capacity(capacity);
6161
let mut errors: Vec<ValLineError> = Vec::new();
6262
for (index, item) in iter.enumerate() {
63-
match validator.validate(py, item, extra, slots, recursion_guard) {
63+
match validator.validate(py, item, extra, definitions, recursion_guard) {
6464
Ok(item) => output.push(item),
6565
Err(ValError::LineErrors(line_errors)) => {
6666
errors.extend(line_errors.into_iter().map(|err| err.with_outer_location(index.into())));
@@ -131,7 +131,7 @@ impl<'a> GenericCollection<'a> {
131131
generator_max_length: Option<usize>,
132132
validator: &'s CombinedValidator,
133133
extra: &Extra,
134-
slots: &'a [CombinedValidator],
134+
definitions: &'a [CombinedValidator],
135135
recursion_guard: &'s mut RecursionGuard,
136136
) -> ValResult<'a, Vec<PyObject>> {
137137
let capacity = self
@@ -144,7 +144,7 @@ impl<'a> GenericCollection<'a> {
144144
capacity,
145145
validator,
146146
extra,
147-
slots,
147+
definitions,
148148
recursion_guard,
149149
),
150150
Self::Tuple(collection) => validate_iter_to_vec(
@@ -153,7 +153,7 @@ impl<'a> GenericCollection<'a> {
153153
capacity,
154154
validator,
155155
extra,
156-
slots,
156+
definitions,
157157
recursion_guard,
158158
),
159159
Self::Set(collection) => validate_iter_to_vec(
@@ -162,7 +162,7 @@ impl<'a> GenericCollection<'a> {
162162
capacity,
163163
validator,
164164
extra,
165-
slots,
165+
definitions,
166166
recursion_guard,
167167
),
168168
Self::FrozenSet(collection) => validate_iter_to_vec(
@@ -171,7 +171,7 @@ impl<'a> GenericCollection<'a> {
171171
capacity,
172172
validator,
173173
extra,
174-
slots,
174+
definitions,
175175
recursion_guard,
176176
),
177177
Self::PyAny(collection) => {
@@ -180,7 +180,7 @@ impl<'a> GenericCollection<'a> {
180180
let mut errors: Vec<ValLineError> = Vec::new();
181181
for (index, item_result) in iter.enumerate() {
182182
let item = item_result.map_err(|e| any_next_error!(collection.py(), e, input, index))?;
183-
match validator.validate(py, item, extra, slots, recursion_guard) {
183+
match validator.validate(py, item, extra, definitions, recursion_guard) {
184184
Ok(item) => {
185185
generator_too_long!(input, index, generator_max_length, field_type);
186186
output.push(item);
@@ -206,7 +206,7 @@ impl<'a> GenericCollection<'a> {
206206
capacity,
207207
validator,
208208
extra,
209-
slots,
209+
definitions,
210210
recursion_guard,
211211
),
212212
}

‎src/serializers/extra.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ impl SerializationState {
7171
#[cfg_attr(debug_assertions, derive(Debug))]
7272
pub(crate) struct Extra<'a> {
7373
pub mode: &'a SerMode,
74-
pub slots: &'a [CombinedSerializer],
74+
pub definitions: &'a [CombinedSerializer],
7575
pub ob_type_lookup: &'a ObTypeLookup,
7676
pub warnings: &'a CollectWarnings,
7777
pub by_alias: bool,
@@ -97,7 +97,7 @@ impl<'a> Extra<'a> {
9797
pub fn new(
9898
py: Python<'a>,
9999
mode: &'a SerMode,
100-
slots: &'a [CombinedSerializer],
100+
definitions: &'a [CombinedSerializer],
101101
by_alias: bool,
102102
warnings: &'a CollectWarnings,
103103
exclude_unset: bool,
@@ -111,7 +111,7 @@ impl<'a> Extra<'a> {
111111
) -> Self {
112112
Self {
113113
mode,
114-
slots,
114+
definitions,
115115
ob_type_lookup: ObTypeLookup::cached(py),
116116
warnings,
117117
by_alias,
@@ -175,7 +175,7 @@ impl ExtraOwned {
175175
pub fn new(extra: &Extra) -> Self {
176176
Self {
177177
mode: extra.mode.clone(),
178-
definitions: extra.slots.to_vec(),
178+
definitions: extra.definitions.to_vec(),
179179
warnings: extra.warnings.clone(),
180180
by_alias: extra.by_alias,
181181
exclude_unset: extra.exclude_unset,
@@ -195,7 +195,7 @@ impl ExtraOwned {
195195
pub fn to_extra<'py>(&'py self, py: Python<'py>) -> Extra<'py> {
196196
Extra {
197197
mode: &self.mode,
198-
slots: &self.definitions,
198+
definitions: &self.definitions,
199199
ob_type_lookup: ObTypeLookup::cached(py),
200200
warnings: &self.warnings,
201201
by_alias: self.by_alias,

‎src/serializers/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ impl SchemaSerializer {
147147

148148
pub fn __repr__(&self) -> String {
149149
format!(
150-
"SchemaSerializer(serializer={:#?}, slots={:#?})",
150+
"SchemaSerializer(serializer={:#?}, definitions={:#?})",
151151
self.serializer, self.definitions
152152
)
153153
}

‎src/serializers/type_serializers/definitions.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl TypeSerializer for DefinitionRefSerializer {
6868
extra: &Extra,
6969
) -> PyResult<PyObject> {
7070
let value_id = extra.rec_guard.add(value, self.serializer_id)?;
71-
let comb_serializer = extra.slots.get(self.serializer_id).unwrap();
71+
let comb_serializer = extra.definitions.get(self.serializer_id).unwrap();
7272
let r = comb_serializer.to_python(value, include, exclude, extra);
7373
extra.rec_guard.pop(value_id, self.serializer_id);
7474
r
@@ -87,7 +87,7 @@ impl TypeSerializer for DefinitionRefSerializer {
8787
extra: &Extra,
8888
) -> Result<S::Ok, S::Error> {
8989
let value_id = extra.rec_guard.add(value, self.serializer_id).map_err(py_err_se_err)?;
90-
let comb_serializer = extra.slots.get(self.serializer_id).unwrap();
90+
let comb_serializer = extra.definitions.get(self.serializer_id).unwrap();
9191
let r = comb_serializer.serde_serialize(value, serializer, include, exclude, extra);
9292
extra.rec_guard.pop(value_id, self.serializer_id);
9393
r

‎src/validators/any.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl Validator for AnyValidator {
2929
py: Python<'data>,
3030
input: &'data impl Input<'data>,
3131
_extra: &Extra,
32-
_slots: &'data [CombinedValidator],
32+
_definitions: &'data [CombinedValidator],
3333
_recursion_guard: &'s mut RecursionGuard,
3434
) -> ValResult<'data, PyObject> {
3535
// Ok(input.clone().into_py(py))

‎src/validators/arguments.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ impl Validator for ArgumentsValidator {
155155
py: Python<'data>,
156156
input: &'data impl Input<'data>,
157157
extra: &Extra,
158-
slots: &'data [CombinedValidator],
158+
definitions: &'data [CombinedValidator],
159159
recursion_guard: &'s mut RecursionGuard,
160160
) -> ValResult<'data, PyObject> {
161161
let args = input.validate_args()?;
@@ -196,7 +196,7 @@ impl Validator for ArgumentsValidator {
196196
(Some(pos_value), None) => {
197197
match parameter
198198
.validator
199-
.validate(py, pos_value, extra, slots, recursion_guard)
199+
.validate(py, pos_value, extra, definitions, recursion_guard)
200200
{
201201
Ok(value) => output_args.push(value),
202202
Err(ValError::LineErrors(line_errors)) => {
@@ -208,7 +208,7 @@ impl Validator for ArgumentsValidator {
208208
(None, Some((lookup_path, kw_value))) => {
209209
match parameter
210210
.validator
211-
.validate(py, kw_value, extra, slots, recursion_guard)
211+
.validate(py, kw_value, extra, definitions, recursion_guard)
212212
{
213213
Ok(value) => output_kwargs.set_item(parameter.kwarg_key.as_ref().unwrap(), value)?,
214214
Err(ValError::LineErrors(line_errors)) => {
@@ -220,7 +220,7 @@ impl Validator for ArgumentsValidator {
220220
}
221221
}
222222
(None, None) => {
223-
if let Some(value) = parameter.validator.default_value(py, Some(parameter.name.as_str()), extra, slots, recursion_guard)? {
223+
if let Some(value) = parameter.validator.default_value(py, Some(parameter.name.as_str()), extra, definitions, recursion_guard)? {
224224
if let Some(ref kwarg_key) = parameter.kwarg_key {
225225
output_kwargs.set_item(kwarg_key, value)?;
226226
} else {
@@ -250,7 +250,7 @@ impl Validator for ArgumentsValidator {
250250
if len > self.positional_params_count {
251251
if let Some(ref validator) = self.var_args_validator {
252252
for (index, item) in $slice_macro!(args, self.positional_params_count, len).iter().enumerate() {
253-
match validator.validate(py, item, extra, slots, recursion_guard) {
253+
match validator.validate(py, item, extra, definitions, recursion_guard) {
254254
Ok(value) => output_args.push(value),
255255
Err(ValError::LineErrors(line_errors)) => {
256256
errors.extend(
@@ -292,7 +292,7 @@ impl Validator for ArgumentsValidator {
292292
};
293293
if !used_kwargs.contains(either_str.as_cow()?.as_ref()) {
294294
match self.var_kwargs_validator {
295-
Some(ref validator) => match validator.validate(py, value, extra, slots, recursion_guard) {
295+
Some(ref validator) => match validator.validate(py, value, extra, definitions, recursion_guard) {
296296
Ok(value) => output_kwargs.set_item(either_str.as_py_string(py), value)?,
297297
Err(ValError::LineErrors(line_errors)) => {
298298
for err in line_errors {

‎src/validators/bool.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl Validator for BoolValidator {
3434
py: Python<'data>,
3535
input: &'data impl Input<'data>,
3636
extra: &Extra,
37-
_slots: &'data [CombinedValidator],
37+
_definitions: &'data [CombinedValidator],
3838
_recursion_guard: &'s mut RecursionGuard,
3939
) -> ValResult<'data, PyObject> {
4040
// TODO in theory this could be quicker if we used PyBool rather than going to a bool

‎src/validators/bytes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ impl Validator for BytesValidator {
4242
py: Python<'data>,
4343
input: &'data impl Input<'data>,
4444
extra: &Extra,
45-
_slots: &'data [CombinedValidator],
45+
_definitions: &'data [CombinedValidator],
4646
_recursion_guard: &'s mut RecursionGuard,
4747
) -> ValResult<'data, PyObject> {
4848
let either_bytes = input.validate_bytes(extra.strict.unwrap_or(self.strict))?;
@@ -79,7 +79,7 @@ impl Validator for BytesConstrainedValidator {
7979
py: Python<'data>,
8080
input: &'data impl Input<'data>,
8181
extra: &Extra,
82-
_slots: &'data [CombinedValidator],
82+
_definitions: &'data [CombinedValidator],
8383
_recursion_guard: &'s mut RecursionGuard,
8484
) -> ValResult<'data, PyObject> {
8585
let either_bytes = input.validate_bytes(extra.strict.unwrap_or(self.strict))?;

‎src/validators/call.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ impl Validator for CallValidator {
7171
py: Python<'data>,
7272
input: &'data impl Input<'data>,
7373
extra: &Extra,
74-
slots: &'data [CombinedValidator],
74+
definitions: &'data [CombinedValidator],
7575
recursion_guard: &'s mut RecursionGuard,
7676
) -> ValResult<'data, PyObject> {
7777
let args = self
7878
.arguments_validator
79-
.validate(py, input, extra, slots, recursion_guard)?;
79+
.validate(py, input, extra, definitions, recursion_guard)?;
8080

8181
let return_value = if let Ok((args, kwargs)) = args.extract::<(&PyTuple, &PyDict)>(py) {
8282
self.function.call(py, args, Some(kwargs))?
@@ -89,7 +89,7 @@ impl Validator for CallValidator {
8989

9090
if let Some(return_validator) = &self.return_validator {
9191
return_validator
92-
.validate(py, return_value.into_ref(py), extra, slots, recursion_guard)
92+
.validate(py, return_value.into_ref(py), extra, definitions, recursion_guard)
9393
.map_err(|e| e.with_outer_location("return".into()))
9494
} else {
9595
Ok(return_value.to_object(py))

‎src/validators/callable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ impl Validator for CallableValidator {
2828
py: Python<'data>,
2929
input: &'data impl Input<'data>,
3030
_extra: &Extra,
31-
_slots: &'data [CombinedValidator],
31+
_definitions: &'data [CombinedValidator],
3232
_recursion_guard: &'s mut RecursionGuard,
3333
) -> ValResult<'data, PyObject> {
3434
match input.callable() {

‎src/validators/chain.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ impl Validator for ChainValidator {
7272
py: Python<'data>,
7373
input: &'data impl Input<'data>,
7474
extra: &Extra,
75-
slots: &'data [CombinedValidator],
75+
definitions: &'data [CombinedValidator],
7676
recursion_guard: &'s mut RecursionGuard,
7777
) -> ValResult<'data, PyObject> {
7878
let mut steps_iter = self.steps.iter();
7979
let first_step = steps_iter.next().unwrap();
80-
let value = first_step.validate(py, input, extra, slots, recursion_guard)?;
80+
let value = first_step.validate(py, input, extra, definitions, recursion_guard)?;
8181

8282
steps_iter.try_fold(value, |v, step| {
83-
step.validate(py, v.into_ref(py), extra, slots, recursion_guard)
83+
step.validate(py, v.into_ref(py), extra, definitions, recursion_guard)
8484
})
8585
}
8686

‎src/validators/custom_error.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ impl Validator for CustomErrorValidator {
8888
py: Python<'data>,
8989
input: &'data impl Input<'data>,
9090
extra: &Extra,
91-
slots: &'data [CombinedValidator],
91+
definitions: &'data [CombinedValidator],
9292
recursion_guard: &'s mut RecursionGuard,
9393
) -> ValResult<'data, PyObject> {
9494
self.validator
95-
.validate(py, input, extra, slots, recursion_guard)
95+
.validate(py, input, extra, definitions, recursion_guard)
9696
.map_err(|_| self.custom_error.as_val_error(input))
9797
}
9898

0 commit comments

Comments
 (0)