rename to generic_iterable.rs

Author: adriangb

src/input/any_iterable.rs

@@ -6,8 +6,8 @@ use pyo3::{intern, prelude::*};
 use crate::errors::{InputValue, LocItem, ValResult};
 use crate::{PyMultiHostUrl, PyUrl};
 
-use super::any_iterable::GenericIterable;
 use super::datetime::{EitherDate, EitherDateTime, EitherTime, EitherTimedelta};
+use super::generic_iterable::GenericIterable;
 use super::return_enums::{EitherBytes, EitherString};
 use super::{GenericArguments, GenericCollection, GenericIterator, GenericMapping, JsonInput};
 

src/input/input_abstract.rs

@@ -199,10 +199,10 @@ impl<'a> Input<'a> for JsonInput {
         self.validate_tuple(false)
     }
 
-    fn extract_iterable(&'a self) -> ValResult<super::any_iterable::GenericIterable<'a>> {
+    fn extract_iterable(&'a self) -> ValResult<super::generic_iterable::GenericIterable<'a>> {
         match self {
-            JsonInput::Array(a) => Ok(super::any_iterable::GenericIterable::JsonArray(a)),
-            JsonInput::Object(o) => Ok(super::any_iterable::GenericIterable::JsonObject(o)),
+            JsonInput::Array(a) => Ok(super::generic_iterable::GenericIterable::JsonArray(a)),
+            JsonInput::Object(o) => Ok(super::generic_iterable::GenericIterable::JsonObject(o)),
             _ => Err(ValError::new(ErrorType::IterableType, self)),
         }
     }
@@ -377,7 +377,7 @@ impl<'a> Input<'a> for String {
         self.validate_dict(false)
     }
 
-    fn extract_iterable(&'a self) -> ValResult<super::any_iterable::GenericIterable<'a>> {
+    fn extract_iterable(&'a self) -> ValResult<super::generic_iterable::GenericIterable<'a>> {
         Err(ValError::new(ErrorType::IterableType, self))
     }
 

src/input/input_json.rs

@@ -11,7 +11,7 @@ use pyo3::types::{
 use pyo3::types::{PyDictItems, PyDictKeys, PyDictValues};
 use pyo3::{ffi, intern, AsPyPointer, PyTypeInfo};
 
-use super::any_iterable::GenericIterable;
+use super::generic_iterable::GenericIterable;
 use crate::build_tools::safe_repr;
 use crate::errors::{ErrorType, InputValue, LocItem, ValError, ValResult};
 use crate::{ArgsKwargs, PyMultiHostUrl, PyUrl};
@@ -459,7 +459,7 @@ impl<'a> Input<'a> for PyAny {
         }
     }
 
-    fn extract_iterable(&'a self) -> ValResult<super::any_iterable::GenericIterable<'a>> {
+    fn extract_iterable(&'a self) -> ValResult<super::generic_iterable::GenericIterable<'a>> {
         // Handle concrete non-overlapping types first, then abstract types
         if let Ok(iterable) = self.downcast::<PyList>() {
             Ok(GenericIterable::List(iterable))

src/input/input_python.rs

@@ -2,8 +2,8 @@ use std::os::raw::c_int;
 
 use pyo3::prelude::*;
 
-mod any_iterable;
 mod datetime;
+mod generic_iterable;
 mod input_abstract;
 mod input_json;
 mod input_python;
@@ -12,11 +12,11 @@ mod parse_json;
 mod return_enums;
 mod shared;
 
-pub(crate) use any_iterable::GenericIterable;
 pub(crate) use datetime::{
     pydate_as_date, pydatetime_as_datetime, pytime_as_time, pytimedelta_as_duration, EitherDate, EitherDateTime,
     EitherTime, EitherTimedelta,
 };
+pub(crate) use generic_iterable::GenericIterable;
 pub(crate) use input_abstract::{Input, InputType};
 pub(crate) use parse_json::{JsonInput, JsonObject};
 pub(crate) use return_enums::{