pub(crate) mode types only, not modules

Author: josh-newman

src/input/input_abstract.rs

@@ -7,7 +7,7 @@ use pyo3::{intern, prelude::*};
 use crate::errors::{ErrorTypeDefaults, InputValue, LocItem, ValError, ValResult};
 use crate::lookup_key::{LookupKey, LookupPath};
 use crate::tools::py_err;
-use crate::validators::config::ValBytesMode;
+use crate::validators::ValBytesMode;
 
 use super::datetime::{EitherDate, EitherDateTime, EitherTime, EitherTimedelta};
 use super::return_enums::{EitherBytes, EitherInt, EitherString};

src/input/input_json.rs

@@ -9,7 +9,7 @@ use strum::EnumMessage;
 
 use crate::errors::{ErrorType, ErrorTypeDefaults, InputValue, LocItem, ValError, ValResult};
 use crate::lookup_key::{LookupKey, LookupPath};
-use crate::validators::config::ValBytesMode;
+use crate::validators::ValBytesMode;
 use crate::validators::decimal::create_decimal;
 
 use super::datetime::{

src/input/input_python.rs

@@ -15,7 +15,7 @@ use speedate::MicrosecondsPrecisionOverflowBehavior;
 
 use crate::errors::{ErrorType, ErrorTypeDefaults, InputValue, LocItem, ValError, ValResult};
 use crate::tools::{extract_i64, safe_repr};
-use crate::validators::config::ValBytesMode;
+use crate::validators::ValBytesMode;
 use crate::validators::decimal::{create_decimal, get_decimal_type};
 use crate::validators::Exactness;
 use crate::ArgsKwargs;

src/input/input_string.rs

@@ -7,7 +7,7 @@ use crate::errors::{ErrorTypeDefaults, InputValue, LocItem, ValError, ValResult}
 use crate::input::py_string_str;
 use crate::lookup_key::{LookupKey, LookupPath};
 use crate::tools::safe_repr;
-use crate::validators::config::ValBytesMode;
+use crate::validators::ValBytesMode;
 use crate::validators::decimal::create_decimal;
 
 use super::datetime::{

src/lib.rs

@@ -7,8 +7,8 @@ use std::sync::OnceLock;
 use jiter::{map_json_error, PartialMode, PythonParse, StringCacheMode};
 use pyo3::exceptions::PyTypeError;
 use pyo3::{prelude::*, sync::GILOnceCell};
-use serializers::config::BytesMode;
-use validators::config::ValBytesMode;
+use serializers::BytesMode;
+use validators::ValBytesMode;
 
 // parse this first to get access to the contained macro
 #[macro_use]

src/serializers/mod.rs

@@ -8,6 +8,7 @@ use pyo3::{PyTraverseError, PyVisit};
 use crate::definitions::{Definitions, DefinitionsBuilder};
 use crate::py_gc::PyGcTraverse;
 
+pub(crate) use config::BytesMode;
 use config::SerializationConfig;
 pub use errors::{PydanticSerializationError, PydanticSerializationUnexpectedValue};
 use extra::{CollectWarnings, SerRecursionState, WarningsMode};
@@ -16,7 +17,7 @@ pub use shared::CombinedSerializer;
 use shared::{to_json_bytes, BuildSerializer, TypeSerializer};
 
 mod computed_fields;
-pub(crate) mod config;
+mod config;
 mod errors;
 mod extra;
 mod fields;

src/validators/config.rs

@@ -7,7 +7,7 @@ use pyo3::{intern, prelude::*};
 
 use crate::errors::ErrorType;
 use crate::input::EitherBytes;
-use crate::serializers::config::BytesMode;
+use crate::serializers::BytesMode;
 use crate::tools::SchemaDict;
 
 #[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]

src/validators/json.rs

@@ -6,7 +6,7 @@ use jiter::{JsonValue, PartialMode, PythonParse};
 
 use crate::errors::{ErrorType, ErrorTypeDefaults, ValError, ValLineError, ValResult};
 use crate::input::{EitherBytes, Input, InputType, ValidationMatch};
-use crate::serializers::config::BytesMode;
+use crate::serializers::BytesMode;
 use crate::tools::SchemaDict;
 
 use super::config::ValBytesMode;

src/validators/mod.rs

@@ -10,6 +10,7 @@ use pyo3::types::{PyAny, PyDict, PyString, PyTuple, PyType};
 use pyo3::{intern, PyTraverseError, PyVisit};
 
 use crate::build_tools::{py_schema_err, py_schema_error_type, SchemaError};
+pub(crate) use config::ValBytesMode;
 use crate::definitions::{Definitions, DefinitionsBuilder};
 use crate::errors::{LocItem, ValError, ValResult, ValidationError};
 use crate::input::{Input, InputType, StringMapping};
@@ -24,7 +25,7 @@ mod bytes;
 mod call;
 mod callable;
 mod chain;
-pub(crate) mod config;
+mod config;
 mod custom_error;
 mod dataclass;
 mod date;

src/validators/uuid.rs

@@ -13,7 +13,7 @@ use crate::input::input_as_python_instance;
 use crate::input::Input;
 use crate::input::InputType;
 use crate::input::ValidationMatch;
-use crate::serializers::config::BytesMode;
+use crate::serializers::BytesMode;
 use crate::tools::SchemaDict;
 
 use super::config::ValBytesMode;