Skip to content

Commit a1a32e0

Browse files
committed
Fix tests
1 parent 6403462 commit a1a32e0

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/input/return_enums.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub enum GenericIterable<'a> {
4747
}
4848

4949
impl<'a, 'py: 'a> GenericIterable<'a> {
50-
pub fn into_sequence_iterator(
50+
pub fn as_sequence_iterator(
5151
&self,
5252
py: Python<'py>,
5353
) -> PyResult<Box<dyn Iterator<Item = PyResult<&'a PyAny>> + 'a>> {
@@ -335,7 +335,7 @@ impl<'a> GenericIterable<'a> {
335335
GenericIterable::Sequence(collection) => validate!(collection.iter()?),
336336
GenericIterable::Iterator(collection) => validate!(collection.iter()?),
337337
GenericIterable::JsonArray(collection) => validate!(collection.iter().map(Ok)),
338-
other => validate!(other.into_sequence_iterator(py)?),
338+
other => validate!(other.as_sequence_iterator(py)?),
339339
}
340340
}
341341

@@ -377,7 +377,7 @@ impl<'a> GenericIterable<'a> {
377377
GenericIterable::Sequence(collection) => validate_set!(collection.iter()?),
378378
GenericIterable::Iterator(collection) => validate_set!(collection.iter()?),
379379
GenericIterable::JsonArray(collection) => validate_set!(collection.iter().map(Ok)),
380-
other => validate_set!(other.into_sequence_iterator(py)?),
380+
other => validate_set!(other.as_sequence_iterator(py)?),
381381
}
382382
}
383383

@@ -412,7 +412,7 @@ impl<'a> GenericIterable<'a> {
412412
GenericIterable::JsonArray(collection) => {
413413
no_validator_iter_to_vec(py, input, collection.iter().map(Ok), max_length_check)
414414
}
415-
other => no_validator_iter_to_vec(py, input, other.into_sequence_iterator(py)?, max_length_check),
415+
other => no_validator_iter_to_vec(py, input, other.as_sequence_iterator(py)?, max_length_check),
416416
}
417417
}
418418
}

src/validators/tuple.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ impl BuildValidator for TuplePositionalValidator {
132132
}
133133
}
134134

135+
#[allow(clippy::too_many_arguments)]
135136
fn validate_tuple_positional<'s, 'data, T: Iterator<Item = PyResult<&'data I>>, I: Input<'data> + 'data>(
136137
py: Python<'data>,
137138
input: &'data impl Input<'data>,
@@ -141,7 +142,7 @@ fn validate_tuple_positional<'s, 'data, T: Iterator<Item = PyResult<&'data I>>,
141142
output: &mut Vec<PyObject>,
142143
errors: &mut Vec<ValLineError<'data>>,
143144
extra_validator: &Option<Box<CombinedValidator>>,
144-
items_validators: &Vec<CombinedValidator>,
145+
items_validators: &[CombinedValidator],
145146
collection_iter: &mut T,
146147
collection_len: Option<usize>,
147148
expected_length: usize,
@@ -237,7 +238,7 @@ impl Validator for TuplePositionalValidator {
237238
GenericIterable::List(collection_iter) => iter!(collection_iter.iter().map(Ok)),
238239
GenericIterable::Tuple(collection_iter) => iter!(collection_iter.iter().map(Ok)),
239240
GenericIterable::JsonArray(collection_iter) => iter!(collection_iter.iter().map(Ok)),
240-
other => iter!(other.into_sequence_iterator(py)?),
241+
other => iter!(other.as_sequence_iterator(py)?),
241242
}
242243
if errors.is_empty() {
243244
Ok(PyTuple::new(py, &output).into_py(py))

0 commit comments

Comments
 (0)